refactor: add lots of programs

home/programs/direnv.nix

@@ -0,0 +1,11 @@
+_: {
+  programs.direnv = {
+    enable = true;
+
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    # enableFishIntegration = true;
+
+    nix-direnv.enable = true;
+  };
+}

home/programs/fish/conf.d/01_tooling.fish

@@ -4,9 +4,6 @@ set -x LS_COLORS (vivid generate catppuccin-frappe)
 # 1Password SSH
 set -x SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
 
-# Homebrew
-/opt/homebrew/bin/brew shellenv | source
-
 # Nix
 fish_add_path -Pm /etc/profiles/per-user/$USER/bin /run/current-system/sw/bin
 

home/programs/fish/conf.d/99_interactive.fish

@@ -1,18 +1,7 @@
 if status is-interactive
-    # starship
-    starship init fish | source
-    # zoxide
-    zoxide init fish | source
-    # direnv
-    direnv hook fish | source
     # nix-your-shell
     nix-your-shell fish | source
 
-    set -x FZF_DEFAULT_OPTS " \
---color=bg+:#414559,bg:#303446,spinner:#f2d5cf,hl:#e78284 \
---color=fg:#c6d0f5,header:#e78284,info:#ca9ee6,pointer:#f2d5cf \
---color=marker:#f2d5cf,fg+:#c6d0f5,prompt:#ca9ee6,hl+:#e78284"
-
     if test -e "$HOME/.iterm2_shell_integration.fish"
         source "$HOME/.iterm2_shell_integration.fish"
     end

home/programs/fzf.nix

@@ -0,0 +1,24 @@
+_: {
+  programs.fzf = {
+    enable = true;
+
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+
+    colors = {
+      "bg+" = "#414559";
+      bg = "#303446";
+      "fg+" = "#c6d0f5";
+      fg = "#c6d0f5";
+      "hl+" = "#e78284";
+      hl = "#e78284";
+      spinner = "#f2d5cf";
+      header = "#e78284";
+      info = "#ca9ee6";
+      pointer = "#f2d5cf";
+      marker = "#f2d5cf";
+      prompt = "#ca9ee6";
+    };
+  };
+}

home/programs/starship.nix

@@ -1,6 +1,11 @@
 _: {
   programs.starship = {
     enable = true;
+
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+
     settings = {
       command_timeout = 1000;
 

home/programs/tealdeer.nix

@@ -0,0 +1,9 @@
+_: {
+  programs.tealdeer = {
+    enable = true;
+    settings = {
+      display.compact = true;
+      updates.auto_update = true;
+    };
+  };
+}

home/programs/zoxide.nix

@@ -0,0 +1,9 @@
+_: {
+  programs.zoxide = {
+    enable = true;
+
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+  };
+}

home/programs/zsh.nix

@@ -14,7 +14,7 @@ in {
     syntaxHighlighting.enable = true;
 
     envExtra = builtins.readFile ./zsh/envExtra.zsh;
-    initExtraBeforeCompInit = builtins.readFile ./zsh/initExtraBeforeCompInit.zsh;
+    # initExtraBeforeCompInit = builtins.readFile ./zsh/initExtraBeforeCompInit.zsh;
     initExtra = builtins.readFile ./zsh/initExtra.zsh;
 
     inherit shellAliases;

home/programs/zsh/envExtra.zsh

@@ -1,9 +1,6 @@
 # 1Password SSH
 export SSH_AUTH_SOCK="$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
 
-# Homebrew shell
-eval "$(/opt/homebrew/bin/brew shellenv)"
-
 # fnm shell env
 eval "$(fnm env --use-on-cd)"
 

home/programs/zsh/initExtra.zsh

@@ -1,9 +1,3 @@
-# environment variables
-export FZF_DEFAULT_OPTS=" \
---color=bg+:#414559,bg:#303446,spinner:#f2d5cf,hl:#e78284 \
---color=fg:#c6d0f5,header:#e78284,info:#ca9ee6,pointer:#f2d5cf \
---color=marker:#f2d5cf,fg+:#c6d0f5,prompt:#ca9ee6,hl+:#e78284"
-
 # zsh options
 setopt interactivecomments
 unsetopt menu_complete
@@ -34,18 +28,6 @@ function clean_vscode_workspace_storage() {
   done
 }
 
-# starship
-eval "$(starship init zsh)"
-
-# fzf
-# [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-
-# zoxide
-eval "$(zoxide init zsh)"
-
-# direnv
-command -v direnv &> /dev/null && eval "$(direnv hook zsh)"
-
 # nix-your-shell
 eval "$(nix-your-shell zsh)"
 

home/programs/zsh/initExtraBeforeCompInit.zsh

@@ -1,5 +0,0 @@
-if command -v brew &>/dev/null
-then
-  FPATH="$(brew --prefix)/share/zsh/site-functions:$FPATH"
-fi
-FPATH="$HOME/.zfunc:$FPATH"