chore: update flake lockfiles

dots/.bin/setup-gnome

@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-gsettings set org.gnome.desktop.background primary-color "#555555"
-
-gsettings set org.gnome.desktop.wm.preferences workspace-names "['sh', 'www', 'dev', 'info', 'etc']"
-gsettings set org.gnome.desktop.wm.keybindings close "['<Shift><Super>Delete']"
-gsettings set org.gnome.desktop.wm.keybindings switch-applications "['<Super>j']"
-gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['<Super>k']"
-gsettings set org.gnome.shell.keybindings toggle-application-view "['<Super>p']"
-gsettings set org.gnome.mutter center-new-windows true
-gsettings set org.gnome.shell.keybindings toggle-quick-settings []
-
-gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-1 "['<Super>a']"
-gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-2 "['<Super>s']"
-gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-3 "['<Super>d']"
-gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-4 "['<Super>f']"
-gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-5 "['<Super>g']"
-gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-1 "['<Super><Shift>a']"
-gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-2 "['<Super><Shift>s']"
-gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-3 "['<Super><Shift>d']"
-gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-4 "['<Super><Shift>f']"
-gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-5 "['<Super><Shift>g']"
-
-gsettings set org.gnome.settings-daemon.plugins.media-keys custom-keybindings "['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/']"
-gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/ name "Kitty"
-gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/ command "kitty"
-gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/ binding "<Shift><Super>Return"
-
-gsettings set org.gnome.shell.keybindings screenshot "['Print']"
-
-gsettings set org.gnome.desktop.wm.preferences num-workspaces "5"
-gsettings set org.gnome.mutter dynamic-workspaces "false"
-gsettings set org.gnome.shell.extensions.window-list display-all-workspaces "true"
-gsettings set org.gnome.shell.app-switcher current-workspace-only "true"
-
-gsettings set org.gnome.login-screen logo ''
-gsettings set org.gnome.shell favorite-apps "['firefox-developer-edition.desktop']"

dots/.config/nvim/flake.lock

@@ -73,11 +73,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1769421245,
-        "narHash": "sha256-m5QLKjpdhbDrhyrUbEm5Haq3lqE5Z6xh2tab5vTHUTo=",
+        "lastModified": 1769433173,
+        "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5b265bda51b42a2a85af0a543c3e57b778b01b7d",
+        "rev": "13b0f9e6ac78abbbb736c635d87845c4f4bee51b",
         "type": "github"
       },
       "original": {

dots/.config/nvim/flake.nix

@@ -174,7 +174,7 @@
 
       packageDefinitions = {
         nvim =
-          { ... }:
+          _:
           {
             settings = {
               suffix-path = true;

flake.lock

@@ -53,11 +53,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1769400223,
-        "narHash": "sha256-YJRz6mriRWr5wGftEwm8KFRKtu6ZgsX21NYeXVKGd9M=",
+        "lastModified": 1769486619,
+        "narHash": "sha256-MEBKRsOj9s65KRvvugu4i7ytW2eASk67pFDgxgwsEr4=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "25dae404070232baab384b281dbdc8eb70f37ad0",
+        "rev": "02ae5ccdcbe8defe6047840a7b46e67e215bef69",
         "type": "gitlab"
       },
       "original": {
@@ -458,11 +458,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769314333,
-        "narHash": "sha256-+Uvq9h2eGsbhacXpuS7irYO7fFlz514nrhPCSTkASlw=",
+        "lastModified": 1769469829,
+        "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2eb9eed7ef48908e0f02985919f7eb9d33fa758f",
+        "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff",
         "type": "github"
       },
       "original": {

flake.nix

@@ -56,7 +56,7 @@
     }@inputs:
     let
       inherit (self) outputs;
-      lib = inputs.nixpkgs.lib;
+      inherit (inputs.nixpkgs) lib;
       utils = import ./utils { inherit lib; };
       hostDirNames = utils.dirNames ./hosts;
       system = "x86_64-linux";

home/hosts/andromache/default.nix

@@ -27,9 +27,11 @@ in
     ../../modules/shell
   ];
 
-  home.stateVersion = "25.05";
-  home.username = username;
-  home.homeDirectory = "/home/${username}";
+  home = {
+    stateVersion = "25.05";
+    inherit username;
+    homeDirectory = "/home/${username}";
+  };
 
   xdg.userDirs.createDirectories = false;
   xdg.userDirs.download = "${config.home.homeDirectory}/dl";

home/hosts/astyanax/default.nix

@@ -23,9 +23,11 @@ in
     ../../modules/shell
   ];
 
-  home.stateVersion = "25.05";
-  home.username = username;
-  home.homeDirectory = "/home/${username}";
+  home = {
+    stateVersion = "25.05";
+    inherit username;
+    homeDirectory = "/home/${username}";
+  };
 
   xdg.userDirs.createDirectories = false;
   xdg.userDirs.download = "${config.home.homeDirectory}/dl";

home/hosts/work/default.nix

@@ -45,12 +45,14 @@ in
 
   nixpkgs.config.allowUnfree = true;
 
-  home.stateVersion = "25.05";
-  home.username = username;
-  home.homeDirectory = "/home/${username}";
+  home = {
+    stateVersion = "25.05";
+    inherit username;
+    homeDirectory = "/home/${username}";
+  };
 
   targets.genericLinux.nixGL = {
-    packages = inputs.nixgl.packages;
+    inherit (inputs.nixgl) packages;
     defaultWrapper = "mesa";
   };
 

home/hosts/work/packages.nix

@@ -13,4 +13,4 @@ let
       [ ];
 in
 
-[ ] ++ localPackages
+localPackages

home/modules/dconf.nix

@@ -1,21 +1,13 @@
+{ config, ... }:
+
+let
+  terminal = "kitty";
+  browser = config.browser.primary;
+in
 {
   dconf.settings = {
-    "org/gnome/settings-daemon/plugins/color" = {
-      night-light-enabled = true;
-      night-light-schedule-automatic = true;
-    };
-    "org/gnome/desktop/interface" = {
-      color-scheme = "prefer-dark";
-    };
-
-    "org/gnome/desktop/applications/terminal" = {
-      exec = "kitty";
-      exec-arg = "";
-    };
-
     "org/gnome/desktop/background" = {
       color-shading-type = "solid";
-      picture-opacity = 100;
       picture-options = "zoom";
       picture-uri = "none";
       picture-uri-dark = "none";
@@ -24,55 +16,54 @@
       show-desktop-icons = false;
     };
 
-    # "org/gnome/desktop/input-sources" = {
-    #   sources = [
-    #     (mkTuple [
-    #       "xkb"
-    #       "us"
-    #     ])
-    #   ];
-    #   xkb-options = [ "caps:none" ];
-    # };
+    "org/gnome/desktop/default-applications/office/calendar" = {
+      exec = "${browser} https://calendar.proton.me";
+      needs-term = false;
+    };
+
+    "org/gnome/desktop/default-applications/office/tasks" = {
+      exec = "task";
+      needs-term = true;
+    };
+
+    "org/gnome/desktop/default-applications/terminal" = {
+      exec = terminal;
+      exec-arg = "";
+    };
+
+    "org/gnome/desktop/input-sources" = {
+      xkb-options = [ "caps:none" ];
+    };
+
+    "org/gnome/desktop/interface" = {
+      clock-format = "24h";
+      clock-show-weekday = true;
+      color-scheme = "prefer-dark";
+      enable-hot-corners = false;
+      font-name = "Iosevka Term SS08 12";
+      locate-pointer = true;
+      monospace-font-name = "Iosevka Term SS08 12";
+    };
 
     "org/gnome/desktop/wm/keybindings" = {
       close = [ "<Shift><Super>Delete" ];
-      cycle-group = [ ];
-      cycle-group-backward = [ ];
-      cycle-panels = [ ];
-      cycle-panels-backward = [ ];
-      cycle-windows = [ ];
-      cycle-windows-backward = [ ];
-      maximize = [ "<Super> " ];
-      minimize = [ ];
+      minimize = [ "<Super>h" ];
+      move-to-monitor-down = [ "<Super><Shift>Down" ];
+      move-to-monitor-left = [ "<Super><Shift>Left" ];
+      move-to-monitor-right = [ "<Super><Shift>Right" ];
+      move-to-monitor-up = [ "<Super><Shift>Up" ];
       move-to-workspace-1 = [ "<Super><Shift>a" ];
       move-to-workspace-2 = [ "<Super><Shift>s" ];
       move-to-workspace-3 = [ "<Super><Shift>d" ];
       move-to-workspace-4 = [ "<Super><Shift>f" ];
       move-to-workspace-5 = [ "<Super><Shift>g" ];
-      move-to-workspace-last = [ ];
-      move-to-workspace-left = [ "<Super><Shift>h" ];
-      move-to-workspace-right = [ "<Super><Shift>l" ];
-      panel-run-dialog = [ ];
       switch-applications = [ "<Super>j" ];
       switch-applications-backward = [ "<Super>k" ];
-      switch-group = [ ];
-      switch-group-backward = [ ];
-      switch-input-source = [ ];
-      switch-input-source-backward = [ ];
-      switch-panels = [ ];
-      switch-panels-backward = [ ];
       switch-to-workspace-1 = [ "<Super>a" ];
       switch-to-workspace-2 = [ "<Super>s" ];
       switch-to-workspace-3 = [ "<Super>d" ];
       switch-to-workspace-4 = [ "<Super>f" ];
       switch-to-workspace-5 = [ "<Super>g" ];
-      switch-to-workspace-last = [ ];
-      switch-to-workspace-left = [ "<Super>h" ];
-      switch-to-workspace-right = [ "<Super>l" ];
-      switch-windows = [ ];
-      switch-windows-backward = [ ];
-      toggle-maximized = [ "<Super>space" ];
-      unmaximize = [ ];
     };
 
     "org/gnome/desktop/wm/preferences" = {
@@ -86,8 +77,19 @@
       ];
     };
 
+    "org/gnome/mutter" = {
+      center-new-windows = true;
+      dynamic-workspaces = false;
+    };
+
+    "org/gnome/settings-daemon/plugins/color" = {
+      night-light-enabled = true;
+      night-light-schedule-automatic = true;
+    };
+
     "org/gnome/settings-daemon/plugins/media-keys" = {
       custom-keybindings = [
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
         "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
       ];
     };
@@ -100,12 +102,19 @@
 
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
       binding = "<Super>Return";
-      command = "kitty";
+      command = terminal;
       name = "Kitty";
     };
 
+    "org/gnome/settings-daemon/plugins/power" = {
+      power-button-action = "suspend";
+    };
+
+    "org/gnome/shell/app-switcher" = {
+      current-workspace-only = true;
+    };
+
     "org/gnome/shell/keybindings" = {
-      screenshot = [ "Print" ];
       toggle-application-view = [ "<Super>p" ];
       toggle-quick-settings = [ ];
     };

home/modules/shell/bash.nix

@@ -7,7 +7,7 @@
 }:
 let
   cfg = config.shell.bash;
-  username = config.home.username;
+  inherit (config.home) username;
 in
 {
   options.shell.bash = {

hosts/andromache/default.nix

@@ -27,7 +27,7 @@ in
     ../../modules/desktops/niri
     ../../modules/bluetooth
     ../../modules/keyboard
-    (import ../../modules/networking { hostName = hostName; })
+    (import ../../modules/networking { inherit hostName; })
     ../../modules/users
     ../../modules/audio
     ../../modules/localization
@@ -93,36 +93,37 @@ in
     inputs.nvim.packages.x86_64-linux.nvim
   ];
 
-  services.xserver = {
-    videoDrivers = [ "nvidia" ];
-  };
+  services = {
+    xserver = {
+      videoDrivers = [ "nvidia" ];
+    };
 
-  services.openssh = {
-    enable = true;
-    harden = true;
-  };
+    openssh = {
+      enable = true;
+      harden = true;
+    };
 
-  services.syncthing = {
-    enable = true;
-    openDefaultPorts = true;
-    settings = {
-      devices = {
-        # "device1" = {
-        #   id = "DEVICE-ID-GOES-HERE";
-        # };
-      };
-      folders = {
-        "/home/${username}/sync" = {
-          id = "sync";
-          devices = [ ];
+    syncthing = {
+      enable = true;
+      openDefaultPorts = true;
+      settings = {
+        devices = {
+          # "device1" = {
+          #   id = "DEVICE-ID-GOES-HERE";
+          # };
+        };
+        folders = {
+          "/home/${username}/sync" = {
+            id = "sync";
+            devices = [ ];
+          };
         };
       };
     };
-  };
-
-  services.locate = {
-    enable = true;
-    package = pkgs.plocate;
+    locate = {
+      enable = true;
+      package = pkgs.plocate;
+    };
   };
 
   networking = {
@@ -131,7 +132,7 @@ in
     interfaces = {
       eno1 = {
         wakeOnLan.enable = true;
-        macAddress = wolInterfaces.eno1.macAddress;
+        inherit (wolInterfaces.eno1) macAddress;
       };
     };
     firewall = {

hosts/andromache/hard.nix

@@ -14,19 +14,21 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
-    "vmd"
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usbhid"
-    "usb_storage"
-    "uas"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd.availableKernelModules = [
+      "vmd"
+      "xhci_pci"
+      "ahci"
+      "nvme"
+      "usbhid"
+      "usb_storage"
+      "uas"
+      "sd_mod"
+    ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/astyanax/default.nix

@@ -27,7 +27,7 @@ in
     ../../modules/desktops/niri
     ../../modules/bluetooth
     ../../modules/keyboard
-    (import ../../modules/networking { hostName = hostName; })
+    (import ../../modules/networking { inherit hostName; })
     ../../modules/users
     ../../modules/audio
     ../../modules/localization

hosts/astyanax/hard.nix

@@ -14,16 +14,18 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "thunderbolt"
-    "nvme"
-    "uas"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "thunderbolt"
+      "nvme"
+      "uas"
+      "sd_mod"
+    ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/hecuba/hard.nix

@@ -14,17 +14,21 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
-    "ahci"
-    "xhci_pci"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "ahci"
+        "xhci_pci"
+        "virtio_pci"
+        "virtio_scsi"
+        "sd_mod"
+        "sr_mod"
+      ];
+      kernelModules = [ ];
+    };
+    kernelModules = [ ];
+    extraModulePackages = [ ];
+  };
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/vm/default.nix

@@ -18,7 +18,7 @@ in
     ./disk.nix
     ../../modules/boot/bootloader.nix
     ../../modules/keyboard
-    (import ../../modules/networking { hostName = hostName; })
+    (import ../../modules/networking { inherit hostName; })
     ../../modules/users
     ../../modules/audio
     ../../modules/localization
@@ -42,9 +42,11 @@ in
   environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];
 
   disko = {
-    devices.disk.main.device = "/dev/vda";
-    devices.disk.main.imageName = "nixos-vm";
-    devices.disk.main.imageSize = "32G";
+    devices.disk.main = {
+      device = "/dev/vda";
+      imageName = "nixos-vm";
+      imageSize = "32G";
+    };
   };
 
   virtualisation.vmVariantWithDisko = {
@@ -59,11 +61,12 @@ in
     };
   };
 
-  services.qemuGuest.enable = true;
-  services.spice-vdagentd.enable = true;
-
-  services.openssh = {
-    enable = true;
-    harden = true;
+  services = {
+    qemuGuest.enable = true;
+    spice-vdagentd.enable = true;
+    openssh = {
+      enable = true;
+      harden = true;
+    };
   };
 }

hosts/vm/hard.nix

@@ -14,16 +14,20 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
-    "ahci"
-    "xhci_pci"
-    "virtio_pci"
-    "sr_mod"
-    "virtio_blk"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "ahci"
+        "xhci_pci"
+        "virtio_pci"
+        "sr_mod"
+        "virtio_blk"
+      ];
+      kernelModules = [ ];
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

modules/audio/default.nix

@@ -1,13 +1,15 @@
-{ ... }:
+_:
 
 {
-  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
+  services = {
+    pulseaudio.enable = false;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+    pulseaudio.extraConfig = "load-module module-switch-on-connect";
   };
-  services.pulseaudio.extraConfig = "load-module module-switch-on-connect";
 }

modules/boot/bootloader.nix

@@ -1,4 +1,4 @@
-{ ... }:
+_:
 
 {
   boot.loader.systemd-boot.enable = true;

modules/common/default.nix

@@ -1,4 +1,9 @@
-{ inputs, outputs, dotsPath, ... }:
+{
+  inputs,
+  outputs,
+  dotsPath,
+  ...
+}:
 
 {
   imports = [
@@ -23,15 +28,16 @@
     };
   };
 
-  nix.optimise = {
-    automatic = true;
-    dates = [ "05:00" ];
-  };
-
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 30d";
+  nix = {
+    optimise = {
+      automatic = true;
+      dates = [ "05:00" ];
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 30d";
+    };
   };
 
   system.autoUpgrade = {

modules/desktops/niri/default.nix

@@ -1,14 +1,16 @@
 {
   programs.niri.enable = true;
 
-  services.dbus.enable = true;
-  services.logind.settings.Login = {
-    HandleLidSwitch = "suspend";
-    IdleAction = "suspend";
-    IdleActionSec = 1800;
-  };
+  services = {
+    dbus.enable = true;
+    logind.settings.Login = {
+      HandleLidSwitch = "suspend";
+      IdleAction = "suspend";
+      IdleActionSec = 1800;
+    };
 
-  services.displayManager.ly = {
-    enable = true;
+    displayManager.ly = {
+      enable = true;
+    };
   };
 }

modules/disko/zfs-encrypted-root.nix

@@ -11,7 +11,7 @@
       disk = {
         root = {
           type = "disk";
-          device = config.device;
+          inherit (config) device;
           content = {
             type = "gpt";
             partitions = {

modules/localization/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+_:
 
 {
   time.timeZone = "Europe/Brussels";

modules/networking/default.nix

@@ -5,7 +5,7 @@
 
 {
   networking = {
-    hostName = hostName;
+    inherit hostName;
     wireless.iwd.enable = true;
     networkmanager.wifi.backend = "iwd";
     nftables.enable = true;

modules/secrets/default.nix

@@ -34,56 +34,58 @@ in
         "opencode_api_key".owner = config.users.users.${cfg.username}.name;
       };
 
-      templates."taskrc.d/sync" = {
-        owner = config.users.users.${cfg.username}.name;
-        content = ''
-          sync.server.url=${config.sops.placeholder."taskwarrior_sync_server_url"}
-          sync.server.client_id=${config.sops.placeholder."taskwarrior_sync_server_client_id"}
-          sync.encryption_secret=${config.sops.placeholder."taskwarrior_sync_encryption_secret"}
-        '';
-      };
+      templates = {
+        "taskrc.d/sync" = {
+          owner = config.users.users.${cfg.username}.name;
+          content = ''
+            sync.server.url=${config.sops.placeholder."taskwarrior_sync_server_url"}
+            sync.server.client_id=${config.sops.placeholder."taskwarrior_sync_server_client_id"}
+            sync.encryption_secret=${config.sops.placeholder."taskwarrior_sync_encryption_secret"}
+          '';
+        };
 
-      templates.".gitconfig.email" = {
-        owner = config.users.users.${cfg.username}.name;
-        path = "/home/${cfg.username}/.gitconfig.email";
-        content = ''
-          [user]
-            email = ${config.sops.placeholder."email_personal"}
-        '';
-      };
+        ".gitconfig.email" = {
+          owner = config.users.users.${cfg.username}.name;
+          path = "/home/${cfg.username}/.gitconfig.email";
+          content = ''
+            [user]
+              email = ${config.sops.placeholder."email_personal"}
+          '';
+        };
 
-      templates.".gitconfig.work.email" = {
-        owner = config.users.users.${cfg.username}.name;
-        path = "/home/${cfg.username}/.gitconfig.work.email";
-        content = ''
-          [user]
-            email = ${config.sops.placeholder."email_work"}
-        '';
-      };
+        ".gitconfig.work.email" = {
+          owner = config.users.users.${cfg.username}.name;
+          path = "/home/${cfg.username}/.gitconfig.work.email";
+          content = ''
+            [user]
+              email = ${config.sops.placeholder."email_work"}
+          '';
+        };
 
-      templates."hcloud/cli.toml" = {
-        owner = config.users.users.${cfg.username}.name;
-        path = "/home/${cfg.username}/.config/hcloud/cli.toml";
-        content = ''
-          active_context = "server"
+        "hcloud/cli.toml" = {
+          owner = config.users.users.${cfg.username}.name;
+          path = "/home/${cfg.username}/.config/hcloud/cli.toml";
+          content = ''
+            active_context = "server"
 
-          [[contexts]]
-            name = "server"
-            token = "${config.sops.placeholder."hcloud"}"
-        '';
-      };
+            [[contexts]]
+              name = "server"
+              token = "${config.sops.placeholder."hcloud"}"
+          '';
+        };
 
-      templates."opencode/auth.json" = {
-        owner = config.users.users.${cfg.username}.name;
-        path = "/home/${cfg.username}/.local/share/opencode/auth.json";
-        content = ''
-          {
-            "zai-coding-plan": {
-              "type": "api",
-              "key": "${config.sops.placeholder."opencode_api_key"}"
+        "opencode/auth.json" = {
+          owner = config.users.users.${cfg.username}.name;
+          path = "/home/${cfg.username}/.local/share/opencode/auth.json";
+          content = ''
+            {
+              "zai-coding-plan": {
+                "type": "api",
+                "key": "${config.sops.placeholder."opencode_api_key"}"
+              }
             }
-          }
-        '';
+          '';
+        };
       };
     };
   };

modules/ssh/extract-keys.nix

@@ -1,6 +1,6 @@
 { lib, config, ... }:
 let
-  username = config.ssh.username;
+  inherit (config.ssh) username;
 in
 {
   # auto extract SSH keys

modules/x/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+_:
 
 {
   services.xserver.windowManager.xmonad = {