diff --git a/flake.lock b/flake.lock index 90aa9a3..6290c33 100644 --- a/flake.lock +++ b/flake.lock @@ -218,45 +218,6 @@ "type": "github" } }, - "home-unstable": { - "inputs": { - "nixpkgs": [ - "unstable" - ] - }, - "locked": { - "lastModified": 1729459288, - "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1729177642, - "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "bb69165ff372ddbd3228a03513922acd783040e8", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -288,7 +249,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils" }, @@ -311,7 +272,7 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1727660955, @@ -327,28 +288,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1722221733, @@ -395,22 +334,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -425,7 +348,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1715266358, "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", @@ -441,7 +364,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1728740863, "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", @@ -503,12 +426,10 @@ "blender-bin": "blender-bin", "hardware": "hardware", "home-manager": "home-manager", - "home-unstable": "home-unstable", - "jovian": "jovian", "lanzaboote": "lanzaboote", "mailserver": "mailserver", "minecraft": "minecraft", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nur": "nur", "unstable": "unstable" } diff --git a/flake.nix b/flake.nix index 4955cd0..de2594b 100644 --- a/flake.nix +++ b/flake.nix @@ -8,11 +8,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - home-unstable = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "unstable"; - }; - nur.url = "github:nix-community/NUR"; blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz"; hardware.url = "github:nixos/nixos-hardware/master"; @@ -26,15 +21,40 @@ minecraft.url = "github:Infinidoge/nix-minecraft"; }; - outputs = { self, nixpkgs, unstable, home-manager, home-unstable, nur, blender-bin, jovian, hardware, lanzaboote, mailserver, minecraft, ... }: + outputs = { + nixpkgs, + unstable, + home-manager, + nur, + blender-bin, + hardware, + lanzaboote, + mailserver, + minecraft, + ... + }: let mkNix = modules: nixpkgs.lib.nixosSystem { inherit modules; - specialArgs = { inherit unstable hardware lanzaboote mailserver minecraft; }; + specialArgs = { + inherit + unstable + hardware + lanzaboote + mailserver + minecraft + ; + }; }; mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration { inherit modules pkgs; - extraSpecialArgs = { inherit unstable nur blender-bin; }; + extraSpecialArgs = { + inherit + unstable + nur + blender-bin + ; + }; }; in { # nixos-rebuild switch --flake .#hostname