From c79455e1770e507ea611c31264d9418baaecdcde Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Wed, 19 Feb 2025 21:06:22 -0600
Subject: [PATCH] improved fastfetch theme, added ctrl+hjkl keybinds for moving
 in insert mode in neovim, and vim movement in zsh

---
 modules/home/fastfetch/default.nix | 153 ++++++++++++-----------------
 modules/home/nvf.nix               |  24 +++++
 modules/home/rofi/rofi.nix         |   4 +
 modules/home/zsh.nix               |  11 ++-
 4 files changed, 99 insertions(+), 93 deletions(-)

diff --git a/modules/home/fastfetch/default.nix b/modules/home/fastfetch/default.nix
index 216c9a4..efe3678 100644
--- a/modules/home/fastfetch/default.nix
+++ b/modules/home/fastfetch/default.nix
@@ -8,105 +8,80 @@
           keys = "35";
           output = "90";
         };
+        separator = " ➜  ";
       };
 
       logo = {
         source = ./nixos.png;
         type = "kitty-direct";
-        height = 15;
-        width = 30;
+        height = 10;
+        width = 20;
         padding = {
-          top = 3;
-          left = 3;
+          top = 2;
+          left = 2;
         };
       };
 
       modules = [
-          "break"
-          {
-              type = "custom";
-              format = "┌──────────────────────Hardware──────────────────────┐";
-          }
-          {
-              type = "cpu";
-              key = "│  ";
-          }
-          {
-              type = "gpu";
-              key = "│ 󰍛 ";
-          }
-          {
-              type = "memory";
-              key = "│ 󰑭 ";
-          }
-          {
-              type = "custom";
-              format = "└────────────────────────────────────────────────────┘";
-          }
-          "break"
-          {
-              type = "custom";
-              format = "┌──────────────────────Software──────────────────────┐";
-          }
-          {
-              type = "custom";
-              format = " OS -> ZaneyOS 2.3";
-          }
-          {
-              type = "kernel";
-              key = "│ ├ ";
-          }
-          {
-              type = "packages";
-              key = "│ ├󰏖 ";
-          }
-          {
-              type = "shell";
-              key = "└ └ ";
-          }
-          "break"
-          {
-              type = "wm";
-              key = " WM";
-          }
-          {
-              type = "wmtheme";
-              key = "│ ├󰉼 ";
-          }
-          {
-              type = "terminal";
-              key = "└ └ ";
-          }
-          {
-              type = "custom";
-              format = "└────────────────────────────────────────────────────┘";
-          }
-          "break"
-          {
-              type = "custom";
-              format = "┌────────────────────Uptime / Age────────────────────┐";
-          }
-          {
-              type = "command";
-              key = "│  ";
-              text = #bash
-              ''
-                birth_install=$(stat -c %W /)
-                current=$(date +%s)
-                delta=$((current - birth_install))
-                delta_days=$((delta / 86400))
-                echo $delta_days days
-              '';
-          }
-          {
-              type = "uptime";
-              key = "│  ";
-          }
-          {
-              type = "custom";
-              format = "└────────────────────────────────────────────────────┘";
-          }
-          "break"
+        "break"
+        {
+          type = "cpu";
+          format = "{1} ({3}) @ {7}";
+          key = "HW   ";
+        }
+        {
+          type = "gpu";
+          key = " ├ 󰍛 ";
+        }
+        {
+          type = "memory";
+          key = " └  ";
+        }
+        "break"
+        {
+          type = "kernel";
+          key = "SW   ";
+        }
+        {
+          type = "packages";
+          key = " ├ 󰏖 ";
+        }
+        {
+          type = "shell";
+          key = " └  ";
+        }
+        "break"
+        {
+          type = "wm";
+          key = "WM   ";
+        }
+        {
+          type = "wmtheme";
+          key = " ├ 󰉼 ";
+        }
+        {
+          type = "terminal";
+          key = " └  ";
+        }
+        "break"
+        {
+          type = "uptime";
+          key = "UP   ";
+        }
+        {
+          type = "command";
+          key = " └  ";
+          text =
+            #bash
+            ''
+              birth_install=$(stat -c %W /)
+              current=$(date +%s)
+              delta=$((current - birth_install))
+              delta_days=$((delta / 86400))
+              echo $delta_days days
+            '';
+        }
+        "break"
       ];
     };
   };
diff --git a/modules/home/nvf.nix b/modules/home/nvf.nix
index 170bac3..978a192 100644
--- a/modules/home/nvf.nix
+++ b/modules/home/nvf.nix
@@ -50,6 +50,30 @@
           action = "<cmd>Neotree toggle<cr>";
           desc = "File browser toggle";
         }
+        {
+          key = "<C-h>";
+          mode = ["i"];
+          action = "<Left>";
+          desc = "Move left in insert mode";
+        }
+        {
+          key = "<C-j>";
+          mode = ["i"];
+          action = "<Down>";
+          desc = "Move down in insert mode";
+        }
+        {
+          key = "<C-k>";
+          mode = ["i"];
+          action = "<Up>";
+          desc = "Move up in insert mode";
+        }
+        {
+          key = "<C-l>";
+          mode = ["i"];
+          action = "<Right>";
+          desc = "Move right in insert mode";
+        }
       ];
 
       theme = {
diff --git a/modules/home/rofi/rofi.nix b/modules/home/rofi/rofi.nix
index 3b785db..3c73c72 100644
--- a/modules/home/rofi/rofi.nix
+++ b/modules/home/rofi/rofi.nix
@@ -16,6 +16,10 @@
         display-drun = " Apps";
         display-run = " Run";
         display-filebrowser = " File";
+        kb-row-up = "k";
+        kb-row-down = "j";
+        kb-mode-next = "l";
+        kb-mode-previous = "h";
       };
       theme = let
         inherit (config.lib.formats.rasi) mkLiteral;
diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix
index 81997a0..a0219dd 100644
--- a/modules/home/zsh.nix
+++ b/modules/home/zsh.nix
@@ -5,21 +5,24 @@
     syntaxHighlighting.enable = true;
 
     initExtra = ''
-      bindkey "^J" up-line-or-history
-      bindkey "^K" down-line-or-history
+      bindkey "^H" backward-word
+      bindkey "^J" down-line-or-history
+      bindkey "^K" up-line-or-history
+      bindkey "^L" forward-word
     '';
 
     shellAliases = {
       sv = "sudo nvim";
       v = "nvim";
+      c = "clear";
       fr = "nh os switch --hostname ${profile}";
       fu = "nh os switch --hostname ${profile} --update";
       zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)";
       ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
       cat = "bat";
       man = "batman";
-      ls = "eza --icons  -a --group-directories-first -1";
-      ll = "eza --icons  -a --group-directories-first -1 --no-user --long";
+      ls = "eza --icons --group-directories-first -1";
+      ll = "eza --icons -a --group-directories-first -1 --no-user --long";
       tree = "eza --icons --tree --group-directories-first";
     };
   };