diff --git a/flake.nix b/flake.nix
index a7aeeff..f9c6656 100644
--- a/flake.nix
+++ b/flake.nix
@@ -118,20 +118,20 @@
           (plat: {
             name = plat;
             value =
-              (lib.filterAttrs (_name: value: (!lib.hasAttrByPath [ "meta" "platforms" ] value) || builtins.elem plat value.meta.platforms)
+              lib.filterAttrs (_name: value: (!lib.hasAttrByPath [ "meta" "platforms" ] value) || builtins.elem plat value.meta.platforms)
                 (builtins.listToAttrs (builtins.map
                   (e: {
                     name = e;
                     value = nixpkgs_plats.${plat}.callPackage (./packages + "/${e}") { };
                   })
-                  (builtins.attrNames (builtins.readDir ./packages)))));
+                  (builtins.attrNames (builtins.readDir ./packages))));
           })
           machines_plats);
 
-      machines = lib.luj.machines;
+      inherit (lib.luj) machines;
 
       checks = {
-        packages = packages;
+        inherit packages;
         machines = lib.mapAttrs (_: v: v.config.system.build.toplevel) self.nixosConfigurations;
       };
     };
diff --git a/home-manager-modules/sway/default.nix b/home-manager-modules/sway/default.nix
index 391b0d3..d2b06f8 100644
--- a/home-manager-modules/sway/default.nix
+++ b/home-manager-modules/sway/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 let
   cfg = config.luj.programs.sway;
-  modifier = cfg.modifier;
+  inherit (cfg) modifier;
   terminal = "kitty";
 in
 with lib;
@@ -22,7 +22,7 @@ with lib;
       enable = true;
       package = pkgs.swayfx;
       config = {
-        terminal = terminal;
+        inherit terminal;
         output =
           {
             DP-6 = {
@@ -35,7 +35,7 @@ with lib;
             };
 
           };
-        modifier = cfg.modifier;
+        inherit (cfg) modifier;
         input = {
           "*" = {
             xkb_layout = "fr";
diff --git a/home-manager-modules/zsh/default.nix b/home-manager-modules/zsh/default.nix
index b19055d..a1f3b13 100644
--- a/home-manager-modules/zsh/default.nix
+++ b/home-manager-modules/zsh/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 let
   cfg = config.luj.programs.zsh;
-  fetchFromGitHub = pkgs.fetchFromGitHub;
+  inherit (pkgs) fetchFromGitHub;
 in
 with lib;
 {
diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix
index fa67840..a0a581f 100644
--- a/lib/mkmachine.nix
+++ b/lib/mkmachine.nix
@@ -19,7 +19,7 @@ in
 { host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }:
 nixpkgs.lib.nixosSystem {
   inherit system;
-  lib = (nixpkgs.lib.extend (import ./default.nix inputs));
+  lib = nixpkgs.lib.extend (import ./default.nix inputs);
   specialArgs =
     {
       inherit inputs;
@@ -49,20 +49,20 @@ nixpkgs.lib.nixosSystem {
               mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
             });
             tinystatus = prev.pkgs.callPackage ../packages/tinystatus { };
-            jackett = prev.unstable.jackett;
-            radarr = prev.unstable.radarr;
+            inherit (prev.unstable) jackett;
+            inherit (prev.unstable) radarr;
             htpdate = prev.pkgs.callPackage ../packages/htpdate { };
             authelia = prev.pkgs.callPackage ../packages/authelia { };
             paperless-ng = prev.pkgs.callPackage ../packages/paperless-ng { };
-            tailscale = prev.unstable.tailscale;
-            nodePackages = prev.unstable.nodePackages;
+            inherit (prev.unstable) tailscale;
+            inherit (prev.unstable) nodePackages;
             hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
-            mosh = prev.unstable.mosh;
+            inherit (prev.unstable) mosh;
             attic = inputs.attic.packages.${system}.default;
-            colmena = inputs.colmena.packages.${system}.colmena;
+            inherit (inputs.colmena.packages.${system}) colmena;
             keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
             nix-rfc-92 = inputs.nix-rfc-92.packages.${system}.default;
-            bcachefs-tools = prev.unstable.bcachefs-tools;
+            inherit (prev.unstable) bcachefs-tools;
             zotero = inputs.zotero-nix.packages.${system}.default;
           })
       ];
diff --git a/machines/core-data/home-julien.nix b/machines/core-data/home-julien.nix
index 8ace50c..8b3d5a4 100644
--- a/machines/core-data/home-julien.nix
+++ b/machines/core-data/home-julien.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   luj.hmgr.julien = { };
 }
diff --git a/machines/core-security/home-julien.nix b/machines/core-security/home-julien.nix
index 8ace50c..8b3d5a4 100644
--- a/machines/core-security/home-julien.nix
+++ b/machines/core-security/home-julien.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   luj.hmgr.julien = { };
 }
diff --git a/machines/lambda/home-julien.nix b/machines/lambda/home-julien.nix
index 2c6ed81..a4f032a 100644
--- a/machines/lambda/home-julien.nix
+++ b/machines/lambda/home-julien.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   luj.hmgr.julien = {
     home.stateVersion = "22.11";
diff --git a/machines/lisa/home-julien.nix b/machines/lisa/home-julien.nix
index 80b18e5..b300d3c 100644
--- a/machines/lisa/home-julien.nix
+++ b/machines/lisa/home-julien.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
 
   sops.secrets.ssh-lisa-pub = {
diff --git a/modules/deluge/default.nix b/modules/deluge/default.nix
index 4d3c528..52f6d3f 100644
--- a/modules/deluge/default.nix
+++ b/modules/deluge/default.nix
@@ -39,8 +39,8 @@ in
 
       services.deluge = {
         enable = true;
-        user = cfg.user;
-        group = cfg.group;
+        inherit (cfg) user;
+        inherit (cfg) group;
         openFirewall = true;
         declarative = true;
         authFile = "/run/secrets/deluge";
diff --git a/modules/docs/default.nix b/modules/docs/default.nix
index ec2b14a..764f847 100644
--- a/modules/docs/default.nix
+++ b/modules/docs/default.nix
@@ -21,7 +21,7 @@ in
       services.hedgedoc = {
         enable = true;
         settings = {
-          port = port;
+          inherit port;
           db = {
             dialect = "postgres";
             host = "/run/postgresql";
diff --git a/modules/gitlab-runner/default.nix b/modules/gitlab-runner/default.nix
index 9c90a87..adb965b 100644
--- a/modules/gitlab-runner/default.nix
+++ b/modules/gitlab-runner/default.nix
@@ -92,7 +92,7 @@ in
             --service gitlab-runner \
             --config ${cfg.registrationConfigFile}
           '';
-        } // optionalAttrs (cfg.gracefulTermination) {
+        } // optionalAttrs cfg.gracefulTermination {
           TimeoutStopSec = "${cfg.gracefulTimeout}";
           KillSignal = "SIGQUIT";
           KillMode = "process";
diff --git a/modules/hydra/default.nix b/modules/hydra/default.nix
index 2362fa4..f0e64da 100644
--- a/modules/hydra/default.nix
+++ b/modules/hydra/default.nix
@@ -20,7 +20,7 @@ in
       services.hydra = {
         enable = true;
         notificationSender = "hydra@localhost";
-        port = port;
+        inherit port;
         buildMachinesFiles = [ ];
         useSubstitutes = true;
       };
diff --git a/modules/jackett/default.nix b/modules/jackett/default.nix
index aa3ff6b..05d892a 100644
--- a/modules/jackett/default.nix
+++ b/modules/jackett/default.nix
@@ -32,8 +32,8 @@ in
     mkMerge [{
       services.jackett = {
         enable = true;
-        user = cfg.user;
-        group = cfg.group;
+        inherit (cfg) user;
+        inherit (cfg) group;
       };
 
     }
diff --git a/modules/jellyfin/default.nix b/modules/jellyfin/default.nix
index 578f1a2..25ab3ee 100644
--- a/modules/jellyfin/default.nix
+++ b/modules/jellyfin/default.nix
@@ -32,8 +32,8 @@ in
     mkMerge [{
       services.jellyfin = {
         enable = true;
-        user = cfg.user;
-        group = cfg.group;
+        inherit (cfg) user;
+        inherit (cfg) group;
       };
 
       #      services.nginx.appendHttpConfig = ''
diff --git a/modules/lidarr/default.nix b/modules/lidarr/default.nix
index 7104b32..93448e8 100644
--- a/modules/lidarr/default.nix
+++ b/modules/lidarr/default.nix
@@ -33,8 +33,8 @@ in
     mkMerge [{
       services.lidarr = {
         enable = true;
-        user = cfg.user;
-        group = cfg.group;
+        inherit (cfg) user;
+        inherit (cfg) group;
       };
     }
 
diff --git a/modules/paperless/default.nix b/modules/paperless/default.nix
index d3d9007..12ac096 100644
--- a/modules/paperless/default.nix
+++ b/modules/paperless/default.nix
@@ -26,7 +26,7 @@ in
     mkMerge [{
       services.paperless = {
         enable = true;
-        user = cfg.user;
+        inherit (cfg) user;
         mediaDir = "/home/julien/papers";
         extraConfig = {
           PAPERLESS_OCR_LANGUAGE = "fra+eng";
diff --git a/modules/radarr/default.nix b/modules/radarr/default.nix
index a389090..e82fe83 100644
--- a/modules/radarr/default.nix
+++ b/modules/radarr/default.nix
@@ -33,8 +33,8 @@ in
     mkMerge [{
       services.radarr = {
         enable = true;
-        user = cfg.user;
-        group = cfg.group;
+        inherit (cfg) user;
+        inherit (cfg) group;
       };
     }
       
diff --git a/modules/sonarr/default.nix b/modules/sonarr/default.nix
index 2437d76..73cdae5 100644
--- a/modules/sonarr/default.nix
+++ b/modules/sonarr/default.nix
@@ -33,8 +33,8 @@ in
     mkMerge [{
       services.sonarr = {
         enable = true;
-        user = cfg.user;
-        group = cfg.group;
+        inherit (cfg) user;
+        inherit (cfg) group;
       };
     }
 
diff --git a/modules/transmission/default.nix b/modules/transmission/default.nix
index c1c180c..85a6898 100644
--- a/modules/transmission/default.nix
+++ b/modules/transmission/default.nix
@@ -39,8 +39,8 @@ in
 
       services.transmission = {
         enable = true;
-        user = cfg.user;
-        group = cfg.group;
+        inherit (cfg) user;
+        inherit (cfg) group;
         credentialsFile = "/run/secrets/transmission";
         downloadDirPermissions = "770";
         settings = {