diff --git a/flake.lock b/flake.lock index 84cd511..4b043fd 100644 --- a/flake.lock +++ b/flake.lock @@ -101,29 +101,6 @@ "type": "github" } }, - "deploy": { - "inputs": { - "fenix": "fenix", - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixos" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1661212356, - "narHash": "sha256-+9P849WIb/zhAMWXrW9g0IRd7vFRj5a5acLTtOFyY48=", - "owner": "input-output-hk", - "repo": "deploy-rs", - "rev": "4da8eb9fc3e611adf4bbe8c8df5b1fc604c4f906", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "deploy-rs", - "type": "github" - } - }, "devshell": { "inputs": { "flake-utils": "flake-utils_2", @@ -152,10 +129,10 @@ "blank" ], "deploy": [ - "deploy" + "blank" ], "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": "flake-utils_3", "flake-utils-plus": "flake-utils-plus", "home-manager": [ @@ -203,33 +180,11 @@ } }, "fenix": { - "inputs": { - "nixpkgs": [ - "deploy", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1645597478, - "narHash": "sha256-axsWwzGMMMcvHKXyrEC99RHkU/8EecIcmrESGzZMD/k=", - "owner": "nix-community", - "repo": "fenix", - "rev": "6c8d60c1d8deba8c360537c47e2b86aefaea0fd5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { "inputs": { "nixpkgs": [ "nixos" ], - "rust-analyzer-src": "rust-analyzer-src_2" + "rust-analyzer-src": "rust-analyzer-src" }, "locked": { "lastModified": 1672899733, @@ -246,22 +201,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1650374568, @@ -277,7 +216,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1668681692, @@ -465,7 +404,7 @@ "nixpkgs": [ "nixos" ], - "utils": "utils_3" + "utils": "utils_2" }, "locked": { "lastModified": 1672980560, @@ -487,7 +426,7 @@ "hlissner-dotfiles", "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1663328500, @@ -604,7 +543,7 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_4" }, @@ -762,9 +701,8 @@ "agenix": "agenix", "blank": "blank", "bud": "bud", - "deploy": "deploy", "digga": "digga", - "fenix": "fenix_2", + "fenix": "fenix", "fork": "fork", "hlissner-dotfiles": "hlissner-dotfiles", "home": "home", @@ -780,23 +718,6 @@ } }, "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1645480664, - "narHash": "sha256-1+6YSK1hn6PX5qC3JwjrYktMwtq5GeFgNbyaGzk8Kuo=", - "owner": "rust-analyzer", - "repo": "rust-analyzer", - "rev": "c0ee2f23ff70349704dfe8448027a41b7788eb37", - "type": "github" - }, - "original": { - "owner": "rust-analyzer", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1672857514, @@ -846,21 +767,6 @@ } }, "utils": { - "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -875,7 +781,7 @@ "type": "github" } }, - "utils_3": { + "utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", diff --git a/flake.nix b/flake.nix index 1f79339..c0d33cf 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixlib.follows = "nixos"; digga.inputs.home-manager.follows = "home"; - digga.inputs.deploy.follows = "deploy"; + digga.inputs.deploy.follows = "blank"; digga.inputs.darwin.follows = "blank"; blank.url = "github:divnix/blank"; @@ -26,8 +26,8 @@ home.url = "github:nix-community/home-manager"; home.inputs.nixpkgs.follows = "nixos"; - deploy.url = "github:input-output-hk/deploy-rs"; - deploy.inputs.nixpkgs.follows = "nixos"; + # deploy.url = "github:input-output-hk/deploy-rs"; + # deploy.inputs.nixpkgs.follows = "nixos"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixos"; @@ -59,7 +59,7 @@ , nixos , home , agenix - , deploy + # , deploy , ... }@inputs: digga.lib.mkFlake @@ -194,7 +194,7 @@ homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; - deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; + # deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; templates.default = self.templates.bud; templates.bud.path = ./.; diff --git a/shell/devos.nix b/shell/devos.nix index 6525011..772107a 100644 --- a/shell/devos.nix +++ b/shell/devos.nix @@ -43,7 +43,7 @@ in (linter editorconfig-checker) # (docs python3Packages.grip) too many deps (docs mdbook) - (devos inputs.deploy.packages.${pkgs.system}.deploy-rs) + # (devos inputs.deploy.packages.${pkgs.system}.deploy-rs) ] ++ lib.optional