diff --git a/hosts/common/configs/user/console/nix-cleanup/default.nix b/hosts/common/configs/user/console/nix-cleanup/default.nix new file mode 100644 index 0000000..67a0a29 --- /dev/null +++ b/hosts/common/configs/user/console/nix-cleanup/default.nix @@ -0,0 +1,8 @@ +{ + user ? throw "user argument is required", + home ? throw "home argument is required", +}: +{ ... }: +{ + home-manager.users.${user}.programs.zsh.shellAliases.nc = "sudo nix-cleanup"; +} diff --git a/hosts/common/configs/user/console/nix-develop/default.nix b/hosts/common/configs/user/console/nix-develop/default.nix index 7d5e009..d790ec8 100644 --- a/hosts/common/configs/user/console/nix-develop/default.nix +++ b/hosts/common/configs/user/console/nix-develop/default.nix @@ -4,13 +4,17 @@ }: { ... }: { - home-manager.users.${user}.programs.zsh.initExtra = '' - nix-develop() { - if [ -z "$1" ]; then - echo "Usage: nix-develop " - return 1 - fi - nix develop self#"$1" -c "$SHELL" - } - ''; + home-manager.users.${user}.programs.zsh = { + shellAliases.nd = "nix-develop"; + + initExtra = '' + nix-develop() { + if [ -z "$1" ]; then + echo "Usage: nix-develop " + return 1 + fi + nix develop self#"$1" -c "$SHELL" + } + ''; + }; } diff --git a/hosts/common/configs/user/console/nix-direnv/default.nix b/hosts/common/configs/user/console/nix-direnv/default.nix index 164cd10..d6b7bb8 100644 --- a/hosts/common/configs/user/console/nix-direnv/default.nix +++ b/hosts/common/configs/user/console/nix-direnv/default.nix @@ -5,11 +5,29 @@ { inputs, ... }: { home-manager.users.${user} = { - programs.direnv = { - enable = true; - silent = true; - nix-direnv.enable = true; - enableZshIntegration = true; + programs = { + direnv = { + enable = true; + silent = true; + nix-direnv.enable = true; + enableZshIntegration = true; + }; + + zsh = { + shellAliases.nde = "nix-direnv"; + + initExtra = '' + nix-direnv() { + if [ -z "$1" ]; then + echo "Usage: nix-direnv " + return 1 + fi + + echo "use $1" > .envrc + direnv allow + } + ''; + }; }; # https://github.com/direnv/direnv/wiki/Customizing-cache-location diff --git a/hosts/common/configs/user/console/nix/default.nix b/hosts/common/configs/user/console/nix/default.nix new file mode 100644 index 0000000..2bb7f93 --- /dev/null +++ b/hosts/common/configs/user/console/nix/default.nix @@ -0,0 +1,11 @@ +{ + user ? throw "user argument is required", + home ? throw "home argument is required", +}: +{ ... }: +{ + home-manager.users.${user}.programs.zsh.shellAliases = { + nrs = "sudo nixos-rebuild switch --flake .#$(hostname) --show-trace"; + nrb = "sudo nixos-rebuild boot --flake .#$(hostname) --show-trace"; + }; +} diff --git a/hosts/eirene/users/nick/default.nix b/hosts/eirene/users/nick/default.nix index fc21e9f..4af78da 100644 --- a/hosts/eirene/users/nick/default.nix +++ b/hosts/eirene/users/nick/default.nix @@ -23,6 +23,8 @@ in (import ../../../common/configs/user/console/libvirt { inherit user home; }) (import ../../../common/configs/user/console/ncdu { inherit user home; }) (import ../../../common/configs/user/console/neovim { inherit user home; }) + (import ../../../common/configs/user/console/nix { inherit user home; }) + (import ../../../common/configs/user/console/nix-cleanup { inherit user home; }) (import ../../../common/configs/user/console/nix-develop { inherit user home; }) (import ../../../common/configs/user/console/nix-direnv { inherit user home; }) (import ../../../common/configs/user/console/nixpkgs { inherit user home; }) diff --git a/hosts/elara/users/nikara/default.nix b/hosts/elara/users/nikara/default.nix index 5e09a61..e9d003e 100644 --- a/hosts/elara/users/nikara/default.nix +++ b/hosts/elara/users/nikara/default.nix @@ -21,6 +21,8 @@ in (import ../../../common/configs/user/console/libvirt { inherit user home; }) (import ../../../common/configs/user/console/ncdu { inherit user home; }) (import ../../../common/configs/user/console/neovim { inherit user home; }) + (import ../../../common/configs/user/console/nix { inherit user home; }) + (import ../../../common/configs/user/console/nix-cleanup { inherit user home; }) (import ../../../common/configs/user/console/nix-develop { inherit user home; }) (import ../../../common/configs/user/console/nix-direnv { inherit user home; }) (import ../../../common/configs/user/console/nixpkgs { inherit user home; })