move all artemision files into systems/

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

systems/artemision/configuration.nix

@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ../configuration.nix
-    ../programs.nix
     ./programs.nix
     ./desktop.nix
     ./wifi.nix
@@ -44,6 +42,7 @@
     }) { inherit (pkgs) system; }).fwupd;
 
   services.fprintd.enable = true;
+  services.openssh.enable = false;
 
   services.spotifyd = {
     enable = true;

systems/artemision/default.nix

@@ -3,14 +3,9 @@
   system = "x86_64-linux";
   home = true;
   sops = true;
+  users = [ "alice" ];
   modules = [
     inputs.nixos-hardware.nixosModules.framework-16-7040-amd
-    #({ pkgs, ... }: {
-    #  nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ];
-    #  environment.systemPackages = [ rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
-    #    extensions = [ "rust-src" "miri" "rust-analyzer" ];
-    #  }) ];
-    #})
     {
       environment.systemPackages = [
         inputs.wired-notify.packages.x86_64-linux.default

systems/artemision/programs.nix

@@ -1,62 +1,98 @@
-{
-  pkgs,
-  config,
-  inputs,
-  ...
-}:
+{ pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    bfg-repo-cleaner
+    alacritty
+    amdgpu_top
+    bat
     bitwarden-cli
-    candy-icons
+    bfg-repo-cleaner
+    brightnessctl
+    btop
     calibre
     # calibre dedrm?
+    candy-icons
     cinnamon.nemo
+    croc
+    deadnix
+    direnv
     discord-canary
     eza
     fanficfare
     ferium
+    fd
+    file
     firefox
     # gestures replacement
     git
     glances
     gpu-viewer
+    grim
     headsetcontrol
+    htop
+    hwloc
     ipmiview
+    iperf3
     ipscan
+    jp2a
+    jq
     kitty
     libtool
+    lsof
+    lynis
     masterpdfeditor4
     mons
     # nbt explorer?
+    ncdu
+    neofetch
     neovim
+    nix-init
+    nix-output-monitor
+    nix-prefetch
+    nix-tree
+    nixpkgs-fmt
+    nmap
     noisetorch
     ocrmypdf
+    pciutils
     playonlinux
     protonmail-bridge
     protontricks
+    qrencode
     redshift
     restic
     ripgrep
     rpi-imager
     rofi-wayland
+    signal-desktop
     # signal in tray?
     siji
     simple-mtpfs
     slack
+    slurp
+    smartmontools
     snyk
     sops
     spotify
     spotify-player
     #swaylock/waylock?
     sweet-nova
+    telegram-desktop
+    terraform
+    tig
+    tokei
+    tree
+    unzip
     unipicker
+    uutils-coreutils-noprefix
     ventoy
     vscode
     watchman
+    wget
+    wl-clipboard
     xboxdrv
     yubioath-flutter
+    zoom-us
+    zoxide
     zoom
   ];
-  # ++ [ inputs.wired.packages.${system}.wired ];
 }

users/alice/systems/artemision/non-server.nix

@@ -1,56 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  # Adds some items from the server config without importing everything
-  security.auditd.enable = true;
-
-  i18n = {
-    defaultLocale = "en_US.utf8";
-    supportedLocales = [ "en_US.UTF-8/UTF-8" ];
-  };
-
-  boot = {
-    default = true;
-  };
-
-  users = {
-    defaultUserShell = pkgs.zsh;
-  };
-
-  networking = {
-    firewall = {
-      enable = lib.mkDefault true;
-      allowedTCPPorts = [ ];
-    };
-  };
-
-  # programs = {
-  #   zsh = {
-  #     enable = true;
-  #     syntaxHighlighting.enable = true;
-  #     zsh-autoenv.enable = true;
-  #     enableCompletion = true;
-  #     enableBashCompletion = true;
-  #     ohMyZsh.enable = true;
-  #     autosuggestions = {
-  #       enable = true;
-  #       strategy = [ "completion" ];
-  #       async = true;
-  #     };
-  #   };
-  # };
-
-  nix = {
-
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 7d";
-    };
-  };
-}

users/alice/systems/artemision/programs.nix

@@ -1,49 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    alacritty
-    amdgpu_top
-    bat
-    brightnessctl
-    btop
-    croc
-    deadnix
-    direnv
-    fd
-    file
-    grim
-    htop
-    hwloc
-    iperf3
-    jp2a
-    jq
-    lsof
-    lynis
-    ncdu
-    neofetch
-    nix-init
-    nix-output-monitor
-    nix-prefetch
-    nix-tree
-    nixpkgs-fmt
-    nmap
-    pciutils
-    qrencode
-    ripgrep
-    signal-desktop
-    slurp
-    smartmontools
-    telegram-desktop
-    terraform
-    tig
-    tokei
-    tree
-    unzip
-    uutils-coreutils-noprefix
-    ventoy
-    wget
-    wl-clipboard
-    zoom-us
-    zoxide
-  ];
-}

users/alice/systems/configuration.nix

@@ -1,37 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ./non-server.nix ];
-
-  services.fwupd.enable = true;
-
-  nix.settings = {
-    substituters = [
-      "https://cache.nixos.org/?priority=1&want-mass-query=true"
-      "https://attic.alicehuston.xyz/cache-nix-dot?priority=4&want-mass-query=true"
-      "https://cache.alicehuston.xyz/?priority=5&want-mass-query=true"
-      "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
-    ];
-    trusted-substituters = [
-      "https://cache.nixos.org"
-      "https://attic.alicehuston.xyz/cache-nix-dot"
-      "https://cache.alicehuston.xyz"
-      "https://nix-community.cachix.org"
-    ];
-    trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "cache.alicehuston.xyz:SJAm8HJVTWUjwcTTLAoi/5E1gUOJ0GWum2suPPv7CUo=%"
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "cache-nix-dot:0hp/F6mUJXNyZeLBPNBjmyEh8gWsNVH+zkuwlWMmwXg="
-    ];
-    trusted-users = [
-      "root"
-      "@wheel"
-    ];
-  };
-}

users/alice/systems/non-server.nix

@@ -1,52 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  # Adds some items from the server config without importing everything
-  security.auditd.enable = true;
-
-  i18n = {
-    defaultLocale = "en_US.utf8";
-    supportedLocales = [ "en_US.UTF-8/UTF-8" ];
-  };
-
-  boot = {
-    default = true;
-  };
-
-  users = {
-    defaultUserShell = pkgs.zsh;
-  };
-
-  networking = {
-    firewall = {
-      enable = lib.mkDefault true;
-      allowedTCPPorts = [ ];
-    };
-  };
-
-  services.openssh.enable = false;
-  services.autopull = {
-    enable = false;
-    ssh-key = "/root/.ssh/id_ed25519_ghdeploy";
-    path = /root/dotfiles;
-  };
-
-  programs.zsh = {
-    enable = true;
-    syntaxHighlighting.enable = true;
-    zsh-autoenv.enable = true;
-    enableCompletion = true;
-    enableBashCompletion = true;
-    ohMyZsh.enable = true;
-    autosuggestions = {
-      enable = true;
-      strategy = [ "completion" ];
-      async = true;
-    };
-  };
-}