stuff for colemak

3 files changed, 41 insertions, 38 deletions

diff --git a/programs/bash.nix b/programs/bash.nix
index 66546c2..9ad3217 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -25,6 +25,7 @@
       tree = "tree -C";
       vim = "nvim";
       tb = "nc termbin.com 9999";
+      n = "j";
 
       # git aliases
       gb = "git branch -v";
diff --git a/programs/git.nix b/programs/git.nix
index 1a2bc72..dc842ce 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -9,35 +9,9 @@ with theme;
   programs.git = {
     enable = true;
     ignores = [ ".envrc" ];
+    delta.enable = true;
     userEmail = "[email protected]";
     userName = "Akshay";
-    delta = {
-      enable = true;
-      options = {
-        features = "decorations labels";
-        syntax-theme = "none";
-        zero-style = "8";
-        navigate = "true";
-        keep-plus-minus-markers = "true";
-        decorations = {
-          file-decoration-style = "none";
-          whitespace-error-style = "22 reverse";
-          minus-style = "${base08}";
-          minus-emph-style = "${base08} bold";
-          plus-style = "${base0B}";
-          plus-emph-style = "${base0B} bold";
-          file-style = "7 italic";
-          hunk-header-style = "7";
-          hunk-header-decoration-style = "8 ul";
-        };
-        labels = {
-          file-modified-label = " MODIFIED ";
-          file-removed-label = " REMOVED ";
-          file-added-label = " ADDED ";
-          file-renamed-label = " RENAMED ";
-        };
-      };
-    };
     extraConfig = {
       commit.verbose = true;
       core = {
@@ -46,3 +20,30 @@ with theme;
     };
   };
 }
+# delta = {
+#   enable = true;
+#   options = {
+#     features = "decorations labels";
+#     syntax-theme = "none";
+#     zero-style = "8";
+#     navigate = "true";
+#     keep-plus-minus-markers = "true";
+#     decorations = {
+#       file-decoration-style = "none";
+#       whitespace-error-style = "22 reverse";
+#       minus-style = "${base08}";
+#       minus-emph-style = "${base08} bold";
+#       plus-style = "${base0B}";
+#       plus-emph-style = "${base0B} bold";
+#       file-style = "7 italic";
+#       hunk-header-style = "7";
+#       hunk-header-decoration-style = "8 ul";
+#     };
+#     labels = {
+#       file-modified-label = " MODIFIED ";
+#       file-removed-label = " REMOVED ";
+#       file-added-label = " ADDED ";
+#       file-renamed-label = " RENAMED ";
+#     };
+#   };
+# };
diff --git a/programs/tmux.nix b/programs/tmux.nix
index 5f58108..8679222 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -10,10 +10,10 @@
       tmuxPlugins.fingers
     ];
     extraConfig = ''
-      set -g prefix C-a
+      set -g prefix C-t
       setw -g mode-keys vi
       unbind-key C-b
-      bind-key C-a send-prefix
+      bind-key C-t send-prefix
 
       bind r source-file ~/.config/tmux/tmux.conf
 
@@ -27,19 +27,19 @@
 
       # pane binds
       bind-key h select-pane -L
-      bind-key j select-pane -D
-      bind-key k select-pane -U
-      bind-key l select-pane -R
+      bind-key n select-pane -D
+      bind-key e select-pane -U
+      bind-key i select-pane -R
       bind-key -r H resize-pane -L 5
-      bind-key -r J resize-pane -D 5
-      bind-key -r K resize-pane -U 5
-      bind-key -r L resize-pane -R 5
+      bind-key -r N resize-pane -D 5
+      bind-key -r E resize-pane -U 5
+      bind-key -r I resize-pane -R 5
 
       # window binds
       bind -n M-h  previous-window
-      bind -n M-l next-window
-      bind-key "|" split-window -h -c "#{pane_current_path}"
-      bind-key "-" split-window -v -c "#{pane_current_path}"
+      bind -n M-i next-window
+      bind-key "{" split-window -h -c "#{pane_current_path}"
+      bind-key "}" split-window -v -c "#{pane_current_path}"
       bind-key s choose-session
       bind-key c new-window -c "#{pane_current_path}"
       bind-key ) swap-window -t +1
@@ -84,6 +84,7 @@
       # status left
       set -g  status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') "
       set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')"
+      set status-left-length 50
     '';
   };
 }