fix(lsp): remove ansiblels since it isnt needed anyway

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# nixfmt reformat
-2231d2fc3fb4dc140c5f3257523dcdb513ac4dea

.gitignore

@@ -8,7 +8,3 @@ result-*
 
 # vim
 *.swp
-
-# devenv
-.devenv*
-devenv.local.nix

devenv.lock

@@ -1,65 +0,0 @@
-{
-  "nodes": {
-    "devenv": {
-      "locked": {
-        "dir": "src/modules",
-        "lastModified": 1790701375,
-        "narHash": "sha256-0FpLHIRDYiyo3EMTnMQSobZQknZaa3JuWo6vmMCK76o=",
-        "owner": "cachix",
-        "repo": "devenv",
-        "rev": "fe20b5cba7ab5e93ae73f956a8d3efc50e1753f4",
-        "type": "github"
-      },
-      "original": {
-        "dir": "src/modules",
-        "owner": "cachix",
-        "repo": "devenv",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "inputs": {
-        "nixpkgs-src": "nixpkgs-src"
-      },
-      "locked": {
-        "lastModified": 1789506231,
-        "narHash": "sha256-vNkJbtmqyBfFhn/HnzQo4ROuoyYWuy/allqTfJb4kMY=",
-        "owner": "cachix",
-        "repo": "devenv-nixpkgs",
-        "rev": "c2f38fe7f9e04d9aadd354d380f2bd40531d9737",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "ref": "rolling",
-        "repo": "devenv-nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1789370336,
-        "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c7def046b9a883d46974757852106483d741586f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "devenv": "devenv",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

devenv.nix

@@ -1,29 +0,0 @@
-{ pkgs, ... }:
-
-{
-  packages = with pkgs; [
-    # gitea (git.0x29a.ch)
-    tea
-    # nix tooling
-    nixfmt # official formatter (RFC 166 style)
-    statix # lints for nix anti-patterns
-    deadnix # finds unused bindings and arguments
-    nixd # language server
-    nvd # diff system generations
-  ];
-
-  scripts = {
-    lint.exec = ''
-      set -e
-      statix check .
-      deadnix --fail --exclude hosts/*/hardware-configuration.nix -- .
-    '';
-    fmt.exec = ''
-      nixfmt $(git ls-files '*.nix')
-    '';
-  };
-
-  enterShell = ''
-    echo "nixconfig devenv: tea, lint, fmt"
-  '';
-}

devenv.yaml

@@ -1,3 +0,0 @@
-inputs:
-  nixpkgs:
-    url: github:cachix/devenv-nixpkgs/rolling

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788450739,
+        "lastModified": 1775087534,
-        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790819692,
+        "lastModified": 1777389590,
-        "narHash": "sha256-rvubAPbh3QCliic3sAK+CXTrPCGgJstY52OTs/5H1J4=",
+        "narHash": "sha256-HWbn7WASXsXGADiBDt6/k9U/HpGBEmoeqIOzrf+z2HE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c8ecc29e5175452bee4a2aa1ba2383856d795338",
+        "rev": "8ec5a714dbbeb3fda00bd9758175555ebbad4d07",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1790689126,
+        "lastModified": 1777268161,
-        "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=",
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1790541651,
+        "lastModified": 1777236345,
-        "narHash": "sha256-/496IQz8qNWHHLnc3Zvr0l4uxJ34igNhJhn7ZKAefFk=",
+        "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "5980a626794486abad69fca7667f9c11dfbc3bd7",
+        "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
         "type": "github"
       },
       "original": {
@@ -83,14 +83,15 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "noctalia-qs": "noctalia-qs"
       },
       "locked": {
-        "lastModified": 1790718664,
+        "lastModified": 1777253304,
-        "narHash": "sha256-LWil4xgSyqIFZ9sydvL1glFOoiqAOknWUwykC4sqxuY=",
+        "narHash": "sha256-XqSHEKEW5pSAx9MoMo8mKPgkjoy4FEhZ4x0a6hGYrSI=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "fd9759c892fe5034b682c185695f1bee121cd5b3",
+        "rev": "6773c4750a12c9e9af9c4ce2365e083f1d0d0ad8",
         "type": "github"
       },
       "original": {
@@ -99,6 +100,29 @@
         "type": "github"
       }
     },
+    "noctalia-qs": {
+      "inputs": {
+        "nixpkgs": [
+          "noctalia",
+          "nixpkgs"
+        ],
+        "systems": "systems_2",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1777167795,
+        "narHash": "sha256-VHdtmxVX7oF2+FxYQQPARQmtaHw23FoTBiTaH6ucOEg=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-qs",
+        "rev": "697db4c14e27d841956ff76887fc312443e6fb17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-qs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
@@ -108,21 +132,56 @@
       }
     },
     "systems": {
-      "flake": false,
       "locked": {
-        "lastModified": 1774449309,
+        "lastModified": 1681028828,
-        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
         "repo": "default",
-        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "ref": "future-26.11",
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "noctalia",
+          "noctalia-qs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775636079,
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -17,38 +17,29 @@
     };
   };
 
-  outputs =
+  outputs = { self, nixpkgs, home-manager, nixvim, ... }@inputs:
-    {
+  let
-      nixpkgs,
+    mkHost = hostName: nixpkgs.lib.nixosSystem {
-      home-manager,
+      system = "x86_64-linux";
-      nixvim,
+      specialArgs = { inherit inputs; };
-      ...
+      modules = [
-    }@inputs:
+        ./hosts/${hostName}/hardware-configuration.nix
-    let
+        ./hosts/${hostName}/configuration.nix
-      mkHost =
+        home-manager.nixosModules.home-manager
-        hostName:
+        {
-        nixpkgs.lib.nixosSystem {
+          home-manager.extraSpecialArgs = { inherit inputs; };
-          system = "x86_64-linux";
+          home-manager.users.aaron.imports = [
-          specialArgs = { inherit inputs; };
+            nixvim.homeModules.nixvim
-          modules = [
+            ./users/aaron/home.nix
-            ./hosts/${hostName}/hardware-configuration.nix
-            ./hosts/${hostName}/configuration.nix
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.extraSpecialArgs = { inherit inputs; };
-              home-manager.users.aaron.imports = [
-                nixvim.homeModules.nixvim
-                ./users/aaron/home.nix
-              ];
-            }
           ];
-        };
+        }
-    in
+      ];
-    {
-      nixosConfigurations = {
-        default = mkHost "default";
-        neon = mkHost "neon";
-        argon = mkHost "argon";
-      };
     };
+  in {
+    nixosConfigurations = {
+      default = mkHost "default";
+      neon    = mkHost "neon";
+      argon   = mkHost "argon";
+    };
+  };
 }

hosts/argon/configuration.nix

@@ -1,14 +1,14 @@
+{ config, pkgs, inputs, ... }:
+
 {
   imports = [
-    ../../modules/nixos/appimage.nix
-    ../../modules/nixos/astro.nix
     ../../modules/nixos/audio.nix
     ../../modules/nixos/bootloader.nix
     ../../modules/nixos/calibre.nix
     ../../modules/nixos/certificates.nix
-    ../../modules/nixos/claudecode.nix
     ../../modules/nixos/drives.nix
     ../../modules/nixos/gnupg.nix
+    ../../modules/nixos/gnuradio.nix
     ../../modules/nixos/graphics.nix
     ../../modules/nixos/greetd.nix
     ../../modules/nixos/locales.nix
@@ -21,17 +21,13 @@
     ../../modules/nixos/services.nix
     ../../modules/nixos/settings.nix
     ../../modules/nixos/steam.nix
-    ../../modules/nixos/thunar.nix
     ../../modules/nixos/users.nix
-    ../../modules/nixos/vial.nix
   ];
 
-  # host-specific niri config (outputs, input devices)
-  home-manager.users.aaron.imports = [ ./niri.nix ];
-
   # set hostname
   networking.hostName = "argon";
 
   # install state version
   system.stateVersion = "25.11"; # Don't change
 }
+

hosts/argon/hardware-configuration.nix

@@ -1,54 +1,38 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+    ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ "dm-crypt dm-mod" ];
   boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/mapper/lvmroot-root";
+    { device = "/dev/mapper/lvmroot-root";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/AC1C-20EB";
+    { device = "/dev/disk/by-uuid/AC1C-20EB";
-    fsType = "vfat";
+      fsType = "vfat";
-    options = [
+      options = [ "fmask=0022" "dmask=0022" ];
-      "fmask=0022"
+    };
-      "dmask=0022"
+
+  fileSystems."/home" =
+    { device = "/dev/mapper/lvmroot-home";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/mapper/lvmroot-swap"; }
     ];
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/mapper/lvmroot-home";
-    fsType = "ext4";
-  };
-
-  swapDevices = [
-    { device = "/dev/mapper/lvmroot-swap"; }
-  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hosts/argon/niri.nix

@@ -1,36 +0,0 @@
-# argon: desktop with two 1440p monitors side by side
-{
-  wayland.windowManager.niri.settings = {
-    input = {
-      touchpad.off = { };
-      trackpoint.off = { };
-    };
-
-    _children = [
-      {
-        output = {
-          _args = [ "DP-1" ];
-          mode = "2560x1440@165.000";
-          scale = 1;
-          transform = "normal";
-          position._props = {
-            x = 0;
-            y = 0;
-          };
-        };
-      }
-      {
-        output = {
-          _args = [ "DP-2" ];
-          mode = "2560x1440@143.912";
-          scale = 1;
-          transform = "normal";
-          position._props = {
-            x = 2560;
-            y = 0;
-          };
-        };
-      }
-    ];
-  };
-}

hosts/default/configuration.nix

@@ -1,13 +1,10 @@
 # 0x29a nixos conifg
 
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
   # use flakes
-  nix.settings.experimental-features = [
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    "nix-command"
-    "flakes"
-  ];
 
   # configure bootloader
   boot.loader.systemd-boot.enable = false;
@@ -63,10 +60,9 @@
 
     windowManager.qtile = {
       enable = true;
-      extraPackages =
+      extraPackages = python3Packages: with python3Packages; [
-        python3Packages: with python3Packages; [
+        qtile-extras
-          qtile-extras
+      ];
-        ];
     };
   };
 
@@ -75,8 +71,8 @@
 
   # enable sound
   services.pipewire = {
-    enable = true;
+     enable = true;
-    pulse.enable = true;
+     pulse.enable = true;
   };
 
   # define a user account
@@ -101,10 +97,7 @@
     autosuggestions.enable = true;
     ohMyZsh = {
       enable = true;
-      plugins = [
+      plugins = [ "git" "sudo" ];
-        "git"
-        "sudo"
-      ];
       theme = "agnoster";
     };
   };
@@ -123,8 +116,8 @@
   # Some programs need SUID wrappers
   programs.mtr.enable = true;
   programs.gnupg.agent = {
-    enable = true;
+     enable = true;
-    enableSSHSupport = true;
+     enableSSHSupport = true;
   };
 
   # enable the OpenSSH daemon
@@ -137,3 +130,4 @@
   # install state version
   system.stateVersion = "25.05"; # Don't change
 }
+

hosts/default/hardware-configuration.nix

@@ -1,56 +1,36 @@
 # 0x29a nixos hardware configuration
 
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
-  ];
+    ];
 
   # boot and initrd configs
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-    "uhci_hcd"
+  boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
-    "ehci_pci"
-    "ahci"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [
-    "dm-snapshot"
-    "cryptd"
-  ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
   boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
 
   # file systems
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-label/nixroot";
+    { device = "/dev/disk/by-label/nixroot";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-label/nixboot";
+    { device = "/dev/disk/by-label/nixboot";
-    fsType = "vfat";
+      fsType = "vfat";
-    options = [
+      options = [ "fmask=0022" "dmask=0022" ];
-      "fmask=0022"
+    };
-      "dmask=0022"
+  fileSystems."/home" =
+    { device = "/dev/disk/by-label/nixhome";
+      fsType = "ext4";
+    };
+  swapDevices =
+    [ { device = "/dev/disk/by-label/nixswap"; }
     ];
-  };
-  fileSystems."/home" = {
-    device = "/dev/disk/by-label/nixhome";
-    fsType = "ext4";
-  };
-  swapDevices = [
-    { device = "/dev/disk/by-label/nixswap"; }
-  ];
 
   # enable dhcp on all interfaces
   networking.useDHCP = lib.mkDefault true;

hosts/default/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   # user config
@@ -29,6 +29,7 @@
     iotop
     iftop
     strace
+    ltrace
     lsof
     sysstat
     lm_sensors
@@ -50,16 +51,12 @@
     syntaxHighlighting.enable = true;
     oh-my-zsh = {
       enable = true;
-      plugins = [
+      plugins = [ "git" "sudo" "python" "ansible" ];
-        "git"
-        "sudo"
-        "python"
-        "ansible"
-      ];
       theme = "agnoster";
     };
   };
 
+
   ## deploy qtile config
   #home.file."qtile-config" = {
   #  target = ".config/qtile/config.py";

hosts/neon/configuration.nix

@@ -1,11 +1,10 @@
+{ config, pkgs, inputs, ... }:
+
 {
   imports = [
-    ../../modules/nixos/appimage.nix
-    ../../modules/nixos/astro.nix
     ../../modules/nixos/audio.nix
     ../../modules/nixos/bootloader.nix
     ../../modules/nixos/certificates.nix
-    ../../modules/nixos/claudecode.nix
     ../../modules/nixos/docker.nix
     ../../modules/nixos/gnupg.nix
     ../../modules/nixos/locales.nix
@@ -14,21 +13,17 @@
     ../../modules/nixos/noctalia.nix
     ../../modules/nixos/openssh.nix
     ../../modules/nixos/packages.nix
-    ../../modules/nixos/protonvpn.nix
     ../../modules/nixos/sddm.nix
     ../../modules/nixos/services.nix
     ../../modules/nixos/settings.nix
     ../../modules/nixos/steam.nix
     ../../modules/nixos/users.nix
-    ../../modules/nixos/vial.nix
   ];
 
-  # host-specific niri config (input devices, laptop binds)
-  home-manager.users.aaron.imports = [ ./niri.nix ];
-
   # set hostname
   networking.hostName = "neon";
 
   # install state version
   system.stateVersion = "25.11"; # Don't change
 }
+

hosts/neon/hardware-configuration.nix

@@ -1,57 +1,39 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+    ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-    "xhci_pci"
+  boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
-  boot.initrd.kernelModules = [
-    "dm-snapshot"
-    "cryptd"
-  ];
   boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
 
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-label/nixroot";
+    { device = "/dev/disk/by-label/nixroot";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-label/nixboot";
+    { device = "/dev/disk/by-label/nixboot";
-    fsType = "vfat";
+      fsType = "vfat";
-    options = [
+      options = [ "fmask=0022" "dmask=0022" ];
-      "fmask=0022"
+    };
-      "dmask=0022"
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-label/nixhome";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-label/nixswap"; }
     ];
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-label/nixhome";
-    fsType = "ext4";
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-label/nixswap"; }
-  ];
 
   networking.useDHCP = lib.mkDefault true;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

hosts/neon/niri.nix

@@ -1,34 +0,0 @@
-# neon: laptop, built-in display is auto-configured by niri
-{ lib, ... }:
-
-let
-  brightness = step: {
-    _props.allow-when-locked = true;
-    spawn = [
-      "brightnessctl"
-      "--class=backlight"
-      "set"
-      step
-    ];
-  };
-in
-{
-  wayland.windowManager.niri.settings = {
-    input.touchpad = {
-      tap = { };
-      natural-scroll = { };
-    };
-
-    layout.gaps = lib.mkForce 10;
-
-    binds = {
-      "Print".screenshot = { };
-      "Ctrl+Print".screenshot-screen = { };
-      "Mod+Shift+P".power-off-monitors = { };
-
-      # finer brightness steps; mkForce, since spawn lists would otherwise be concatenated
-      "XF86MonBrightnessUp" = lib.mkForce (brightness "+1%");
-      "XF86MonBrightnessDown" = lib.mkForce (brightness "1%-");
-    };
-  };
-}

modules/home-manager/fonts.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   # user fonts

modules/home-manager/ghostty.nix

@@ -1,3 +1,5 @@
+{ config, pkgs, inputs, ... }:
+
 {
   programs.ghostty = {
     enable = true;

modules/home-manager/git.nix

@@ -1,46 +1,17 @@
+{ config, pkgs, inputs, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  email = "aaron@0x29a.ch";
-
-  # public half of every machine's ~/.ssh/id_ed25519, each one verified as a
-  # signing key in gitea. the key a host signs with is picked up from the key
-  # file itself, this list only tells the local git which machines to trust
-  signingKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHRhwzo1oxaT3fEySSmILKNnu9v30cfjx5G7FKpmfqeX aaron@argon"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDkhvvTUcBSQdtXjX+Mw2Bp8HHhtiBm8aJi4ZxiBgZR aaron@neon"
-  ];
-in
-{
-  # gitea verifies signatures against the account keys, this teaches the local
-  # git the same trust so `git log --show-signature` resolves as well
-  xdg.configFile."git/allowed_signers".text = lib.concatMapStrings (
-    key: "${email} ${key}\n"
-  ) signingKeys;
-
   programs.git = {
     enable = true;
     settings = {
-      push = {
+      push = { autoSetupRemote = true; };
-        autoSetupRemote = true;
-      };
       user = {
-        name = "aaron";
+        name  = "aaron";
-        inherit email;
+        email = "aaron@0x29a.ch";
       };
-      gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
     };
     signing = {
-      format = "ssh";
+      key = "7A830180A05DAC59CDE43B0677D2F5DB48184456";
-      # point at the *public* key so ssh-keygen signs through the ssh agent
-      # instead of reading the passphrase protected private key from disk
-      key = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
-      signer = "${pkgs.openssh}/bin/ssh-keygen";
       signByDefault = true;
     };
   };

modules/home-manager/niri.nix

@@ -1,298 +0,0 @@
-{ lib, osConfig, ... }:
-
-let
-  # Mod+1..9 focus a workspace, Mod+Ctrl+1..9 move the column there.
-  workspaceBinds = lib.mergeAttrsList (
-    map (n: {
-      "Mod+${toString n}".focus-workspace = n;
-      "Mod+Ctrl+${toString n}".move-column-to-workspace = n;
-    }) (lib.range 1 9)
-  );
-
-  # Shorthand for binds that only run spawn-sh while allowed on the lock screen.
-  lockedSh = cmd: {
-    _props.allow-when-locked = true;
-    spawn-sh = cmd;
-  };
-in
-{
-  # Niri config, rendered to ~/.config/niri/config.kdl by home-manager's built-in
-  # wayland.windowManager.niri module. The compositor itself, its session, systemd
-  # units and portals are provided by the NixOS module (modules/nixos/niri.nix), so
-  # this module only writes the config. Host-specific outputs and input devices
-  # live in hosts/<host>/niri.nix.
-
-  wayland.windowManager.niri = {
-    # only on hosts that run niri (see modules/nixos/niri.nix)
-    enable = osConfig.programs.niri.enable;
-
-    # Use the system's niri so the config is validated against the running version.
-    package = osConfig.programs.niri.package;
-    systemd.enable = false;
-    portalPackage = null;
-    xwaylandSatellitePackage = null; # installed system-wide
-
-    settings = {
-      input = {
-        keyboard = {
-          xkb.layout = "ch";
-          numlock = { };
-        };
-        mouse = {
-          natural-scroll = { };
-          accel-speed = 0.5;
-          scroll-method = "no-scroll";
-        };
-      };
-
-      environment.GTK_IM_MODULE = "simple";
-
-      layout = {
-        gaps = 16;
-        center-focused-column = "never";
-
-        preset-column-widths._children = [
-          { proportion = 0.33333; }
-          { proportion = 0.5; }
-          { proportion = 0.66667; }
-          { fixed = 2560; }
-        ];
-
-        default-column-width.proportion = 0.5;
-
-        focus-ring = {
-          on = { };
-          width = 2;
-          active-color = "#4c566a";
-          inactive-color = "#2e3440";
-          urgent-color = "#a3be8c";
-        };
-
-        border.off = { };
-
-        shadow = {
-          on = { };
-          draw-behind-window = true;
-          softness = 30;
-          spread = 10;
-          offset._props = {
-            x = 0;
-            y = 5;
-          };
-          color = "#0007";
-        };
-      };
-
-      spawn-at-startup = "noctalia";
-
-      hotkey-overlay.skip-at-startup = { };
-
-      screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
-
-      _children = [
-        # Open the Firefox picture-in-picture player as floating by default.
-        {
-          window-rule._children = [
-            {
-              match._props = {
-                app-id = "firefox$";
-                title = "^Picture-in-Picture$";
-              };
-            }
-            { open-floating = true; }
-          ];
-        }
-        # Block out the password manager from screen capture.
-        {
-          window-rule._children = [
-            { match._props.app-id = "^org\\.keepassxc\\.KeePassXC$"; }
-            { block-out-from = "screen-capture"; }
-          ];
-        }
-        {
-          window-rule = {
-            geometry-corner-radius = 12;
-            clip-to-geometry = true;
-          };
-        }
-      ];
-
-      binds = workspaceBinds // {
-        # programs: terminal, app launcher, screen locker
-        "Mod+Return" = {
-          _props.hotkey-overlay-title = "Open a Terminal";
-          spawn = "ghostty";
-        };
-        "Mod+D" = {
-          _props.hotkey-overlay-title = "Run an Application";
-          spawn = [
-            "noctalia"
-            "msg"
-            "panel-toggle"
-            "launcher"
-          ];
-        };
-        "Super+Alt+L" = {
-          _props.hotkey-overlay-title = "Lock the Screen";
-          spawn = [
-            "noctalia"
-            "msg"
-            "session"
-            "lock"
-          ];
-        };
-
-        # media keys (PipeWire / WirePlumber)
-        "XF86AudioRaiseVolume" = lockedSh "wpctl set-volume @DEFAULT_SINK@ 0.01+ -l 1.0";
-        "XF86AudioLowerVolume" = lockedSh "wpctl set-volume @DEFAULT_SINK@ 0.01-";
-        "XF86AudioMute" = lockedSh "wpctl set-mute @DEFAULT_SINK@ toggle";
-        "XF86AudioMicMute" = lockedSh "wpctl set-mute @DEFAULT_SOURCE@ toggle";
-        "XF86AudioPlay" = lockedSh "playerctl play-pause";
-        "XF86AudioStop" = lockedSh "playerctl stop";
-        "XF86AudioPrev" = lockedSh "playerctl previous";
-        "XF86AudioNext" = lockedSh "playerctl next";
-        "XF86MonBrightnessUp" = {
-          _props.allow-when-locked = true;
-          spawn = [
-            "brightnessctl"
-            "--class=backlight"
-            "set"
-            "+10%"
-          ];
-        };
-        "XF86MonBrightnessDown" = {
-          _props.allow-when-locked = true;
-          spawn = [
-            "brightnessctl"
-            "--class=backlight"
-            "set"
-            "10%-"
-          ];
-        };
-
-        "Mod+O" = {
-          _props.repeat = false;
-          toggle-overview = { };
-        };
-        "Mod+Q" = {
-          _props.repeat = false;
-          close-window = { };
-        };
-
-        # focus / move columns and windows
-        "Mod+Left".focus-column-left = { };
-        "Mod+Down".focus-window-down = { };
-        "Mod+Up".focus-window-up = { };
-        "Mod+Right".focus-column-right = { };
-        "Mod+H".focus-column-left = { };
-        "Mod+J".focus-window-down = { };
-        "Mod+K".focus-window-up = { };
-        "Mod+L".focus-column-right = { };
-
-        "Mod+Shift+Left".move-column-left = { };
-        "Mod+Shift+Down".move-window-down = { };
-        "Mod+Shift+Up".move-window-up = { };
-        "Mod+Shift+Right".move-column-right = { };
-        "Mod+Shift+H".move-column-left = { };
-        "Mod+Shift+J".move-window-down = { };
-        "Mod+Shift+K".move-window-up = { };
-        "Mod+Shift+L".move-column-right = { };
-
-        "Mod+Home".focus-column-first = { };
-        "Mod+End".focus-column-last = { };
-        "Mod+Ctrl+Home".move-column-to-first = { };
-        "Mod+Ctrl+End".move-column-to-last = { };
-
-        # move columns between monitors
-        "Mod+Ctrl+Left".move-column-to-monitor-left = { };
-        "Mod+Ctrl+Down".move-column-to-monitor-down = { };
-        "Mod+Ctrl+Up".move-column-to-monitor-up = { };
-        "Mod+Ctrl+Right".move-column-to-monitor-right = { };
-        "Mod+Ctrl+H".move-column-to-monitor-left = { };
-        "Mod+Ctrl+J".move-column-to-monitor-down = { };
-        "Mod+Ctrl+K".move-column-to-monitor-up = { };
-        "Mod+Ctrl+L".move-column-to-monitor-right = { };
-
-        # workspaces
-        "Mod+Page_Down".focus-workspace-down = { };
-        "Mod+Page_Up".focus-workspace-up = { };
-        "Mod+U".focus-workspace-down = { };
-        "Mod+I".focus-workspace-up = { };
-        "Mod+Ctrl+Page_Down".move-column-to-workspace-down = { };
-        "Mod+Ctrl+Page_Up".move-column-to-workspace-up = { };
-        "Mod+Ctrl+U".move-column-to-workspace-down = { };
-        "Mod+Ctrl+I".move-column-to-workspace-up = { };
-
-        "Mod+Shift+Page_Down".move-workspace-down = { };
-        "Mod+Shift+Page_Up".move-workspace-up = { };
-        "Mod+Shift+U".move-workspace-down = { };
-        "Mod+Shift+I".move-workspace-up = { };
-
-        # mouse wheel
-        "Mod+WheelScrollDown" = {
-          _props.cooldown-ms = 150;
-          focus-workspace-down = { };
-        };
-        "Mod+WheelScrollUp" = {
-          _props.cooldown-ms = 150;
-          focus-workspace-up = { };
-        };
-        "Mod+Ctrl+WheelScrollDown" = {
-          _props.cooldown-ms = 150;
-          move-column-to-workspace-down = { };
-        };
-        "Mod+Ctrl+WheelScrollUp" = {
-          _props.cooldown-ms = 150;
-          move-column-to-workspace-up = { };
-        };
-
-        "Mod+WheelScrollRight".focus-column-right = { };
-        "Mod+WheelScrollLeft".focus-column-left = { };
-        "Mod+Ctrl+WheelScrollRight".move-column-right = { };
-        "Mod+Ctrl+WheelScrollLeft".move-column-left = { };
-
-        "Mod+Shift+WheelScrollDown".focus-column-right = { };
-        "Mod+Shift+WheelScrollUp".focus-column-left = { };
-        "Mod+Ctrl+Shift+WheelScrollDown".move-column-right = { };
-        "Mod+Ctrl+Shift+WheelScrollUp".move-column-left = { };
-
-        # columns
-        "Mod+BracketLeft".consume-or-expel-window-left = { };
-        "Mod+BracketRight".consume-or-expel-window-right = { };
-        "Mod+Comma".consume-window-into-column = { };
-        "Mod+Period".expel-window-from-column = { };
-
-        "Mod+R".switch-preset-column-width = { };
-        "Mod+Shift+R".switch-preset-window-height = { };
-        "Mod+Ctrl+R".reset-window-height = { };
-        "Mod+F".maximize-column = { };
-        "Mod+Shift+F".fullscreen-window = { };
-        "Mod+Ctrl+F".expand-column-to-available-width = { };
-
-        "Mod+C".center-column = { };
-        "Mod+Ctrl+C".center-visible-columns = { };
-
-        "Mod+Minus".set-column-width = "-10%";
-        "Mod+Equal".set-column-width = "+10%";
-        "Mod+Shift+Minus".set-window-height = "-10%";
-        "Mod+Shift+Equal".set-window-height = "+10%";
-
-        "Mod+Space".toggle-window-floating = { };
-        "Mod+Shift+Space".switch-focus-between-floating-and-tiling = { };
-        "Mod+W".toggle-column-tabbed-display = { };
-
-        # screenshots
-        "Mod+P".screenshot = { };
-        "Alt+Print".screenshot-window = { };
-
-        # escape hatch for apps that inhibit keyboard shortcuts
-        "Mod+Escape" = {
-          _props.allow-inhibiting = false;
-          toggle-keyboard-shortcuts-inhibit = { };
-        };
-
-        "Mod+Shift+E".quit = { };
-      };
-    };
-  };
-}

modules/home-manager/nixvim.nix

@@ -1,15 +1,9 @@
-{ pkgs, inputs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   programs.nixvim = {
     enable = true;
 
-    # We keep `inputs.nixvim.inputs.nixpkgs.follows = "nixpkgs"` in flake.nix so
-    # the whole config shares a single nixpkgs. Setting `source` explicitly to
-    # that same nixpkgs acknowledges the override and silences nixvim's warning
-    # about its pinned nixpkgs being bypassed.
-    nixpkgs.source = inputs.nixpkgs;
-
     # set aliases
     viAlias = true;
     vimAlias = true;
@@ -57,7 +51,7 @@
       servers.pyright.enable = true;
       servers.ruff.enable = true;
       keymaps.lspBuf = {
-        "<leader>K" = "hover";
+        "<leader>K"  = "hover";
         "<leader>gd" = "definition";
         "<leader>gr" = "references";
         "<leader>f" = "format";
@@ -67,11 +61,7 @@
     };
     plugins.treesitter = {
       enable = true;
-      settings.ensure_installed = [
+      settings.ensure_installed = [ "markdown" "markdown_inline" "typst" ];
-        "markdown"
-        "markdown_inline"
-        "typst"
-      ];
     };
     plugins.typst-preview = {
       enable = true;
@@ -91,11 +81,7 @@
       enable = true;
       settings = {
         # render in normal mode, raw source in insert
-        render_modes = [
+        render_modes = [ "n" "c" "t"];
-          "n"
-          "c"
-          "t"
-        ];
         pipe_table.preset = "round";
         heading.width = "block";
         file_types = [ "markdown" ];

modules/home-manager/noctalia.nix

@@ -1,141 +0,0 @@
-{ pkgs, inputs, ... }:
-
-{
-  # Noctalia v5 shell, managed via home-manager's built-in programs.noctalia module.
-  # The noctalia flake's homeModules.default is not imported: it redeclares the same
-  # options and its disabledModules path ("programs/noctalia.nix") doesn't match HM's.
-  # See https://docs.noctalia.dev/v5/getting-started/nixos/
-
-  programs.noctalia = {
-    enable = true;
-
-    # Use the package from the noctalia flake rather than nixpkgs.
-    package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
-
-    # settings is rendered to ~/.config/noctalia/config.toml
-    settings = {
-      # theme / colors
-      theme = {
-        source = "builtin";
-        builtin = "Nord";
-        mode = "dark";
-        templates.builtin_ids = [ "ghostty" ];
-      };
-
-      # general
-      shell = {
-        font_family = "0xProto Nerd Font Mono";
-        ui_scale = 1.2;
-        avatar_path = "/home/aaron/syncthing/pictures/Logo-Aaron-Totenkopf-rund-schwarz.png";
-        telemetry_enabled = false;
-        clipboard_enabled = true;
-        password_style = "random";
-
-        panel = {
-          launcher_compact = true;
-          open_near_click_control_center = true;
-          open_near_click_session = true;
-          open_near_click_wallpaper = true;
-          transparency_mode = "glass";
-        };
-
-        screen_corners = {
-          enabled = true;
-          size = 10;
-        };
-      };
-
-      # location / weather
-      location.address = "Bern";
-
-      weather = {
-        enabled = true;
-        unit = "metric";
-      };
-
-      # wallpaper
-      wallpaper = {
-        enabled = true;
-        directory = "/home/aaron/Pictures/Wallpapers";
-        fill_mode = "crop";
-        default.path = "/home/aaron/Pictures/Wallpapers/nord-theme-tower.png";
-      };
-
-      # bar layout
-      bar = {
-        order = [ "default" ];
-        default = {
-          position = "top";
-          background_opacity = 0.93;
-          font_weight = 400;
-          margin_edge = 0;
-          margin_ends = 0;
-          radius = 0;
-          scale = 1.2;
-          widget_spacing = 20;
-          start = [
-            "control-center"
-            "cpu"
-            "ram"
-            "temp"
-            "active_window"
-          ];
-          center = [ "workspaces" ];
-          end = [
-            "tray"
-            "bluetooth"
-            "notifications"
-            "volume"
-            "network"
-            "clock"
-          ];
-        };
-      };
-
-      # per-widget styling
-      widget = {
-        bluetooth.capsule = true;
-        control-center = {
-          capsule_radius = 8;
-          custom_image = "/home/aaron/Pictures/nix_flake_logo.png";
-          scale = 1.4;
-        };
-        cpu.capsule = true;
-        network = {
-          capsule = true;
-          show_label = false;
-        };
-        notifications.capsule = true;
-        ram.capsule = true;
-        temp.capsule = true;
-        volume = {
-          capsule = true;
-          show_label = false;
-        };
-      };
-
-      # idle behavior
-      idle = {
-        behavior_order = [
-          "screen-off"
-          "lock"
-          "lock-and-suspend"
-        ];
-        behavior = {
-          "screen-off" = {
-            enabled = true;
-            timeout = 600;
-          };
-          "lock" = {
-            enabled = true;
-            timeout = 660;
-          };
-          "lock-and-suspend" = {
-            enabled = true;
-            timeout = 1800;
-          };
-        };
-      };
-    };
-  };
-}

modules/home-manager/programs.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   # user packages
@@ -18,8 +18,5 @@
 
   # browsers
   programs.chromium.enable = true;
-  programs.firefox = {
+  programs.firefox.enable = true;
-    enable = true;
-    configPath = "${config.xdg.configHome}/mozilla/firefox";
-  };
 }

modules/home-manager/shell.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ config, lib, pkgs, inputs, ... }:
  
 {
   # configure z-shell to use omz with some plugins
@@ -8,52 +8,16 @@
     syntaxHighlighting.enable = true;
     oh-my-zsh = {
       enable = true;
-      # add git and agents as plugins
+      # theme will be set below
-      plugins = [
+      theme = "";
-        "git"
+      plugins = [ "git" "ssh-agent" "gpg-agent" ];
-        "ssh-agent"
-        "gpg-agent"
-      ];
-      # everything here lands before `source $ZSH/oh-my-zsh.sh`
-      extraConfig = ''
-        # make omz faster on large repositories
-        DISABLE_UNTRACKED_FILES_DIRTY=true
-
-        # only display a fancy theme when glyphs are rendered
-        if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
-          ZSH_THEME="gentoo"
-        else
-          ZSH_THEME="agnoster"
-        fi
-      '';
     };
-
+    # only display a fancy theme when glyphs are rendered
-    # Unlike oh-my-zsh.extraConfig above, this lands *after*
+    initContent = lib.mkOrder 550 ''
-    # `source $ZSH/oh-my-zsh.sh`, which is where the theme's prompt functions
+      if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
-    # come into existence.
+        ZSH_THEME="gentoo"
-    initContent = lib.mkAfter ''
-      # Keep the prompt on one line in deeply nested trees.
-      #
-      # Both themes render the working directory as `%~`, the full path with
-      # $HOME collapsed to `~`. Somewhere like
-      # ~/git/bfh/cas-pml-sem/documents/bericht that is 39 columns on its own,
-      # and together with user@host and a long branch name the line wraps.
-      #
-      # `%(4~|…/%2~|%~)` is a prompt ternary: at four or more components show
-      # an ellipsis and the last two, otherwise show the path whole. Short
-      # paths like ~/git/nixconfig are left alone.
-      if [[ "$ZSH_THEME" == "agnoster" ]]; then
-        # agnoster calls prompt_dir on every render, so redefining it is
-        # enough. AGNOSTER_DIR_* keep the segment's own colours.
-        prompt_dir() {
-          prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" '%(4~|…/%2~|%~)'
-        }
       else
-        # gentoo builds PROMPT once at load time, so patch the string. Its
+        ZSH_THEME="agnoster"
-        # `%~` is the non-root branch of `%(!.%1~.%~)`, and it is the first
-        # literal `%~` in there, so the root branch is untouched. ASCII `...`
-        # because this branch is the Linux console, whose font may lack U+2026.
-        PROMPT="''${PROMPT/\%~/%(4~|.../%2~|%~)}"
       fi
     '';
   };

modules/home-manager/styling.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   # set gtk theme
@@ -6,8 +6,8 @@
     enable = true;
     theme = {
       name = "Adwaita-dark";
-      package = pkgs.gnome-themes-extra;
+        package = pkgs.gnome-themes-extra;
-    };
+      };
     gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
     gtk4.theme = null;
     gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;

modules/home-manager/tmux.nix

@@ -1,121 +1,60 @@
-let
+{ config, pkgs, inputs, ... }:
-  # Powerline separators, U+E0B0..U+E0B3.
+
-  #
-  # Written as escapes rather than literal glyphs. These are Private Use Area
-  # codepoints: they render only with a patched font, they survive copy/paste
-  # badly, and when they get stripped the loss is invisible, the config still
-  # parses, the status bar just quietly loses its separators. Nix has no \u
-  # escape of its own, but fromJSON does.
-  sep = builtins.fromJSON ''
-    {
-      "right":     "\ue0b0",
-      "rightThin": "\ue0b1",
-      "left":      "\ue0b2",
-      "leftThin":  "\ue0b3"
-    }
-  '';
-in
 {
   programs.tmux = {
-    # defaults
     enable = true;
     prefix = "C-a";
     keyMode = "vi";
     mouse = true;
-
+    terminal = "screen-256color";
-    # tmux-256color gives truecolor, italics and undercurl in nvim.
-    terminal = "tmux-256color";
-
-    # Default is 500ms. Causes lag you feel when leaving insert mode in nvim,
-    # because tmux is waiting to see whether Esc starts an escape sequence.
-    escapeTime = 10;
-
-    # nvim autoread / :checktime react to focus.
-    focusEvents = true;
-
-    # History limit.
-    historyLimit = 50000;
-
-    # Window numbers matching the number row.
-    baseIndex = 1;
-
     extraConfig = ''
       # Status keys
       set -g status-keys vi
-
-      # Tell tmux the outer terminal can do 24-bit colour (tmux >= 3.2).
-      set -sa terminal-features ",*:RGB"
-
-      # Shift+Enter / extended keys
-      # These make tmux forward CSI-u sequences unconditionally.
-      # Needs tmux >= 3.5 for the format option,
-      set -s extended-keys always
-      set -s extended-keys-format csi-u
-      set -as terminal-features '*:extkeys'
-
       # Status bar options
-      set -g status-interval 5
+      set -g status-interval 1
+      set -g status on
       set -g status-justify left
-
       # Clock mode
       setw -g clock-mode-colour cyan
-
       # Colors
       set -g status-bg black
       set -g status-fg white
-
       # Key bindings
-      bind r source-file ~/.config/tmux/tmux.conf \; display-message "tmux.conf reloaded"
+      # Reload configuration 
-
+      bind r source-file ~/.config/tmux/tmux.conf
-      # Panel split and selection, new panes/windows inherit the cwd
+      # Panel split and selection
       unbind %
       unbind '"'
-      bind v split-window -v -c "#{pane_current_path}"
+      bind v split-window -v
-      bind c split-window -h -c "#{pane_current_path}"
+      bind c split-window -h
-      bind i new-window -c "#{pane_current_path}"
+      bind i new-window
-      bind -r b previous-window
+      bind b previous-window
-      bind -r n next-window
+      bind n next-window
-
       # Move around panes with hjkl
       bind h select-pane -L
       bind j select-pane -D
       bind k select-pane -U
       bind l select-pane -R
-
       # Resize panes
-      bind -r H resize-pane -L 5
+      bind H resize-pane -L 5
-      bind -r J resize-pane -D 5
+      bind J resize-pane -D 5
-      bind -r K resize-pane -U 5
+      bind K resize-pane -U 5
-      bind -r L resize-pane -R 5
+      bind L resize-pane -R 5
-
       # Wayland clipboard integration
       # Copy selection to both clipboard (Ctrl+V / Shift+Insert) and primary (middle-click)
-      bind -T copy-mode-vi v send-keys -X begin-selection
-      bind -T copy-mode-vi C-v send-keys -X rectangle-toggle
       bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
       bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
       bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
-      # Uncomment if you want yanks to also travel over SSH via OSC52.
-      # Locally redundant with wl-copy above.
-      #set -g set-clipboard on
-
       # Kill commands
-      bind q confirm-before -p "kill window #W? (y/n)" kill-window
+      bind q kill-window
-      bind Q confirm-before -p "kill session #S? (y/n)" kill-session
+      bind Q kill-session
-
       # Bars
-      # This is the nord-tmux status line. #{prefix_highlight} came from that
-      # theme's tmux-prefix-highlight integration -- a plugin you never loaded,
-      # so the token expanded to nothing. tmux can do it natively. Commas inside
-      # #{?...} are argument separators and have to be escaped as #, hence the
-      # look of the style spec.
       set -g status-left-length 24
-      set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]${sep.right}"
+      set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]"
-      set -g status-right "#{?client_prefix,#[fg=black#,bg=yellow#,bold] ^A ,}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]${sep.left}#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]${sep.leftThin}#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]${sep.left}#[fg=black,bg=cyan,bold] #H "
+      set -g status-right "#{prefix_highlight}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H "
-
       # Windows
-      set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore]${sep.right} #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]${sep.rightThin} #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]${sep.right}"
+      set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]"
-      set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore]${sep.right} #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore]${sep.rightThin} #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]${sep.right}"
+      set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]"
       set -g window-status-separator ""
     '';
   };

modules/nixos/appimage.nix

@@ -1,17 +0,0 @@
-{
-  # AppImages ship a squashfs payload that the bundled runtime mounts through
-  # libfuse.so.2 at startup. nix-ld resolves the ELF interpreter but not that
-  # dlopen, so running one directly dies with "dlopen(): error loading
-  # libfuse.so.2". appimage-run sidesteps the mount entirely: it unpacks the
-  # image and runs the payload inside an FHS sandbox, which the bundled Qt and
-  # electron style binaries need anyway.
-  #
-  # Used for the BitBox02 wallet AppImage, downloaded fresh from
-  # https://bitbox.swiss/download/ rather than installed from nixpkgs.
-  programs.appimage = {
-    enable = true;
-    # register AppImages with binfmt_misc so ./Something.AppImage runs as-is,
-    # no appimage-run prefix to remember.
-    binfmt = true;
-  };
-}

modules/nixos/astro.nix

@@ -1,95 +0,0 @@
-{ lib, pkgs, ... }:
-
-let
-  # Siril's Python plugins (sirilpy) run in a venv that pip-installs foreign
-  # manylinux wheels (numpy, GraXpert deps, ...). Those .so files need
-  # libstdc++ at runtime. nix-ld does NOT cover this: it only handles the
-  # initial exec of a foreign binary, but here a *native* nixpkgs python
-  # dlopen()s the foreign wheel. So we put the libs on LD_LIBRARY_PATH, which
-  # the python subprocess inherits from the Siril process.
-  sirilWithPlugins = pkgs.symlinkJoin {
-    name = "siril-with-plugins";
-    paths = [ pkgs.siril ];
-    nativeBuildInputs = [ pkgs.makeWrapper ];
-    # Siril bootstraps its sirilpy venv at first run by locating a `python3`
-    # on PATH. nixpkgs only *propagates* python3 from the siril derivation (it
-    # isn't on the runtime PATH), so without the --prefix PATH below the GUI
-    # fails with "Python not found in system PATH" and never creates
-    # ~/.local/share/siril/venv.
-    #
-    # We deliberately do NOT put ${pkgs.python3}/bin on PATH directly: `venv`
-    # symlinks bin/python3 to whatever sys.executable was, so the venv would
-    # hard-link a /nix/store hash that gets garbage-collected after the next
-    # python bump, leaving a dangling symlink ("Error finding venv python
-    # path, unable to spawn python"). Instead we go through the stable
-    # /etc/siril/bin/python3 symlink (see environment.etc below), which NixOS
-    # re-points at the current python on every rebuild.
-    #
-    # The VeraLux PyQt6 wheel ships only the built-in Windows/Fusion styles, so
-    # the global QT_STYLE_OVERRIDE=adwaita-dark (inherited from the session) is
-    # rejected ("invalid style override") and windows fall back to a light
-    # theme. We expose nixpkgs adwaita-qt6's style plugin on QT_PLUGIN_PATH so
-    # the override resolves. This works because nixpkgs qt6 and the bundled Qt
-    # share a major.minor (6.11); if they ever drift the plugin is simply
-    # ignored again (harmless warning + Fusion fallback, no loss of function).
-    postBuild = ''
-      wrapProgram $out/bin/siril \
-        --prefix PATH : /etc/siril/bin \
-        --prefix QT_PLUGIN_PATH : ${pkgs.adwaita-qt6}/lib/qt-6/plugins \
-        --prefix LD_LIBRARY_PATH : ${
-          lib.makeLibraryPath (
-            with pkgs;
-            [
-              stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp  (numpy etc.)
-              zlib
-              zstd # libzstd.so.1                     (PyQt6)
-              libGL # libGL.so.1                       (PyQt6)
-              # PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
-              # on Wayland; libxkbcommon is the keymap lib used by Wayland too.
-              glib
-              fontconfig
-              freetype
-              dbus
-              libxkbcommon
-              # Qt platform plugins: the wayland plugin (libqwayland.so) needs the
-              # wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
-              wayland # libwayland-client/cursor/egl       (wayland plugin)
-              libxcb-cursor # libxcb-cursor.so.0                 (xcb plugin)
-              libx11
-              libxcb
-              libxcb-util
-              libxcb-wm
-              libxcb-image
-              libxcb-keysyms
-              libxcb-render-util
-            ]
-          )
-        }
-    '';
-  };
-in
-{
-  # install stellarium for target finding and siril for stacking
-  environment.systemPackages = with pkgs; [
-    stellarium
-    sirilWithPlugins
-  ];
-
-  # Stable, GC-safe interpreter path for Siril's venv (see sirilWithPlugins).
-  # Same python as siril itself propagates, so sirilpy's ABI matches.
-  environment.etc."siril/bin/python3".source = "${pkgs.python3}/bin/python3";
-
-  # StarNet++ has no nixpkgs package. Download the StarNet v2 ORT CLI build
-  # (starnet2_linux_*_ORT_x64_cli) from https://www.starnetastro.com/download/
-  # and unzip it to ~/.local/share/siril/starnet/. Then in Siril set
-  #   Preferences -> Miscellaneous -> StarNet executable
-  # to the extracted ./starnet2 binary.
-  #
-  # The binary is a generic dynamically-linked ELF, so NixOS needs nix-ld to
-  # run it. Its own opencv/onnxruntime libs are found via the bundled ./lib.
-  programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
-    stdenv.cc.cc.lib # libstdc++ / libgcc_s
-    zlib
-  ];
-}

modules/nixos/audio.nix

@@ -1,7 +1,9 @@
+{ config, lib, pkgs, ... }:
+
 {
   # enable sound through pipewire
   services.pipewire = {
-    enable = true;
+     enable = true;
-    pulse.enable = true;
+     pulse.enable = true;
   };
 }

modules/nixos/bootloader.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # set bootloader to systemd
@@ -17,10 +17,7 @@
   };
 
   # kernel options
-  boot.kernelParams = [
+  boot.kernelParams = [ "quiet" "acpi.debug_level=0"];
-    "quiet"
-    "acpi.debug_level=0"
-  ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.consoleLogLevel = 2;
 

modules/nixos/calibre.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # install calibre for ebook management and kobo syncing

modules/nixos/certificates.nix

@@ -1,3 +1,5 @@
+{ config, lib, pkgs, ... }:
+
 let
   caddyRootCA = ''
     -----BEGIN CERTIFICATE-----

modules/nixos/claudecode.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    claude-code
-  ];
-}

modules/nixos/docker.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ...}:
 
 {
   # add docker group to user
@@ -8,10 +8,7 @@
     enable = true;
     # Customize Docker daemon settings
     daemon.settings = {
-      dns = [
+      dns = [ "1.1.1.1" "8.8.8.8" ];
-        "1.1.1.1"
-        "8.8.8.8"
-      ];
       log-driver = "journald";
       registry-mirrors = [ "https://mirror.gcr.io" ];
       storage-driver = "overlay2";

modules/nixos/drives.nix

@@ -1,3 +1,5 @@
+{ config, lib, pkgs, ... }:
+
 # Add encrypted drives to argon
 
 {

modules/nixos/gnupg.nix

@@ -1,31 +1,15 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # enable gnupg agent
   programs.gnupg.agent = {
     enable = true;
-    # a graphical pinentry never grabs the tty, so a passphrase prompt can no
+    enableSSHSupport = true;
-    # longer take over a terminal that a coding agent is driving
+    pinentryPackage = pkgs.pinentry-curses;
-    pinentryPackage = pkgs.pinentry-qt;
-    settings = {
-      # keep the key unlocked for a full working day instead of 10 minutes,
-      # so signing commits asks at most once per session
-      default-cache-ttl = 86400;
-      max-cache-ttl = 86400;
-      # fail an unattended signature instead of blocking on a prompt forever
-      pinentry-timeout = 120;
-    };
   };
 
   environment.systemPackages = with pkgs; [ 
     gnupg
-    pinentry-qt
-    # fallback for sessions without a display, switch pinentryPackage to use it
     pinentry-curses
-    # prime the passphrase cache on demand, e.g. before an agent session
-    (writeShellScriptBin "gpg-unlock" ''
-      echo | ${config.programs.gnupg.package}/bin/gpg --clearsign --output /dev/null
-      echo "gpg key unlocked"
-    '')
   ];
 }

modules/nixos/gnuradio.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # install gnuradio companion along with it's osmocom library

modules/nixos/graphics.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # enable amd GPU acceleration (mesa, vulkan, egl)

modules/nixos/greetd.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # greetd display manager with tuigreet

modules/nixos/locales.nix

@@ -1,3 +1,5 @@
+{ config, lib, pkgs, ... }:
+
 {
   # set the time zone
   time.timeZone = "Europe/Zurich";

modules/nixos/networking.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # user networkmanager

modules/nixos/niri.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # just enable and install niri

modules/nixos/noctalia.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 {
   # install noctalia and helper packages
   environment.systemPackages = with pkgs; [
@@ -7,8 +7,6 @@
     adwaita-qt
     adwaita-qt6
     brightnessctl
-    ddcutil
     playerctl
-    wl-mirror
   ];
 }

modules/nixos/openssh.nix

@@ -1,3 +1,5 @@
+{ config, lib, pkgs, ... }:
+
 {
   # enable the openssh daemon
   services.openssh = {

modules/nixos/packages.nix

@@ -1,10 +1,9 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # system packages
   environment.systemPackages = with pkgs; [
     btop
-    cifs-utils
     cowsay
     dnsutils
     ethtool
@@ -18,9 +17,9 @@
     ldns
     lm_sensors
     lsof
+    ltrace
     mtr
     neovim
-    nfs-utils
     nh
     nix-output-monitor
     nmap
@@ -34,11 +33,10 @@
     tree
     unzip
     usbutils
-    vial
     vim
+    wl-clipboard
     wget
     which
-    wl-clipboard
     xz
     zip
     zstd

modules/nixos/protonvpn.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # protonvpn uses wireguard tunnels, which break strict reverse path filtering

modules/nixos/sddm.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # enable sddm and use astronaut theme

modules/nixos/services.nix

@@ -1,3 +1,5 @@
+{ config, lib, pkgs, ... }:
+
 {
   # list of enabled services on the system
   services = {

modules/nixos/settings.nix

@@ -1,12 +1,11 @@
+{ config, lib, pkgs, ... }:
+
 {
   nix = {
     # nix settings
     settings = {
       # enable flakes and nix-command
-      experimental-features = [
+      experimental-features = [ "nix-command" "flakes" ];
-        "nix-command"
-        "flakes"
-      ];
       # auto-optimize my nix-store
       auto-optimise-store = true;
       # use all cores
@@ -33,12 +32,6 @@
     };
   };
 
-  # add trusted users (able to modify the nix store)
-  nix.settings.trusted-users = [
-    "root"
-    "@wheel"
-  ];
-
   # allow unfree packages (steam, protonvpn, discord, etc.)
   nixpkgs.config.allowUnfree = true;
 

modules/nixos/steam.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # enable steam and open firewall

modules/nixos/thunar.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Enable Thunar
-  programs.thunar.enable = true;
-
-  # Install Tumbler thumbnailer service
-  environment.systemPackages = with pkgs; [
-    tumbler
-  ];
-
-  # Ensure Thunar can locate the thumbnailer extensions
-  environment.pathsToLink = [ "share/thumbnailers" ];
-}

modules/nixos/users.nix

@@ -1,15 +1,11 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # create users
   users.users.aaron = {
     isNormalUser = true;
     group = "users";
-    extraGroups = [
+    extraGroups = [ "wheel" "networkmanager" "dialout" ];
-      "wheel"
-      "networkmanager"
-      "dialout"
-    ];
     shell = pkgs.zsh;
   };
 

modules/nixos/vial.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Vial-capable keyboards (lily58 pro r2g) expose a second, non-keyboard raw
-  # HID interface that vial.rocks drives over WebHID. Its /dev/hidraw* node is
-  # root-only by default, so neither chromium nor the native app can open it.
-  #
-  # This has to ship as a numbered rules file rather than via
-  # services.udev.extraRules: extraRules lands in 99-local.rules, but the
-  # builtin that turns TAG+="uaccess" into an actual ACL is invoked from
-  # systemd's 73-seat-late.rules. A tag set at 99 is set too late to be seen,
-  # so the device ends up correctly tagged and still unreadable. 60- sorts
-  # safely ahead of 73.
-  services.udev.packages = [
-    (pkgs.writeTextFile {
-      name = "vial-udev-rules";
-      destination = "/lib/udev/rules.d/60-vial.rules";
-      # Vial firmware advertises itself through a magic USB serial, so this
-      # matches any vial board rather than just the lily58. uaccess hands the
-      # device to whoever owns the active seat, no group membership needed.
-      text = ''
-        KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", TAG+="uaccess"
-      '';
-    })
-  ];
-}

statix.toml

@@ -1,8 +0,0 @@
-# statix configuration (run via `lint` in the devenv)
-
-# Flat assignments like `boot.loader = ...; boot.plymouth = ...;` are the
-# preferred style in this repo, so don't ask for them to be merged.
-disabled = [ "repeated_keys" ]
-
-# Generated by nixos-generate-config, not maintained by hand.
-ignore = [ "hosts/*/hardware-configuration.nix" ]

users/aaron/home.nix

@@ -1,11 +1,11 @@
+{ config, pkgs, ... }:
+
 {
   imports = [
     ../../modules/home-manager/fonts.nix
     ../../modules/home-manager/git.nix
     ../../modules/home-manager/ghostty.nix
     ../../modules/home-manager/nixvim.nix
-    ../../modules/home-manager/niri.nix
-    ../../modules/home-manager/noctalia.nix
     ../../modules/home-manager/programs.nix
     ../../modules/home-manager/shell.nix
     ../../modules/home-manager/styling.nix