diff --git a/flake.lock b/flake.lock index 33025fe..c09df02 100644 --- a/flake.lock +++ b/flake.lock @@ -110,16 +110,14 @@ }, "home-manager": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1788229478, - "narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=", + "lastModified": 1788146656, + "narHash": "sha256-XmJmvk9rytTb7dCotO/aqR+YysB8HOqnprlOdv+LAF4=", "owner": "nix-community", "repo": "home-manager", - "rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1", + "rev": "82c265faf4e3161d6015db07c9b0f1ee36a9029b", "type": "github" }, "original": { @@ -131,18 +129,16 @@ "nixcord": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "nixpkgs-nixcord": "nixpkgs-nixcord", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1788253445, - "narHash": "sha256-+18+hW03A1Zl5iagPD1gAcyG1W1X90P6yCBbkjEBfhU=", + "lastModified": 1788082709, + "narHash": "sha256-NRJUB6pVNqLpX2apWi6fCz5j47ZePRI25f+9H0WYs6Y=", "owner": "4evy", "repo": "nixcord", - "rev": "998b3f6eac9cdbf1a496325af0ed8647d237ecb3", + "rev": "208ae34f932f1ddda36553190169af1ba920481a", "type": "github" }, "original": { @@ -153,16 +149,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1788179007, - "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=", + "lastModified": 1787209939, + "narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9", + "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -198,13 +194,45 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1786711500, + "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1788039129, + "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "base16": "base16", "helium": "helium", "home-manager": "home-manager", "nixcord": "nixcord", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "tt-discord": "tt-discord", "tt-gtk": "tt-gtk", "tt-schemes": "tt-schemes", diff --git a/flake.nix b/flake.nix index 040cb98..e891b79 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; base16.url = "github:SenchoPens/base16.nix"; home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixcord.url = "github:4evy/nixcord"; - nixcord.inputs.nixpkgs.follows = "nixpkgs"; helium = { url = "github:AlvaroParker/helium-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -39,14 +37,14 @@ }@inputs: let boilerplate = [ - ./modules/theming + ./modules/themeing home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.sharedModules = [ - ./modules/theming + ./modules/themeing ./modules/programs ]; home-manager.users.lucy = ./modules/home/default.nix; @@ -56,11 +54,16 @@ { nixosConfigurations.nerv = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; - modules = [ ./modules/hosts/nerv/configuration.nix ] ++ boilerplate; - }; - nixosConfigurations.seele = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ ./modules/hosts/seele/configuration.nix ] ++ boilerplate; + modules = [ + ./modules/hosts/nerv/configuration.nix + ] + ++ boilerplate; }; + nixosConfigurations.seele = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; +modules = [./modules/hosts/seele/configuration.nix] ++ boilerplate; + +}; }; + }