repo: clean code

home/common/automount.nix

@@ -1,3 +1,3 @@
-{...}: {
+_: {
   services.udiskie.enable = true;
 }

home/common/core.nix

@@ -1,6 +1,8 @@
-{inputs, ...}: {
-  home.username = "nezia";
-  home.homeDirectory = "/home/nezia";
+_: {
+  home = {
+    username = "nezia";
+    homeDirectory = "/home/nezia";
+    stateVersion = "24.05";
+  };
   programs.home-manager.enable = true;
-  home.stateVersion = "24.05";
 }

home/common/mime.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   xdg.mimeApps = {
     enable = true;
     defaultApplications = {

home/common/programs/git.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.git = {
     enable = true;
     userName = "Anthony Rodriguez";

home/common/programs/gnupg.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.gpg = {
     enable = true;
     publicKeys = [

home/common/shell/direnv.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs = {
     direnv = {
       enable = true;

home/common/shell/fish.nix

@@ -20,7 +20,7 @@ in {
     plugins = [
       {
         name = "fzf";
-        src = pkgs.fishPlugins.fzf.src;
+        inherit (pkgs.fishPlugins.fzf) src;
       }
     ];
   };

home/common/shell/starship.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.starship = {
     enable = true;
     enableTransience = true;

home/common/shell/zellij.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.zellij = {
     enable = true;
     settings = {

home/common/shell/zoxide.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.zoxide = {
     enable = true;
     enableBashIntegration = false;

hosts/common/default.nix

@@ -4,9 +4,10 @@ _: {
     ./syncthing
     ./sops.nix
   ];
-
-  modules.gnome.enable = true;
-  modules.stylix.enable = true;
-  modules.docker.enable = true;
-  modules.pipewire.enable = true;
+  modules = {
+    gnome.enable = true;
+    stylix.enable = true;
+    docker.enable = true;
+    pipewire.enable = true;
+  };
 }

hosts/common/sops.nix

@@ -3,10 +3,12 @@
   username,
   ...
 }: {
-  sops.defaultSopsFile = ../../secrets/secrets.yaml;
-  sops.defaultSopsFormat = "yaml";
-  sops.age.keyFile = "/home/${username}/.config/sops/age/keys.txt";
+  sops = {
+    defaultSopsFile = ../../secrets/secrets.yaml;
+    defaultSopsFormat = "yaml";
+    age.keyFile = "/home/${username}/.config/sops/age/keys.txt";
 
-  sops.secrets."syncthing/${hostname}/key" = {};
-  sops.secrets."syncthing/${hostname}/cert" = {};
+    secrets."syncthing/${hostname}/key" = {};
+    secrets."syncthing/${hostname}/cert" = {};
+  };
 }

hosts/common/system/boot.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   boot = {
     loader = {
       timeout = 0;

hosts/common/system/core.nix

@@ -1,12 +1,18 @@
 {hostname, ...}: {
   networking.hostName = hostname;
   networking.networkmanager.enable = true;
-
-  services.xserver.xkb = {
+  services = {
+    xserver.xkb = {
       layout = "us";
       variant = "";
     };
 
+    # automount
+    udisks2.enable = true;
+
+    fwupd.enable = true;
+  };
+
   users.users.nezia = {
     isNormalUser = true;
     description = "Anthony Rodriguez";
@@ -16,11 +22,6 @@
     ];
   };
 
-  # automount
-  services.udisks2.enable = true;
-
-  services.fwupd.enable = true;
-
   nixpkgs.config.allowUnfree = true;
   hardware.enableAllFirmware = true;
 

hosts/common/system/locale.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   # Set your time zone.
   time.timeZone = "Europe/Paris";
 

hosts/common/system/misc.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   # fix direnv integration with fish
   environment.pathsToLink = ["/share/fish"];
 

hosts/common/system/printing.nix

@@ -1,17 +1,23 @@
 {pkgs, ...}: {
+  services = {
     # setup printing service
-  services.printing.enable = true;
+    printing.enable = true;
 
-  services.avahi = {
+    avahi = {
       enable = true;
       nssmdns4 = true;
       openFirewall = true;
     };
 
-  services.printing.drivers = [
+    printing.drivers = [
       pkgs.gutenprint
       pkgs.hplip
     ];
+    udev.packages = [
+      pkgs.sane-airscan
+      pkgs.utsushi
+    ];
+  };
 
   hardware.sane.enable = true; # enables support for SANE scanners
   hardware.sane.extraBackends = [
@@ -20,8 +26,4 @@
     pkgs.epkowa # Epson
     pkgs.utsushi # other printers
   ];
-  services.udev.packages = [
-    pkgs.sane-airscan
-    pkgs.utsushi
-  ];
 }

hosts/solaire/hardware-configuration.nix

@@ -4,15 +4,14 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
-
-  boot.initrd.availableKernelModules = [
+  boot = {
+    initrd.availableKernelModules = [
       "nvme"
       "xhci_pci"
       "ahci"
@@ -20,9 +19,10 @@
       "usbhid"
       "sd_mod"
     ];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+    initrd.kernelModules = [];
+    kernelModules = ["kvm-amd"];
+    extraModulePackages = [];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/NIXROOT";

hosts/vamos/default.nix

@@ -3,10 +3,10 @@
     ./hardware-configuration.nix
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
   ];
-
-  services.fprintd.enable = true;
-  services.power-profiles-daemon.enable = true;
-  services.keyd = {
+  services = {
+    fprintd.enable = true;
+    power-profiles-daemon.enable = true;
+    keyd = {
       enable = true;
       keyboards = {
         default = {
@@ -19,6 +19,7 @@
         };
       };
     };
+  };
   modules = {
     neovim.enable = true;
     wezterm.enable = true;

hosts/vamos/hardware-configuration.nix

@@ -4,31 +4,33 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
-
-  boot.initrd.availableKernelModules = [
+  boot = {
+    initrd = {
+      availableKernelModules = [
         "nvme"
         "xhci_pci"
         "thunderbolt"
         "usb_storage"
         "sd_mod"
       ];
-  boot.initrd.kernelModules = [
+      kernelModules = [
         "amdgpu"
         "dm-snapshot"
       ];
-  boot.kernelModules = [
+      luks.devices."crypt".device = "/dev/disk/by-uuid/39d0e0c6-ea32-4ee4-ac76-b28fbff687f8";
+    };
+    kernelModules = [
       "kvm-amd"
       "cryptd"
     ];
-  boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/39d0e0c6-ea32-4ee4-ac76-b28fbff687f8";
-  boot.extraModulePackages = [];
+    extraModulePackages = [];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/4ef04567-9633-45b9-addc-55c3020f45b7";

modules/gui/gnome.nix

@@ -27,8 +27,7 @@ in {
       };
     };
 
-    environment.gnome.excludePackages = (
-      with pkgs; [
+    environment.gnome.excludePackages = with pkgs; [
       gnome-console
       gnome-photos
       gnome-tour
@@ -45,8 +44,7 @@ in {
       epiphany
       geary
       yelp
-      ]
-    );
+    ];
 
     environment.systemPackages = with pkgs; [
       gnome-tweaks

modules/gui/wezterm.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  inputs,
   username,
   ...
 }: let