diff options
| -rw-r--r-- | dev/devShells.nix | 6 | ||||
| -rw-r--r-- | flake.lock | 25 | ||||
| -rw-r--r-- | flake.nix | 16 | ||||
| -rw-r--r-- | modules/shared/base/nix.nix | 4 |
4 files changed, 46 insertions, 5 deletions
diff --git a/dev/devShells.nix b/dev/devShells.nix index ca60d16..68057a1 100644 --- a/dev/devShells.nix +++ b/dev/devShells.nix @@ -14,7 +14,7 @@ [ # we want to make sure we have the same # nix behavior across machines - pkgs.lix + pkgs.nix # format + lint pkgs.actionlint @@ -30,10 +30,10 @@ # terranix self'.packages.opentofu ] - # see above comment about {l,n}ix + # see above comment about nix ++ lib.optional pkgs.stdenv.isDarwin inputs'.nix-darwin.packages.darwin-rebuild ++ lib.optionals pkgs.stdenv.isLinux [ - (pkgs.nixos-rebuild.override { nix = pkgs.lix; }) # ditto + pkgs.nixos-rebuild # ditto inputs'.agenix.packages.agenix ]; }; @@ -241,6 +241,30 @@ "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": [ @@ -407,6 +431,7 @@ "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", @@ -25,6 +25,12 @@ ./ext ]; + + perSystem = + { inputs', ... }: + { + _module.args.pkgs = inputs'.nixpkgs.legacyPackages.extend inputs.lix-module.overlays.lixFromNixpkgs; + }; }; inputs = { @@ -95,6 +101,16 @@ }; }; + 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 f3de990..4a720ec 100644 --- a/modules/shared/base/nix.nix +++ b/modules/shared/base/nix.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + inputs, ... }: let @@ -21,8 +22,6 @@ in config = lib.mkIf cfg.enable { nix = { - package = lib.mkIf cfg.lix.enable pkgs.lix; - settings = { auto-optimise-store = pkgs.stdenv.isLinux; experimental-features = @@ -51,6 +50,7 @@ in nixpkgs = { config.allowUnfree = lib.mkDefault true; + overlays = lib.mkIf cfg.lix.enable [ inputs.lix-module.overlays.lixFromNixpkgs ]; }; }; } |