mispelling

configuration.nix

@@ -36,6 +36,9 @@
       "/var/db/sudo/lectured"
       "/var/lib/nixos"
     ];
+    files = [
+      "/etc/machine-id"
+    ];
   };
 
   # SOPS config
@@ -84,6 +87,9 @@
         "d fam google" = {
           pskRaw = "ext:home";
         };
+        "PumpingStationOne" = {
+          pskRaw = "ext:PumpingStationOne";
+        };
       };
     };
 
@@ -122,6 +128,7 @@
     extraGroups = [
       "wheel"
       "networkmanager"
+      "incus-admin"
     ];
     shell = pkgs.fish;
   };
@@ -214,10 +221,19 @@
     ];
   };
 
+  virtualisation.incus.enable = true;
+
   # Open ports in the firewall.
+  # Trust incus interface for VM stuff
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
-  networking.firewall.enable = true;
+  networking = {
+    firewall = {
+      enable = true;
+      trustedInterfaces = [ "incusbr0" ];
+    };
+    nftables.enable = true;
+  };
 
   # INITIAL system version
   system.stateVersion = "24.11";

flake.lock

@@ -28,11 +28,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1787112172,
-        "narHash": "sha256-UMk1vXwGwx7dSxHAst6EcOvsryXIRuRF1QIFCz3oG+k=",
+        "lastModified": 1789099409,
+        "narHash": "sha256-dAGoOmXjG+5uPwTWgsIep1Qo6pPSsTG1feXRpC29xGA=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "b6890db16471fa96d9223b538bcd30af7ea0a9bb",
+        "rev": "fcf6f00c8e0869c68635cb624757f5824ad38e41",
         "type": "gitlab"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785627969,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "lastModified": 1788450739,
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787146702,
-        "narHash": "sha256-YbRcLdU/yK4gWsQg7V8WTKZHfXL33g8+wSFUX3wyevs=",
+        "lastModified": 1789182507,
+        "narHash": "sha256-9nt4W0HNNP84B+b37yRs9Zxat1ZR5guJxEZDEjAgex4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "173b7e8d40fdc8c296a9c99854314f17a3a1704c",
+        "rev": "b1d1b60084970f9d1e2b72662639dab6d039be71",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1787101114,
-        "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
+        "lastModified": 1789114715,
+        "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
+        "rev": "21a67dc470149f337cecafbe965d8d252a390518",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1786711500,
-        "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
+        "lastModified": 1788405554,
+        "narHash": "sha256-r2f1oUwixlgq9zOdYLqJLfS/lWBT60/IITjhTKI59JU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
+        "rev": "a5cc6f2c37bf518436dc8d1c288ccd0c43c2f4c4",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1786873773,
-        "narHash": "sha256-Hj/nkhKDv0aJly1PAUstrhrgEYn1mVSkLIYMh90r/Pc=",
+        "lastModified": 1788623321,
+        "narHash": "sha256-i8v07Plhfpx/nVFMvnMSC6P05RQ43mbLQsS5grni4Vk=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "b397fb9f6950d57355d62bb92457d223464e0115",
+        "rev": "68c2edd2787f055d9c306bcfe726f3b8f11b9441",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786629091,
-        "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=",
+        "lastModified": 1788914643,
+        "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f",
+        "rev": "13616fff713a9f94055c66f15687ebdc17a335df",
         "type": "github"
       },
       "original": {

home-manager/home.nix

@@ -12,24 +12,19 @@
 
   home.packages = with pkgs; [
     age
-    anki
-    awscli2
+    brightnessctl
     dig
     discord
     ffmpeg_6
     fish
     git
-    git-filter-repo
-    go
     grim
+    incus
     jq
-    kdePackages.gwenview
-    minio-client
     nodejs_22
     postman
     prismlauncher
     python3
-    rcon
     slurp
     sops
     spotify
@@ -37,12 +32,10 @@
     tree
     tmux
     unzip
-    vlc
     wl-clipboard
     woeusb
     wofi
     xrandr
-    yq-go
     zip
   ];
 
@@ -63,6 +56,8 @@
       ".local/share/Steam"
       # persist spotify login
       ".config/spotify"
+      # persist discord login
+      ".config/discord"
       # Minecraft (long download times)
       ".local/share/PrismLauncher/instances"
       ".local/share/PrismLauncher/assets"

home-manager/programs/fish.nix

@@ -10,9 +10,7 @@
       gpr = "git pull --rebase";
       gl = "git log";
       shypr = "start-hyprland";
-      nixrb = "sudo nixos-rebuild switch --flake";
-
-      hscon = "rcon -H 192.168.8.182 -p 25575 -P 'CHANGE_THIS_SECRET'";
+      nixrb = "sudo nixos-rebuild switch --flake .#$hostname";
     };
 
     functions = {

secrets/networking.yaml

@@ -1,8 +1,7 @@
-networkPasswords: ENC[AES256_GCM,data:tF/DUxgI9C+S1SO9nihoeswqGf0s0Wg4ioQHarRC4w2KucHrt+onir5dyhlMvhQwkBR0U19r3cVkRIAArF/ZAmUxgu98QlNN8bgOIA==,iv:JcXllTrkP81TgMDZ3eptBEWfBTIhyBlWeohp+YzxCK4=,tag:0Kp+ZqBYx9vcG+E6tmWodw==,type:str]
+networkPasswords: ENC[AES256_GCM,data:hZaxuuPT3m9i9IqhrBzVr7nHfBD9k5MAUukMa8Q/fKM5SNc29SUxHXKxFsu+ewzCh5vZkSOi/TL/hsy9pn7flBrpFr27rh//dpQBBzeBfe7lfkqoHBAE5Ug5WwDUM+tGNqtkoJHg1Dc=,iv:L7Wmmo0PdKx4U1A1bB0gEQEZLjTskACyZA//DmEXOrk=,tag:BsfnubnkB8ECOZIO5bRbvg==,type:str]
 sops:
     age:
-        - recipient: age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y
-          enc: |
+        - enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKZjFMVDJuQ3JhbmVLUXVO
             MWREakYyTjB6MmJuTzFtVDZKeGVQeWdOUFdvCjBZUHVVZXBqYkp0SVlQUXNtTWFL
@@ -10,8 +9,8 @@ sops:
             VWVzQ1JCeUJZbGRFd2tFUlp2cE5sUjQKLlfI5r58wCY8rDgDEq96NUAS8t1xG6Gi
             AbfjrvkSpRewwDysCXHrg2PX5PwtiVZJks6BRMHgNW18utMFeNEJdw==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1awcm4kpq9zpl2fwxuktmxkwuse5reup2rfzrdsnh643ahy7ncgcq6e6ey2
-          enc: |
+          recipient: age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y
+        - enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBc0pZSXZLT3VIUjdlU2Y1
             UjF6L3NZWTFpZWlGTzFrK3N6bFhWR2tVNVIwClhDa0pDK3JLM3RvTVVsU0pJbkQr
@@ -19,8 +18,8 @@ sops:
             a2N2L0NuQWNLYmNBZERrUTFzM3JGOGMKsAEvtT2ECMF6qhKnzjz5omne9ZaA0iH4
             Z9fzIkKOx/Fwd34eisBITTAolkITdqR7ZIweHAPENg8ycaoshMEZZg==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1rwugh86469664fwhgrj9xuhjxs9vpflx3r0ftuvd0glphf2gecfs8thxsj
-          enc: |
+          recipient: age1awcm4kpq9zpl2fwxuktmxkwuse5reup2rfzrdsnh643ahy7ncgcq6e6ey2
+        - enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCTTlnTGVnRFR3TDBNMjFv
             NzlpREFIVDc1REpqcGE1eVRVaUVRMndlZlRNClIydTFTTlZrVjYzYkc3UHZFMUov
@@ -28,8 +27,8 @@ sops:
             OFJJRVJxTGl5SUpqM0VkY1BXNEZmUkEKev4hzKMUcas6CdlUl9HWlk8H8z3cMXn3
             lJNGTGj/gOGra8yVNEl53W2nu4zNJ9HG1OHywQEBZrovsn0nxS4YDQ==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1q79gcucm8htjnlgvyl0k8lfftdnyg77sxxk9jynn84zkx44ygqqsdq3p8u
-          enc: |
+          recipient: age1rwugh86469664fwhgrj9xuhjxs9vpflx3r0ftuvd0glphf2gecfs8thxsj
+        - enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFSGExNERuZm9jMHdBL09o
             NkVGaEdvMEVpZlk2NXFYRmxiQUZwWGpkVWw4CkFna3ptTXRaOXM3aUNVS3I4YmhH
@@ -37,7 +36,8 @@ sops:
             S3FXUzErOGMraGNFZFd2ZWdQTFFodHMK07v4ageHpsJgI39q7hFCTjoWoCA6mjtf
             xmKkOxOvpWF5fUvXTy/x1+/iclU2g3cMUpDWwU24ScpVq+Af4LQC3A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-11-28T18:02:34Z"
-    mac: ENC[AES256_GCM,data:7NBAL8GFWLhTYcY3bYpTRh9bDNO+dBdGw0742SZY15ZYuu2nc95N/hfZ3XXlJ87uRadDAgOVAjR4m8bAPNSeogSp01gkbGpDRG89azwoaLdfO3dwbzNQic4O3Yf1bcD5CMrp2Z0abfyCuKnpnJSRhQbon80jOu8+LSfKdW2wOco=,iv:1OOJ7vHUmrY5ahJitSSk0zoVVu9f42L4OMHSTIZss8k=,tag:mogeKxpIW5WLAB8qIGjFbA==,type:str]
+          recipient: age1q79gcucm8htjnlgvyl0k8lfftdnyg77sxxk9jynn84zkx44ygqqsdq3p8u
+    lastmodified: "2026-09-04T03:42:24Z"
+    mac: ENC[AES256_GCM,data:b48tgm+tagyEuRupZ3dbA4GzA32HJ0Sc2FEXBeWxGU4YUwGJj27EpzdQMEmyb55ivpPXNptTXVpJORgCoRbxGU+7ezgsHGfiy4J4w5b+gKzusHaKAOqQuL7lOrKt2GwbfAZ3LZCaSXfhIDJw8246zrxFsNPLNHKcZD+EqvhvY2c=,iv:1O+4h8wZ0zuoP0+tcXsq35ZDRrfEKMoP2kkUtXpjqHM=,tag:5ADOwAWwMbeVSWBadjij1Q==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.13.3