Revert "treewide: use lix-module for lix"

This reverts commit f77aeb0db935f60590aa5b6975857b528c8f6a51.

5 files changed, 34 insertions, 73 deletions

diff --git a/dev/dev-shells.nix b/dev/dev-shells.nix
index 211ddfd..9461970 100644
--- a/dev/dev-shells.nix
+++ b/dev/dev-shells.nix
@@ -7,36 +7,37 @@
       self',
       ...
     }:
+    let
+      nixos-rebuild = pkgs.nixos-rebuild.override { nix = pkgs.lix; };
+      darwin-rebuild = inputs'.nix-darwin.packages.darwin-rebuild.override { nix = pkgs.lix; };
+    in
     {
-      devShells = {
-        default = pkgs.mkShellNoCC {
-          packages =
-            [
-              # we want to make sure we have the same
-              # nix behavior across machines
-              pkgs.nix
+      devShells.default = pkgs.mkShellNoCC {
+        packages =
+          [
+            # we want to make sure we have the same
+            # nix behavior across machines
+            pkgs.lix
 
-              # format + lint
-              pkgs.actionlint
-              self'.formatter
-              pkgs.nixfmt-rfc-style
-              pkgs.nil
-              pkgs.statix
+            # format + lint
+            pkgs.actionlint
+            self'.formatter
+            pkgs.nixfmt-rfc-style
+            pkgs.nil
+            pkgs.statix
 
-              # utils
-              pkgs.fzf # for just
-              pkgs.just
+            # utils
+            pkgs.fzf # for just
+            pkgs.just
 
-              # terranix
-              self'.packages.opentofu
-            ]
-            # see above comment about nix
-            ++ lib.optional pkgs.stdenv.isDarwin inputs'.nix-darwin.packages.darwin-rebuild
-            ++ lib.optionals pkgs.stdenv.isLinux [
-              pkgs.nixos-rebuild # ditto
-              inputs'.agenix.packages.agenix
-            ];
-        };
+            # terranix
+            self'.packages.opentofu
+          ]
+          ++ lib.optional pkgs.stdenv.isDarwin darwin-rebuild # see above comment about {l,n}ix
+          ++ lib.optionals pkgs.stdenv.isLinux [
+            nixos-rebuild # ditto
+            inputs'.agenix.packages.agenix
+          ];
       };
     };
 }
diff --git a/flake.lock b/flake.lock
index 0d3aa3f..f06b61a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -241,30 +241,6 @@
         "type": "github"
       }
     },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": [
-          "nixos-wsl",
-          "flake-utils"
-        ],
-        "flakey-profile": [],
-        "lix": [],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1723510904,
-        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
-        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -431,7 +407,6 @@
         "home-manager": "home-manager",
         "krunner-nix": "krunner-nix",
         "lanzaboote": "lanzaboote",
-        "lix-module": "lix-module",
         "nix-darwin": "nix-darwin",
         "nix-index-database": "nix-index-database",
         "nixinate": "nixinate",
diff --git a/flake.nix b/flake.nix
index 834b947..b28eda6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,12 +25,6 @@
 
         ./ext
       ];
-
-      perSystem =
-        { inputs', ... }:
-        {
-          _module.args.pkgs = inputs'.nixpkgs.legacyPackages.extend inputs.lix-module.overlays.lixFromNixpkgs;
-        };
     };
 
   inputs = {
@@ -101,16 +95,6 @@
       };
     };
 
-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        lix.follows = "";
-        flake-utils.follows = "nixos-wsl/flake-utils";
-        flakey-profile.follows = "";
-      };
-    };
-
     nixinate = {
       url = "github:MatthewCroughan/nixinate";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/shared/base/nix.nix b/modules/shared/base/nix.nix
index 4a720ec..0c13276 100644
--- a/modules/shared/base/nix.nix
+++ b/modules/shared/base/nix.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  inputs,
   ...
 }:
 let
@@ -22,6 +21,8 @@ in
 
   config = lib.mkIf cfg.enable {
     nix = {
+      package = lib.mkIf cfg.lix.enable pkgs.lix;
+
       settings = {
         auto-optimise-store = pkgs.stdenv.isLinux;
         experimental-features =
@@ -48,9 +49,6 @@ in
       };
     };
 
-    nixpkgs = {
-      config.allowUnfree = lib.mkDefault true;
-      overlays = lib.mkIf cfg.lix.enable [ inputs.lix-module.overlays.lixFromNixpkgs ];
-    };
+    nixpkgs.config.allowUnfree = lib.mkDefault true;
   };
 }
diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
index 13f8af4..64c2fd5 100644
--- a/users/seth/programs/default.nix
+++ b/users/seth/programs/default.nix
@@ -57,7 +57,10 @@ in
 
       direnv = {
         enable = true;
-        nix-direnv.enable = true;
+        nix-direnv = {
+          enable = true;
+          package = pkgs.nix-direnv.override { nix = pkgs.lix; };
+        };
       };
 
       ripgrep.enable = true;