nixos/modules/nixos/editor/default.nix

@@ -56,7 +56,7 @@ in
     # Enable vscode & addons
     environment.systemPackages = with pkgs; [
       (vscode-with-extensions.override {
-        inherit (unstable) vscode;
+        vscode = unstable.vscode;
         # Merge all the extension packages together.
         vscodeExtensions =
           vscodeCommunityExtensionsPackages ++ nixpkgsExtensionsPackages ++ marketplaceExtensionsPackages;

nixos/modules/nixos/services/bind/default.nix

@@ -26,7 +26,7 @@ in
     services.bind = {
       enable = true;
       inherit (cfg) package;
-      inherit (cfg) extraConfig;
+      extraConfig = cfg.extraConfig;
     };
 
     # Clean up journal files

nixos/modules/nixos/services/haproxy/default.nix

@@ -32,7 +32,7 @@ in
     services.haproxy = {
       enable = true;
       inherit (cfg) package;
-      inherit (cfg) config;
+      config = cfg.config;
     };
   };
 }

nixos/modules/nixos/system/borg/default.nix

@@ -27,9 +27,9 @@ in
 
   config = lib.mkIf cfg.enable {
     services.borgbackup.jobs."borgbackup" = {
-      inherit (cfg) paths;
-      inherit (cfg) exclude;
-      inherit (cfg) repo;
+      paths = cfg.paths;
+      exclude = cfg.exclude;
+      repo = cfg.repo;
       encryption = {
         mode = "repokey-blake2";
         passCommand = "cat ${cfg.repoKeyPath}";

nixos/overlays/go/default.nix

@@ -2,7 +2,7 @@
 let
   finalVersion = "1.22.5";
 in
-final: prev: {
+(final: prev: {
   go_1_22 = prev.go_1_22.overrideAttrs (oldAttrs: { 
     version = finalVersion;
     src = prev.fetchurl {
@@ -10,4 +10,4 @@ final: prev: {
       hash = "sha256-rJxyPyJJaa7mJLw0/TTJ4T8qIS11xxyAfeZEu0bhEvY=";
     };
   });
-}
+})

nixos/overlays/talosctl/default.nix

@@ -2,7 +2,7 @@
 let
   finalVersion = "1.7.5";
 in
-final: prev: {
+(final: prev: {
   talosctl = prev.talosctl.overrideAttrs (oldAttrs: { 
     version = finalVersion;
     src = prev.fetchFromGitHub {
@@ -16,4 +16,4 @@ final: prev: {
       updateScript = ./update.sh;
     };
   });
-}
+})

nixos/overlays/warp-terminal/default.nix

@@ -2,12 +2,12 @@
 let 
   versions = lib.importJSON ./versions.json;
 in
-final: prev: {
+(final: prev: {
   warp-terminal = prev.warp-terminal.overrideAttrs (oldAttrs: { 
-    inherit (versions.linux) version;
+    version = versions.linux.version;
     src = prev.fetchurl {
       url = "https://releases.warp.dev/stable/v${versions.linux.version}/warp-terminal-v${versions.linux.version}-1-x86_64.pkg.tar.zst";
-      inherit (versions.linux) hash;
+      hash = versions.linux.hash;
     };
   });
-}
+})

statix.toml

@@ -1,6 +0,0 @@
-disabled = [
-    "empty_pattern"
-]
-nix_version = '2.4'
-ignore = ['.direnv']
-