diff --git a/flake.lock b/flake.lock index ac03082..952cc17 100644 --- a/flake.lock +++ b/flake.lock @@ -94,6 +94,27 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.05", + "repo": "home-manager", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -156,13 +177,27 @@ "url": "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "clan-core": "clan-core", - "nixpkgs": [ - "clan-core", - "nixpkgs" - ] + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2" } }, "sops-nix": { diff --git a/flake.nix b/flake.nix index 17582db..7f7bf92 100644 --- a/flake.nix +++ b/flake.nix @@ -1,38 +1,43 @@ { - inputs.clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; - inputs.nixpkgs.follows = "clan-core/nixpkgs"; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - outputs = - { - self, - clan-core, - nixpkgs, - ... - }@inputs: - let - # Usage see: https://docs.clan.lol - clan = clan-core.lib.clan { - inherit self; - imports = [ ./clan.nix ]; - specialArgs = { inherit inputs; }; - }; - in - { - inherit (clan.config) nixosConfigurations nixosModules clanInternals; - # Add the Clan cli tool to the dev shell. - # Use "nix develop" to enter the dev shell. - devShells = - nixpkgs.lib.genAttrs - [ - "x86_64-linux" - "aarch64-linux" - "aarch64-darwin" - "x86_64-darwin" - ] - (system: { - default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell { - packages = [ clan-core.packages.${system}.clan-cli ]; - }; - }); + clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; + + home-manager = { + url = "github:nix-community/home-manager/release-25.05"; + inputs.nixpkgs.follows = "nixpkgs"; }; + }; + + outputs = { + self, + clan-core, + nixpkgs, + ... + } @ inputs: let + # Usage see: https://docs.clan.lol + clan = clan-core.lib.clan { + inherit self; + imports = [./clan.nix]; + specialArgs = {inherit inputs;}; + }; + in { + inherit (clan.config) nixosConfigurations nixosModules clanInternals; + # Add the Clan cli tool to the dev shell. + # Use "nix develop" to enter the dev shell. + devShells = + nixpkgs.lib.genAttrs + [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + ] + (system: { + default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell { + packages = [clan-core.packages.${system}.clan-cli]; + }; + }); + }; }