diff --git a/flake.lock b/flake.lock index d210ded..ad08770 100644 --- a/flake.lock +++ b/flake.lock @@ -20,29 +20,6 @@ "type": "github" } }, - "beautysh": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "bud", - "nixpkgs" - ], - "poetry2nix": "poetry2nix" - }, - "locked": { - "lastModified": 1627571355, - "narHash": "sha256-iB+s0R/d/bBISo9+JtyytNtS2YMP5oLFqcyfqhXO1qU=", - "owner": "lovesegfault", - "repo": "beautysh", - "rev": "1ad178d756f1f7e77d5215b768bc5c9d4ff8e4fa", - "type": "github" - }, - "original": { - "owner": "lovesegfault", - "repo": "beautysh", - "type": "github" - } - }, "blank": { "locked": { "lastModified": 1625557891, @@ -58,31 +35,6 @@ "type": "github" } }, - "bud": { - "inputs": { - "beautysh": "beautysh", - "devshell": [ - "digga", - "devshell" - ], - "nixpkgs": [ - "nixos" - ] - }, - "locked": { - "lastModified": 1628769755, - "narHash": "sha256-aR/ZsvdZ0tLhytPcdklGuH0wKCH+Qty0TS0PJsJ+Cec=", - "owner": "divnix", - "repo": "bud", - "rev": "b936b3862957b019adce9421f1bad1cfb80661c1", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "bud", - "type": "github" - } - }, "cachix": { "locked": { "lastModified": 1625876282, @@ -124,11 +76,9 @@ "flake-compat": "flake-compat", "naersk": "naersk", "nixpkgs": [ - "digga", "nixpkgs" ], "utils": [ - "digga", "flake-utils" ] }, @@ -181,7 +131,7 @@ "blank": "blank", "deploy": "deploy", "devshell": "devshell", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "flake-utils-plus": "flake-utils-plus", "home-manager": [ "home" @@ -243,7 +193,6 @@ "flake-utils-plus": { "inputs": { "flake-utils": [ - "digga", "flake-utils" ] }, @@ -262,21 +211,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakeCompat": { "flake": false, "locked": { @@ -302,11 +236,11 @@ ] }, "locked": { - "lastModified": 1628785691, - "narHash": "sha256-u12Nu4LOVidV4GlZ+Q5wW2d6UD4IEyOfdRWkAq0OXI8=", + "lastModified": 1628845204, + "narHash": "sha256-rsDulFpBHlMAmNfah5Q2aGnYbt8cw7aTXwoSU28/eFA=", "owner": "helix-editor", "repo": "helix", - "rev": "3de40de0a9b946175de99576a013e1cfcabbc630", + "rev": "416720134424402d02f081e6f0e4e29bbc630e1e", "type": "github" }, "original": { @@ -338,11 +272,11 @@ }, "latest": { "locked": { - "lastModified": 1628693817, - "narHash": "sha256-WtlM8ptjcUUWRvbpkToKJHzLlGCEXZKGh+SfwUYHobA=", + "lastModified": 1628779307, + "narHash": "sha256-ErivbgE5SGvNdFpq+Q50lw1JGGmvxBR/d71aW41S+1A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df2cb074d72ea80ac9fd225b29060c8cf13dd39", + "rev": "4138cbd913fad85073e59007710e3f083d0eb7c6", "type": "github" }, "original": { @@ -355,9 +289,7 @@ "naersk": { "inputs": { "nixpkgs": [ - "digga", - "deploy", - "nixpkgs" + "latest" ] }, "locked": { @@ -399,7 +331,6 @@ "inputs": { "devshell": "devshell_2", "nixpkgs": [ - "helix", "nixpkgs" ], "rustOverlay": "rustOverlay" @@ -420,11 +351,11 @@ }, "nixos": { "locked": { - "lastModified": 1628794200, - "narHash": "sha256-TsvuKMczLaJ1b4IJAtBMOCfJfiONlPav6HhjGuop1Rk=", + "lastModified": 1628865210, + "narHash": "sha256-dB3IA8AYUQDXH+Xy/6nbv4QpIbVl88DphbcxJSUYiX4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a996e2ce3219e121147b08adaa23389e3130dbc7", + "rev": "a445f5829889959d65ad65e5c961d5c67e1cd677", "type": "github" }, "original": { @@ -437,11 +368,9 @@ "nixos-generators": { "inputs": { "nixlib": [ - "digga", "nixlib" ], "nixpkgs": [ - "digga", "blank" ] }, @@ -497,11 +426,11 @@ ] }, "locked": { - "lastModified": 1628757291, - "narHash": "sha256-0u/CAzq77PxlnybncICy0wrdlc1OJDWc8QogZ6CNmU4=", + "lastModified": 1628860536, + "narHash": "sha256-+9LzlCUh4BcQMZ2WQImlq460DPW/HqkJgxt47HwZSXE=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "656a7c9f36ba3cb1d9f36ed8739113a659c56081", + "rev": "39246866a881b8d8e6e44e9176fc9014e6f1cb62", "type": "github" }, "original": { @@ -553,33 +482,6 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "bud", - "beautysh", - "flake-utils" - ], - "nixpkgs": [ - "bud", - "beautysh", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1625240517, - "narHash": "sha256-2E1gaOP+bCplhf3kliVQWK5N1NV2h06mkJk2KTiRTJQ=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "e40e8ed0e8c11e709e4c8c7c20174facd265a021", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "rnixLsp": { "inputs": { "naersk": [ @@ -613,7 +515,6 @@ "digga", "blank" ], - "bud": "bud", "darwin": "darwin", "deploy": [ "digga", diff --git a/flake.nix b/flake.nix index 13571b9..5de52f8 100644 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,9 @@ digga.inputs.nixlib.follows = "nixos"; digga.inputs.home-manager.follows = "home"; - bud.url = "github:divnix/bud"; - bud.inputs.nixpkgs.follows = "nixos"; - bud.inputs.devshell.follows = "digga/devshell"; + /*bud.url = "github:divnix/bud"; + bud.inputs.nixpkgs.follows = "nixos"; + bud.inputs.devshell.follows = "digga/devshell";*/ home.url = "github:nix-community/home-manager/release-21.05"; home.inputs.nixpkgs.follows = "nixos"; @@ -64,7 +64,7 @@ outputs = { self , digga - , bud + #, bud , nixos , home , nixos-hardware @@ -126,7 +126,7 @@ digga.nixosModules.nixConfig home.nixosModules.home-manager #agenix.nixosModules.age - bud.nixosModules.bud + #bud.nixosModules.bud nixosPersistence.nixosModules.impermanence ]; }; @@ -164,13 +164,13 @@ deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; - defaultTemplate = self.templates.bud; - templates.bud.path = ./.; - templates.bud.description = "bud template"; + /*defaultTemplate = self.templates.bud; + templates.bud.path = ./.; + templates.bud.description = "bud template";*/ } // { - budModules = { devos = import ./bud; }; + # budModules = { devos = import ./bud; }; } ; } diff --git a/shell/default.nix b/shell/default.nix index aef90a5..46a2326 100644 --- a/shell/default.nix +++ b/shell/default.nix @@ -1,7 +1,7 @@ { self, inputs, ... }: { externalModules = with inputs; [ - bud.devshellModules.bud + #bud.devshellModules.bud ]; modules = [ ./devos.nix