diff --git a/.gitignore b/.gitignore index c94539b..87781f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ result .direnv -# Result of bud commands vm iso doi diff --git a/shell/bud/install-doom.bash b/bin/install-doom.bash similarity index 100% rename from shell/bud/install-doom.bash rename to bin/install-doom.bash diff --git a/flake.nix b/flake.nix index ca8d91e..d233890 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,6 @@ outputs = { self , digga - , bud , nixos , home , agenix @@ -117,7 +116,6 @@ digga.nixosModules.nixConfig home.nixosModules.home-manager agenix.nixosModules.age - bud.nixosModules.bud ./secrets private.nixosModules.networking @@ -178,9 +176,5 @@ homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; } - // - { - budModules = { devos = import ./shell/bud; }; - } ; } diff --git a/modules/devos/options.nix b/modules/devos/options.nix index 8af7b88..d0e5f77 100644 --- a/modules/devos/options.nix +++ b/modules/devos/options.nix @@ -50,8 +50,6 @@ in environment.variables = mkAliasDefinitions options.env; - bud.localFlakeClone = config.dotfiles.dir; - secrets = mapAttrs (n: v: v.path) config.age.secrets; }; } diff --git a/modules/global/general.nix b/modules/global/general.nix index b96bde8..94bcbaa 100644 --- a/modules/global/general.nix +++ b/modules/global/general.nix @@ -1,7 +1,5 @@ { config, lib, ... }: { - bud.enable = true; - programs = { # Enable dconf for programs that need it dconf.enable = true; diff --git a/readme.md b/readme.md index b849665..5487110 100644 --- a/readme.md +++ b/readme.md @@ -146,9 +146,8 @@ Managed using `agenix`. ### `/shell` -Things related to the shell environment for this configuration. Most notably, the `bud` CLI tool, and the devshell. -This section really needs a refactor, considering `bud` is a dead project, and the setup for the devShell is poorly organised. -Dig through at your own peril. +Things related to the shell environment for this configuration. +This is pending a redo, since I recently replaced `bud` with [my own CLI tool, `universe-cli`](https://github.com/Infinidoge/universe-cli). ### `/users` diff --git a/shell/bud/b.bash b/shell/bud/b.bash deleted file mode 100644 index c6c6b28..0000000 --- a/shell/bud/b.bash +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -attr="$FLAKEROOT#$HOST" -if [ -x /run/wrappers/bin/sudo ]; then - export PATH=/run/wrappers/bin:$PATH -fi -nixos-rebuild --flake "$attr" --use-remote-sudo "${@:-switch}" diff --git a/shell/bud/default.nix b/shell/bud/default.nix deleted file mode 100644 index a4f5fa5..0000000 --- a/shell/bud/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, lib, budUtils, ... }: { - bud.cmds = with pkgs; { - up.enable = false; - - b = { - writer = budUtils.writeBashWithPaths [ nixUnstable nixos-rebuild git coreutils mercurial ]; - synopsis = "b (switch|boot|test)"; - help = "Shortcut for nixos-rebuild using the current hostname"; - script = ./b.bash; - }; - - gc = { - writer = budUtils.writeBashWithPaths [ nixUnstable ]; - synopsis = "gc [-d]"; - help = "Shortcut for nix-collect-garbage for both the user and root"; - script = ./gc.bash; - }; - - install-doom = { - writer = budUtils.writeBashWithPaths [ git coreutils emacs ]; - synopsis = "install-doom [ARGS]"; - help = "Installs Doom Emacs from https://github.com/hlissner/doom-emacs"; - script = ./install-doom.bash; - }; - - update.writer = lib.mkForce (budUtils.writeBashWithPaths [ nixUnstable git mercurial openssh ]); - }; -} diff --git a/shell/bud/gc.bash b/shell/bud/gc.bash deleted file mode 100644 index 286fd64..0000000 --- a/shell/bud/gc.bash +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -if [ -x /run/wrappers/bin/sudo ]; then - export PATH=/run/wrappers/bin:$PATH -fi -nix-collect-garbage "${@}" -sudo nix-collect-garbage "${@}" diff --git a/shell/default.nix b/shell/default.nix index 4804604..ad56e33 100644 --- a/shell/default.nix +++ b/shell/default.nix @@ -1,8 +1,5 @@ { self, inputs, ... }: { - modules = with inputs; [ - bud.devshellModules.bud - ]; exportedModules = [ ./devos.nix ];