update/rearrange shell-related configurations

home/modules/tui/default.nix

@@ -2,9 +2,8 @@
   # Core CLI apps
 
   imports = [
-    ./eza.nix
     ./git.nix
-    ./fish
+    ./shell
     ./nix-index.nix
     ./neovim
     ./tmux.nix

home/modules/tui/extras/default.nix

@@ -3,7 +3,6 @@
 
   imports = [
     ../default.nix
-    ./direnv.nix
     ./go.nix
   ];
 

home/modules/tui/extras/direnv.nix

@@ -1,6 +0,0 @@
-{
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-  };
-}

home/modules/tui/eza.nix

@@ -1,9 +0,0 @@
-{ lib, ... }: {
-  programs.eza = {
-    enable = true;
-    extraOptions = [
-      "--group-directories-first"
-    ];
-    git = true;
-  };
-}

home/modules/tui/fish/abbrs.nix

@@ -1,20 +0,0 @@
-{
-  programs.fish.shellAbbrs = rec {
-    ccat = "egrep -v '^\s*(#|\\$)'";
-    dnsplan = "dnscontrol preview";
-    dnspush = "dnscontrol push";
-    g = "git";
-    ga = "git add";
-    gc = "git commit -S";      # interactive commit
-    gcm = "git commit -S -m";  # quick commit
-    gg = "git graph";
-    gs = "git status";
-    jqless = "jq -C | less -r";
-    n = "nix";
-    sshpass = "ssh -o PubkeyAuthentication=no";
-    tf = "terraform";
-    tfyolo = "terraform apply -auto-approve";
-    v = "vim";
-    vi = "vim";
-  };
-}

home/modules/tui/fish/aliases.nix

@@ -1,6 +0,0 @@
-{
-  programs.fish.shellAliases = {
-    cat = "bat";
-    top = "btop";
-  };
-}

home/modules/tui/fish/default.nix

@@ -1,12 +0,0 @@
-{
-  imports = [
-    ./abbrs.nix
-    ./aliases.nix
-    ./functions.nix
-    ./shell-init.nix
-  ];
-
-  programs.fish = {
-    enable = true;
-  };
-}

home/modules/tui/shell/aliases.nix

@@ -0,0 +1,15 @@
+{
+  cat = "bat";
+  ccat = "egrep -v '^\s*(#|\\$)'";
+  g = "git";
+  gg = "git graph";
+  gs = "git status";
+  jqless = "jq -C | less -r";
+  n = "nix";
+  sshpass = "ssh -o PubkeyAuthentication=no";
+  tf = "terraform";
+  tfyolo = "terraform apply -auto-approve";
+  top = "btop";
+  v = "vim";
+  vi = "vim";
+}

home/modules/tui/shell/default.nix

@@ -0,0 +1,24 @@
+{
+  imports = [
+    ./eza.nix
+    ./fish
+  ];
+
+  home = {
+    shellAliases = import ./aliases.nix;
+  };
+
+  programs = {
+    zoxide = {
+      enable = true;
+      options = ["--cmd" "j"];
+    };
+
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+
+    fzf.enable = true;
+  };
+}

home/modules/tui/shell/eza.nix

@@ -0,0 +1,17 @@
+{
+  programs.eza = {
+    enable = true;
+    enableFishIntegration = false;
+    extraOptions = [
+      "--group-directories-first"
+    ];
+    git = true;
+  };
+
+  home.shellAliases = {
+    ls = "eza";
+    l = "eza -lhg";
+    ll = "eza -alhg";
+    lt = "eza --tree";
+  };
+}

home/modules/tui/shell/fish/abbrs.nix

@@ -0,0 +1,10 @@
+{
+  programs.fish.shellAbbrs = rec {
+    "-" = "prevd";
+    dnsplan = "dnscontrol preview";
+    dnspush = "dnscontrol push";
+    ga = "git add";
+    gc = "git commit -S";
+    gcm = "git commit -S -m";
+  };
+}

home/modules/tui/shell/fish/default.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }: {
+  imports = [
+    ./abbrs.nix
+    ./functions.nix
+    ./shell-init.nix
+  ];
+
+  programs = {
+    fish = {
+      enable = true;
+
+      plugins = [
+        {
+          name = "plugin-git";
+          src = pkgs.fishPlugins.plugin-git.src;
+        }
+        {
+          name = "bass";
+          src = pkgs.fishPlugins.bass.src;
+        }
+      ];
+    };
+
+  };
+}

home/modules/tui/shell/fish/functions.nix

@@ -69,7 +69,7 @@
       # nix-shell
       set -l nix (
         if test -n "$IN_NIX_SHELL"
-          echo -n "[nix]"
+          echo -n "❄"
         end
       )
 

home/modules/tui/shell/fish/shell-init.nix

@@ -14,8 +14,9 @@
     ''
       fish_vi_key_bindings
       set fish_cursor_default       block
-      set fish_cursor_insert        block       blink
+      set fish_cursor_insert        line        blink
       set fish_cursor_replace_one   underscore  blink
+      set fish_cursor_replace       underscore  blink
       set fish_cursor_visual        block
     '' +
     # Restore ctrl+f to accept suggestions