From 903cbdc9daa58d8ca9aba6567757a1b39a206ec2 Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Mon, 2 Jan 2023 23:45:01 +0000
Subject: [PATCH] Migrate zsh config

---
 modules/default.nix                           |  2 +-
 {.config => modules/shell}/zsh/.zshrc         | 34 +++++++++----------
 .../.aliasrc => modules/shell/zsh/aliases.zsh |  0
 modules/shell/{zsh.nix => zsh/default.nix}    |  3 +-
 4 files changed, 20 insertions(+), 19 deletions(-)
 rename {.config => modules/shell}/zsh/.zshrc (60%)
 rename .config/.aliasrc => modules/shell/zsh/aliases.zsh (100%)
 rename modules/shell/{zsh.nix => zsh/default.nix} (87%)

diff --git a/modules/default.nix b/modules/default.nix
index 206bb6c..416006e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -8,6 +8,6 @@
     ./security/gpg.nix
     ./security/pass.nix
     ./shell/git.nix
-    ./shell/zsh.nix
+    ./shell/zsh
   ];
 }
\ No newline at end of file
diff --git a/.config/zsh/.zshrc b/modules/shell/zsh/.zshrc
similarity index 60%
rename from .config/zsh/.zshrc
rename to modules/shell/zsh/.zshrc
index c219ba8..55bc3b5 100644
--- a/.config/zsh/.zshrc
+++ b/modules/shell/zsh/.zshrc
@@ -6,7 +6,7 @@
 export GPG_TTY=$TTY
 
 ## Aliases
-source "${XDG_CONFIG_HOME:-${HOME}/.config}/.aliasrc"
+source "$ZDOTDIR/aliases.zsh"
 
 ## Colors
 autoload -U colors && colors
@@ -78,25 +78,25 @@ unsetopt BEEP
 ####
 
 ## Autosuggest
-source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null
+# source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null
 
-## History substring search
-source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh 2>/dev/null
-bindkey -M vicmd 'k' history-substring-search-up
-bindkey -M vicmd 'j' history-substring-search-down
+# ## History substring search
+# source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh 2>/dev/null
+# bindkey -M vicmd 'k' history-substring-search-up
+# bindkey -M vicmd 'j' history-substring-search-down
 
-## Highlighting
-source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null
+# ## Highlighting
+# source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null
 
-## Enhanced vim mode
-MODE_INDICATOR=""
-MODE_CURSOR_VIINS="#b77ee0 blinking bar"
-MODE_CURSOR_REPLACE="$MODE_CURSOR_VIINS #ff3334"
-MODE_CURSOR_VICMD="#b77ee0 block"
-MODE_CURSOR_SEARCH="#e7c547 steady underline"
-MODE_CURSOR_VISUAL="$MODE_CURSOR_VICMD steady bar"
-MODE_CURSOR_VLINE="$MODE_CURSOR_VISUAL #54ced6"
-source /usr/share/zsh/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh 2>/dev/null
+# ## Enhanced vim mode
+# MODE_INDICATOR=""
+# MODE_CURSOR_VIINS="#b77ee0 blinking bar"
+# MODE_CURSOR_REPLACE="$MODE_CURSOR_VIINS #ff3334"
+# MODE_CURSOR_VICMD="#b77ee0 block"
+# MODE_CURSOR_SEARCH="#e7c547 steady underline"
+# MODE_CURSOR_VISUAL="$MODE_CURSOR_VICMD steady bar"
+# MODE_CURSOR_VLINE="$MODE_CURSOR_VISUAL #54ced6"
+# source /usr/share/zsh/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh 2>/dev/null
 
 
 ####
diff --git a/.config/.aliasrc b/modules/shell/zsh/aliases.zsh
similarity index 100%
rename from .config/.aliasrc
rename to modules/shell/zsh/aliases.zsh
diff --git a/modules/shell/zsh.nix b/modules/shell/zsh/default.nix
similarity index 87%
rename from modules/shell/zsh.nix
rename to modules/shell/zsh/default.nix
index 6231ba7..f18c558 100644
--- a/modules/shell/zsh.nix
+++ b/modules/shell/zsh/default.nix
@@ -35,7 +35,8 @@ in {
     };
 
     home.configFile = {
-      "zsh" = {};
+      "zsh/.zshrc" = { source = ./.zshrc; };
+      "zsh/aliases.zsh" = { source = ./aliases.zsh };
     };
   };
 }
\ No newline at end of file