diff --git a/config/users/kat/base/shell.nix b/config/users/kat/base/shell.nix index b382ccee..ed296d9f 100644 --- a/config/users/kat/base/shell.nix +++ b/config/users/kat/base/shell.nix @@ -64,6 +64,7 @@ in '' else '' ''} eval $(dircolors) + PROMPT_EOL_MARK=''' ZSH_TAB_TITLE_ADDITIONAL_TERMS='foot' ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true zmodload -i zsh/complist diff --git a/config/users/kat/dev/default.nix b/config/users/kat/dev/default.nix index 094efdb2..9f7451e7 100644 --- a/config/users/kat/dev/default.nix +++ b/config/users/kat/dev/default.nix @@ -4,7 +4,7 @@ imports = [ ./vim ./rink.nix - ./zsh.nix + ./shell.nix ./rustfmt.nix ./packages.nix ./cookiecutter.nix diff --git a/config/users/kat/dev/zsh.nix b/config/users/kat/dev/shell.nix similarity index 100% rename from config/users/kat/dev/zsh.nix rename to config/users/kat/dev/shell.nix diff --git a/config/users/kat/personal/default.nix b/config/users/kat/personal/default.nix index f7eed602..0a4650ab 100644 --- a/config/users/kat/personal/default.nix +++ b/config/users/kat/personal/default.nix @@ -5,7 +5,7 @@ ./gpg.nix ./weechat.nix ./email.nix - ./zsh.nix + ./shell.nix ./pass.nix ./taskwarrior.nix ./bitw.nix diff --git a/config/users/kat/personal/shell.nix b/config/users/kat/personal/shell.nix new file mode 100644 index 00000000..3d2f9eea --- /dev/null +++ b/config/users/kat/personal/shell.nix @@ -0,0 +1,9 @@ +{ config, lib, ... }: with lib; + +{ + programs.zsh = { + shellAliases = genAttrs ["radio" "tv"] (attr: { + "abby${attr}" = "mpv $(bitw get secrets/abby -f ${attr})"; + }); + }; +} diff --git a/config/users/kat/personal/zsh.nix b/config/users/kat/personal/zsh.nix deleted file mode 100644 index 8bdc956a..00000000 --- a/config/users/kat/personal/zsh.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, ... }: - -{ - programs.zsh = { - shellAliases = { - abbyradio = "mpv $(pass secrets/abbyradio)"; - }; - }; -}