[NixOS] Make module splits make a lot more sense.

nixos/all.nix

@@ -1,146 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    # Applications
-    alacritty
-    gnome.cheese
-    dfeet
-    discord
-    emacs
-    firefox
-    gitter
-    google-chrome
-    hexchat
-    keybase-gui
-    kitty
-    kleopatra
-    libreoffice
-    lxappearance
-    okular
-    quassel
-    slack
-    simplescreenrecorder
-    spotify
-    transmission-gtk
-    vlc
-    xfce.thunar
-    wire-desktop
-    yubikey-manager
-    zoom-us
-
-    # Appearance
-    libsForQt5.breeze-gtk
-    gnome.adwaita-icon-theme
-    hicolor-icon-theme
-    materia-theme
-    numix-icon-theme-circle
-    papirus-icon-theme
-    # plasma5.breeze-gtk
-    # plasma5.breeze-qt5
-
-    # Desktop
-    autorandr
-    betterlockscreen
-    blueman
-    clipit
-    feh
-    gnome.gpaste
-    libnotify
-    lxqt.lxqt-powermanagement
-    networkmanagerapplet
-    notify-osd-customizable
-    pasystray
-    picom
-    pinentry
-    pommed_light
-    rofi
-    rofi-pass
-    rofi-systemd
-    skippy-xd
-    synergy
-    udiskie
-    volnoti
-
-    # xorg
-    wmctrl
-    xclip
-    xdotool
-    xorg.xev
-    xorg.xkbcomp
-    xorg.xwininfo
-    xsettingsd
-
-    # Audio
-    pulsemixer
-    pavucontrol
-    playerctl
-
-    # Tools
-    automake
-    bind
-    binutils
-    cmake
-    dex
-    direnv
-    dpkg
-    fd
-    file
-    gcc
-    gdb
-    gitAndTools.git-crypt
-    gitAndTools.git-extras
-    gitAndTools.git-fame
-    gitAndTools.git-sync
-    gitAndTools.hub
-    gitFull
-    glxinfo
-    gnumake
-    gnupg
-    gparted
-    htop
-    inetutils
-    inotify-tools
-    ispell
-    jq
-    libtool
-    lsof
-    mercurial
-    ncdu
-    neofetch
-    openvpn
-    parallel
-    pass
-    patchelf
-    pciutils
-    plasma-workspace
-    pijul
-    powertop
-    prometheus
-    pscircle
-    pstree
-    qt5.qttools
-    rcm
-    # rr
-    scrot
-    silver-searcher
-    stow
-    subversion
-    swig
-    tmux
-    tzupdate
-    unzip
-    usbutils
-    valgrind
-    wget
-    yubikey-manager
-    rustup
-
-    # Nix
-    nix-prefetch-git
-    # cachix
-
-    # Miscellaneous
-    android-udev-rules
-    librsvg
-  ];
-}

nixos/cachix.nix

@@ -1,9 +0,0 @@
-{
-  nix = {
-    binaryCaches = [
-      "https://cache.nixos.org/"
-    ];
-    binaryCachePublicKeys = [
-    ];
-  };
-}

nixos/dfinity.nix

@@ -1,13 +0,0 @@
-{
-  nix.settings = {
-    trusted-binary-caches = [ https://nix.oregon.dfinity.build ];
-    trusted-public-keys = [
-      "hydra.oregon.dfinity.build-2:KMTixHrh9DpAjF/0xU/49VEtNuGzQ71YaVIUSOLUaCM="
-      "cache.dfinity.systems-1:IcOn/2SVyPGOi8i3hKhQOlyiSQotiOBKwTFmyPX5YNw="
-    ];
-  };
-  networking.extraHosts =
-  ''
-    10.20.12.55 nix.oregon.dfinity.build
-  '';
-}

nixos/full.nix

@@ -1,14 +1,11 @@
 { pkgs, ... }:
 {
   imports = [
-    ./all.nix
     ./android.nix
-    ./base.nix
+    ./arm-incompatible.nix
-    # ./cachix.nix
+    ./games.nix
     ./code.nix
-    ./essential-no-arm.nix
     ./extra.nix
     ./internet-computer.nix
-    ./dfinity.nix
   ];
 }

nixos/games.nix

@@ -7,6 +7,5 @@
   boot.extraModulePackages = with pkgs; [
     xboxdrv
   ];
-  # hardware.xpadneo.enable = true;
   hardware.xone.enable = true;
 }

nixos/home-manager.nix

@@ -13,10 +13,6 @@ inputs: { pkgs, config, ... }: {
     forwardAgent = true;
   };
 
-  # programs.zsh = {
-  #   enable = true;
-  # };
-
   services.xscreensaver = {
     enable = true;
   };

nixos/machines/ivanm-dfinity-razer.nix

@@ -6,8 +6,6 @@
 {
   imports = [
     ../full.nix
-    ../extra.nix
-    ../dfinity.nix
   ];
 
   hardware.enableRedistributableFirmware = true;

nixos/machines/nixquick.nix

@@ -1,9 +1,7 @@
 { config, lib, pkgs, ... }:
 {
   imports = [
-    ../base.nix
+    ../full.nix
-    ../essential-no-arm.nix
-    ../desktop.nix
     ../kat.nix
   ];
 

nixos/machines/ryzen-shine.nix

@@ -2,9 +2,7 @@
 
 {
   imports = [
-    ../users.nix
     ../full.nix
-    ../dfinity.nix
     ../games.nix
     ../essential.nix
     ../desktop.nix