From 01aaa7ad39c1fe8af6ffbca31abbab27dbfefc95 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Wed, 15 Jul 2026 20:02:29 +0530 Subject: refactor: organized the modules into better categories Instead of lumping everything in modules/programs we are separating them into separate directories in modules/ --- modules/programs/zsh/default.nix | 38 ------------------------------------- modules/programs/zsh/nix-aliases.sh | 27 -------------------------- 2 files changed, 65 deletions(-) delete mode 100644 modules/programs/zsh/default.nix delete mode 100644 modules/programs/zsh/nix-aliases.sh (limited to 'modules/programs/zsh') diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix deleted file mode 100644 index f3bdbb1..0000000 --- a/modules/programs/zsh/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -# Zsh - Z shell, extended bash with additional features and plugins -{ - config = - let - nixCommandWrappers = builtins.readFile ./nix-aliases.sh; - in - lib.mkIf config.programs.zsh.enable { - programs.zsh = { - package = pkgs.zsh; - dotDir = "${config.xdg.configHome}/zsh"; - history.path = "${config.xdg.cacheHome}/zsh/history"; - enableCompletion = true; - initContent = '' - setopt PROMPT_SUBST - - autoload -U colors && colors - - export GPG_TTY="$(tty)" - gpg-connect-agent updatestartuptty /bye >/dev/null 2>&1 - - bindkey "^[[3~" delete-char - bindkey "^?" backward-delete-char - ${nixCommandWrappers} - ''; - }; - - programs.bash.initExtra = lib.mkIf config.programs.bash.enable (lib.mkAfter nixCommandWrappers); - - home.sessionVariables.SHELL = "${lib.getExe config.programs.zsh.package}"; - }; -} diff --git a/modules/programs/zsh/nix-aliases.sh b/modules/programs/zsh/nix-aliases.sh deleted file mode 100644 index 0a2f453..0000000 --- a/modules/programs/zsh/nix-aliases.sh +++ /dev/null @@ -1,27 +0,0 @@ -nix-shell() { - for arg in "$@"; do - if [[ "$arg" == "--run" || "$arg" == "--command" ]]; then - command nix-shell "$@" - return - fi - done - - command nix-shell "$@" --run "$SHELL" -} - -nix() { - if [[ "$1" == "develop" ]]; then - local args=("${@:2}") - - for arg in "${args[@]}"; do - if [[ "$arg" == "-c" || "$arg" == "--command" ]]; then - command nix "$@" - return - fi - done - - command nix develop "${args[@]}" -c "$SHELL" - else - command nix "$@" - fi -} -- cgit v1.2.3