modules/base/default.nix

@@ -1,6 +1,7 @@
 {...}: {
   imports = [
     ./agenix.nix
+    ./docker.nix
     ./fish.nix
     ./git.nix
     ./hardware.nix

modules/base/programs.nix

@@ -2,28 +2,36 @@
   # NixOS default packages:
   # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/config/system-path.nix
   environment.systemPackages = with pkgs; [
+    ascii
     bandwhich
     bat
     binutils
+    black
+    clang
     dnsutils
     fd
     file
     fzf
+    gcc
     git
+    gnumake
     htop
     iputils
     jq
     lsof
+    magic-wormhole-rs
     mtr
     ncdu
     ntp
     openssl
     pciutils
+    postgresql
     progress
+    pwgen
     python3
+    python310
     python311
     python312
-    python313
     socat
     sqlite-interactive
     tcpdump

modules/base/ssh.nix

@@ -19,7 +19,9 @@
   programs.ssh.knownHosts = {
     "alpha".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGOpQNEmmEe6jr7Mv37ozokvtTSd1I3SmUU1tpCSNTkc";
     "delta".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFe9RpnO1/QRU81kjtEsWN66xfP5Y/qf5EQZ6wdM/XCT";
+    "delta-old".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB0x9oImZjIhoPEwLlHVixIh7y1Kwn+SX17xffrdRzvv";
     "sigma".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC4Kvx/lcFRvl7KlxqqhrJ32h3FzuzyLA5BNB42+p92c";
+    "sigma-old".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF2Qrh0tpR5YawiYvcPGC4OSnu4//ge1eVdiBDLrTbCx";
     "tor".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMVPxvqwS2NMqqCGBkMmExzdBY5hGLegiOuqPJAOfdKk";
     "git.caspervk.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC4Kvx/lcFRvl7KlxqqhrJ32h3FzuzyLA5BNB42+p92c";
   };

modules/desktop/default.nix

@@ -1,7 +1,6 @@
 {...}: {
   imports = [
     ./clipman.nix
-    ./docker.nix
     ./flatpak.nix
     ./foot.nix
     ./gammastep.nix

modules/desktop/programs.nix

@@ -8,13 +8,11 @@
   # Packages useful on a desktop computer which don't require their own module
 
   environment.systemPackages = with pkgs; [
-    ascii
     aspell
     aspellDicts.da
     aspellDicts.en
     aspellDicts.en-computers
     aspellDicts.en-science
-    black
     element-desktop
     firefox-wayland
     gimp
@@ -32,8 +30,6 @@
     libreoffice
     mpv
     mumble
-    postgresql
-    pwgen
     spotify
     thunderbird
     tor-browser-bundle-bin