Avoid repeated keys

flake/checks.nix

@@ -6,14 +6,8 @@
       checks = {
         treefmt = (import ./treefmt.nix { inherit inputs pkgs; }).check self;
 
-        statix =
-          let
-            statix-config = pkgs.writeText "statix.toml" ''
-              disabled = ["repeated_keys"]
-            '';
-          in
-          pkgs.runCommand "statix" { buildInputs = [ pkgs.statix ]; } ''
-            statix check ${self} --config ${statix-config}
+        statix = pkgs.runCommand "statix" { buildInputs = [ pkgs.statix ]; } ''
+          statix check ${self}
           mkdir $out
         '';
 

hosts/inspiron/hardware.nix

@@ -6,19 +6,27 @@
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
-  hardware.enableRedistributableFirmware = true;
-  hardware.cpu.amd.updateMicrocode = true;
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.initrd.kernelModules = [ "usb_storage" ];
-  boot.initrd.availableKernelModules = [
+
+  hardware = {
+    enableRedistributableFirmware = true;
+    cpu.amd.updateMicrocode = true;
+  };
+
+  boot = {
+    kernelModules = [ "kvm-amd" ];
+    initrd.kernelModules = [ "usb_storage" ];
+    initrd.availableKernelModules = [
       "nvme"
       "xhci_pci"
       "ahci"
       "sd_mod"
     ];
+  };
 
   zramSwap.enable = true;
-  services.fstrim.enable = true;
-  services.fwupd.enable = true;
-  services.auto-cpufreq.enable = true;
+  services = {
+    fstrim.enable = true;
+    fwupd.enable = true;
+    auto-cpufreq.enable = true;
+  };
 }

hosts/north/hardware.nix

@@ -12,14 +12,19 @@
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
-  hardware.enableRedistributableFirmware = true;
-  hardware.cpu.amd.updateMicrocode = true;
-  boot.kernelModules = [
+
+  hardware = {
+    enableRedistributableFirmware = true;
+    cpu.amd.updateMicrocode = true;
+  };
+
+  boot = {
+    kernelModules = [
       "kvm-amd"
       "k10temp"
       "nct6775"
     ];
-  boot.initrd.availableKernelModules = [
+    initrd.availableKernelModules = [
       "xhci_pci"
       "ahci"
       "nvme"
@@ -27,6 +32,7 @@
       "usbhid"
       "sd_mod"
     ];
+  };
 
   zramSwap.enable = true;
   services.fstrim.enable = true;

modules/home/git.nix

@@ -3,18 +3,22 @@
   options.myConfig.git.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.git.enable {
-    programs.git = {
+    sops.secrets.github-ssh-key.path = "${config.home.homeDirectory}/.ssh/github";
+
+    programs = {
+      git = {
         enable = true;
         userName = "SebastianStork";
         userEmail = "sebastian.stork@pm.me";
         extraConfig.init.defaultBranch = "main";
       };
-    programs.lazygit.enable = true;
 
-    sops.secrets.github-ssh-key.path = "${config.home.homeDirectory}/.ssh/github";
-    programs.ssh = {
+      lazygit.enable = true;
+
+      ssh = {
         enable = true;
         matchBlocks."github.com".identityFile = "~/.ssh/github";
       };
     };
+  };
 }

modules/home/shell/default.nix

@@ -8,7 +8,8 @@
   options.myConfig.shell.zsh.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.shell.zsh.enable {
-    programs.zsh = {
+    programs = {
+      zsh = {
         enable = true;
         dotDir = ".config/zsh";
 
@@ -39,17 +40,18 @@
         '';
       };
 
-    programs.fzf.enable = true;
+      fzf.enable = true;
 
-    programs.zoxide = {
+      zoxide = {
         enable = true;
         options = [ "--cmd cd" ];
       };
 
-    programs.direnv = {
+      direnv = {
         enable = true;
         nix-direnv.enable = true;
         config.global.hide_env_diff = true;
       };
     };
+  };
 }

modules/system/auto-gc.nix

@@ -3,11 +3,13 @@
   options.myConfig.auto-gc.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.auto-gc.enable {
-    programs.nh.enable = true;
-    programs.nh.clean = {
+    programs.nh = {
+      enable = true;
+      clean = {
         enable = true;
         dates = "daily";
         extraArgs = "--keep 10 --keep-since 3d";
       };
     };
+  };
 }

modules/system/bluetooth.nix

@@ -3,11 +3,14 @@
   options.myConfig.bluetooth.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.bluetooth.enable {
-    hardware.bluetooth = {
+    hardware = {
+      bluetooth = {
         enable = true;
         powerOnBoot = true;
       };
+      logitech.wireless.enable = true;
+    };
+
     services.blueman.enable = true;
-    hardware.logitech.wireless.enable = true;
   };
 }

modules/system/boot/loader.nix

@@ -3,8 +3,9 @@
   options.myConfig.boot.loader.systemd-boot.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.boot.loader.systemd-boot.enable {
-    boot.tmp.cleanOnBoot = true;
-    boot.loader = {
+    boot = {
+      tmp.cleanOnBoot = true;
+      loader = {
         systemd-boot = {
           enable = true;
           editor = false;
@@ -13,6 +14,7 @@
         efi.canTouchEfiVariables = true;
         timeout = 0;
       };
+    };
     systemd.watchdog.rebootTime = "10";
   };
 }

modules/system/boot/silent.nix

@@ -10,9 +10,11 @@
         "rd.udev.log_level=3"
         "udev.log_priority=3"
       ];
+      initrd = {
+        verbose = false;
+        systemd.enable = true;
+      };
       consoleLogLevel = 3;
-      initrd.verbose = false;
-      initrd.systemd.enable = true;
       plymouth.enable = true;
     };
   };

modules/system/comma.nix

@@ -13,8 +13,10 @@ in
   options.myConfig.comma.enable = lib.mkEnableOption "";
 
   config = {
-    programs.command-not-found.enable = !cfg.enable;
-    programs.nix-index.enable = cfg.enable;
-    programs.nix-index-database.comma.enable = cfg.enable;
+    programs = {
+      command-not-found.enable = !cfg.enable;
+      nix-index.enable = cfg.enable;
+      nix-index-database.comma.enable = cfg.enable;
+    };
   };
 }

modules/system/printing.nix

@@ -3,11 +3,13 @@
   options.myConfig.printing.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.printing.enable {
-    services.printing.enable = true;
-    services.avahi = {
+    services = {
+      printing.enable = true;
+      avahi = {
         enable = true;
         nssmdns4 = true;
         openFirewall = true;
       };
     };
+  };
 }

modules/system/sound.nix

@@ -8,9 +8,11 @@
     services.pipewire = {
       enable = true;
       wireplumber.enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
       pulse.enable = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
     };
   };
 }