diff --git a/flake.lock b/flake.lock index 6a77961..893d3e5 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,46 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1780336545, + "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", "import-tree": "import-tree", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "wrappers": "wrappers" + } + }, + "wrappers": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1782135443, + "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=", + "owner": "BirdeeHub", + "repo": "nix-wrapper-modules", + "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f", + "type": "github" + }, + "original": { + "owner": "BirdeeHub", + "repo": "nix-wrapper-modules", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 22e6d82..a159a52 100644 --- a/flake.nix +++ b/flake.nix @@ -10,5 +10,6 @@ wrappers.url = "github:BirdeeHub/nix-wrapper-modules"; }; + outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); } diff --git a/modules/hosts/HACKSTATION/hackstationConfiguration.nix b/modules/hosts/HACKSTATION/hackstationConfiguration.nix index a2938d6..3ec3112 100644 --- a/modules/hosts/HACKSTATION/hackstationConfiguration.nix +++ b/modules/hosts/HACKSTATION/hackstationConfiguration.nix @@ -1,6 +1,7 @@ { self, inputs, + ... }: { flake.nixosModules.hackstationConfiguration = {pkgs, ...}: { networking.hostName = "HACKSTATION"; diff --git a/modules/pacakges/zsh/default.nix b/modules/pacakges/zsh/default.nix index 5aca77b..486ace5 100644 --- a/modules/pacakges/zsh/default.nix +++ b/modules/pacakges/zsh/default.nix @@ -4,6 +4,8 @@ ... }: { perSystem = {pkgs, ...}: { - packages.myZsh = {inputs.wrappers.wrappers.zsh.zshrc.content = (self.dots.zshrc pkgs);}; + packages.myZsh = inputs.wrappers.wrappers.zsh.wrap { + zshrc.content = (self.dots.zshrc pkgs); + }; }; }