feat: add atuin and nom, adjust configs

home/apps/vscode.nix

@@ -89,9 +89,9 @@ in {
 
       "git.autofetch" = true;
       "git.confirmSync" = false;
-      "diffEditor.renderSideBySide" = false;
-      "git.inputValidation" = "off";
+      "git.inputValidation" = false;
       "git.suggestSmartCommit" = false;
+      "diffEditor.renderSideBySide" = false;
       "diffEditor.ignoreTrimWhitespace" = false;
       "gitlens.showWelcomeOnInstall" = false;
 
@@ -111,7 +111,7 @@ in {
       "editor.insertSpaces" = true;
       "editor.formatOnSave" = true;
 
-      "terminal.integrated.fontFamily" = "\"Ryan Term\", \"Symbols Nerd Font\", \"Apple Color Emoji\", monospace";
+      "terminal.integrated.fontFamily" = "\"Ryan Term\", \"Symbols Nerd Font Mono\", \"Apple Color Emoji\", monospace";
       "terminal.integrated.fontSize" = 14;
       "terminal.integrated.lineHeight" = 1.5;
       "terminal.integrated.cursorBlinking" = true;

home/default.nix

@@ -15,12 +15,12 @@
     ./apps/vscode.nix
     ./apps/ghostty.nix
 
-    ./programs/zsh.nix
     ./programs/fish.nix
+    ./programs/zsh.nix
     ./programs/starship.nix
-    ./programs/fzf.nix
     ./programs/zoxide.nix
     ./programs/direnv.nix
+    ./programs/atuin.nix
 
     ./programs/git.nix
     ./programs/bat.nix
@@ -32,6 +32,7 @@
     ./programs/tealdeer.nix
   ];
 
+  programs.bash.enable = true;
   xdg.enable = true;
 
   services.am-discord-rich-presence = {

home/programs/atuin.nix

@@ -0,0 +1,18 @@
+_: {
+  programs.atuin = {
+    enable = true;
+
+    enableBashIntegration = false;
+    enableFishIntegration = true;
+    enableZshIntegration = true;
+    flags = ["--disable-up-arrow"];
+
+    settings = {
+      update_check = false;
+      history_filter = [
+        "^clear"
+        "^exit"
+      ];
+    };
+  };
+}

home/programs/fish.nix

@@ -7,6 +7,12 @@ in {
     enable = true;
     inherit shellAbbrs shellAliases;
 
+    shellInit = ''
+      for config in ${./fish/configs}/*.fish
+        source "$config"
+      end
+    '';
+
     functions = {
       take = ''
         set dir $argv[1]
@@ -28,8 +34,8 @@ in {
     };
   };
 
-  home.file.".config/fish/conf.d" = {
-    source = ./fish/conf.d;
-    recursive = true;
-  };
+  # home.file.".config/fish/conf.d" = {
+  #   source = ./fish/conf.d;
+  #   recursive = true;
+  # };
 }

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

@@ -1,10 +0,0 @@
-if status is-interactive
-    # nix-your-shell
-    nix-your-shell fish | source
-
-    string match -q "$TERM_PROGRAM" "iTerm.app"
-    and source "$HOME/.iterm2_shell_integration.fish"
-
-    string match -q "$TERM_PROGRAM" ghostty
-    and source "/Applications/Ghostty.app/Contents/Resources/ghostty/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish"
-end

home/programs/fish/configs/99_interactive.fish

@@ -0,0 +1,15 @@
+if status is-interactive
+    nix-your-shell fish | source
+
+    set -l iterm2_shell_integration "$HOME/.iterm2_shell_integration.fish"
+
+    string match -q "$TERM_PROGRAM" "iTerm.app"
+    and test -f "$iterm2_shell_integration"
+    and source "$iterm2_shell_integration"
+
+    set -l ghostty_shell_integration "/Applications/Ghostty.app/Contents/Resources/ghostty/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish"
+
+    string match -q "$TERM_PROGRAM" ghostty
+    and test -f "$ghostty_shell_integration"
+    and source "$ghostty_shell_integration"
+end

home/programs/fzf.nix

@@ -1,24 +0,0 @@
-_: {
-  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

@@ -28,40 +28,25 @@ _: {
       python.format = "[\${symbol}\${pyenv_prefix}(\${version} )(\($virtualenv\) )]($style)";
       rust.format = "[$symbol($version )]($style)";
 
-      aws.symbol = "  ";
+      aws.symbol = " ";
       bun.symbol = "󰳮 ";
-      buf.symbol = " ";
       c.symbol = " ";
       conda.symbol = " ";
-      dart.symbol = " ";
       directory.read_only = " 󰌾";
       docker_context.symbol = " ";
-      elixir.symbol = " ";
-      elm.symbol = " ";
-      fossil_branch.symbol = " ";
       git_branch.symbol = " ";
       golang.symbol = " ";
-      guix_shell.symbol = " ";
       haskell.symbol = " ";
-      haxe.symbol = "⌘ ";
       hg_branch.symbol = " ";
       hostname.ssh_symbol = " ";
       java.symbol = " ";
-      julia.symbol = " ";
-      lua.symbol = " ";
       memory_usage.symbol = "󰍛 ";
-      meson.symbol = "󰔷 ";
       nim.symbol = "󰆥 ";
       nix_shell.symbol = " ";
       nodejs.symbol = " ";
       package.symbol = "󰏗 ";
-      pijul_channel.symbol = "🪺 ";
       python.symbol = " ";
-      rlang.symbol = "󰟔 ";
-      ruby.symbol = " ";
       rust.symbol = " ";
-      scala.symbol = " ";
-      spack.symbol = "🅢 ";
 
       os.symbols = {
         Alpaquita = " ";