aboutsummaryrefslogtreecommitdiff
path: root/programs
diff options
context:
space:
mode:
authorAkshay <[email protected]>2022-06-14 17:37:53 +0100
committerAkshay <[email protected]>2022-06-14 17:37:53 +0100
commit6066b1bbe2c1cdaa8b0085a92071c11d64e9abbf (patch)
tree77db1d8e39d425105bf0ad20fb83881654d1ab33 /programs
parent0ed4698d124a4bfd9e57fbe99d89b6a46a7c11f0 (diff)
stuff for colemak
Diffstat (limited to 'programs')
-rw-r--r--programs/bash.nix1
-rw-r--r--programs/git.nix55
-rw-r--r--programs/tmux.nix23
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 @@
25 tree = "tree -C"; 25 tree = "tree -C";
26 vim = "nvim"; 26 vim = "nvim";
27 tb = "nc termbin.com 9999"; 27 tb = "nc termbin.com 9999";
28 n = "j";
28 29
29 # git aliases 30 # git aliases
30 gb = "git branch -v"; 31 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;
9 programs.git = { 9 programs.git = {
10 enable = true; 10 enable = true;
11 ignores = [ ".envrc" ]; 11 ignores = [ ".envrc" ];
12 delta.enable = true;
12 userEmail = "[email protected]"; 13 userEmail = "[email protected]";
13 userName = "Akshay"; 14 userName = "Akshay";
14 delta = {
15 enable = true;
16 options = {
17 features = "decorations labels";
18 syntax-theme = "none";
19 zero-style = "8";
20 navigate = "true";
21 keep-plus-minus-markers = "true";
22 decorations = {
23 file-decoration-style = "none";
24 whitespace-error-style = "22 reverse";
25 minus-style = "${base08}";
26 minus-emph-style = "${base08} bold";
27 plus-style = "${base0B}";
28 plus-emph-style = "${base0B} bold";
29 file-style = "7 italic";
30 hunk-header-style = "7";
31 hunk-header-decoration-style = "8 ul";
32 };
33 labels = {
34 file-modified-label = " MODIFIED ";
35 file-removed-label = " REMOVED ";
36 file-added-label = " ADDED ";
37 file-renamed-label = " RENAMED ";
38 };
39 };
40 };
41 extraConfig = { 15 extraConfig = {
42 commit.verbose = true; 16 commit.verbose = true;
43 core = { 17 core = {
@@ -46,3 +20,30 @@ with theme;
46 }; 20 };
47 }; 21 };
48} 22}
23# delta = {
24# enable = true;
25# options = {
26# features = "decorations labels";
27# syntax-theme = "none";
28# zero-style = "8";
29# navigate = "true";
30# keep-plus-minus-markers = "true";
31# decorations = {
32# file-decoration-style = "none";
33# whitespace-error-style = "22 reverse";
34# minus-style = "${base08}";
35# minus-emph-style = "${base08} bold";
36# plus-style = "${base0B}";
37# plus-emph-style = "${base0B} bold";
38# file-style = "7 italic";
39# hunk-header-style = "7";
40# hunk-header-decoration-style = "8 ul";
41# };
42# labels = {
43# file-modified-label = " MODIFIED ";
44# file-removed-label = " REMOVED ";
45# file-added-label = " ADDED ";
46# file-renamed-label = " RENAMED ";
47# };
48# };
49# };
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 @@
10 tmuxPlugins.fingers 10 tmuxPlugins.fingers
11 ]; 11 ];
12 extraConfig = '' 12 extraConfig = ''
13 set -g prefix C-a 13 set -g prefix C-t
14 setw -g mode-keys vi 14 setw -g mode-keys vi
15 unbind-key C-b 15 unbind-key C-b
16 bind-key C-a send-prefix 16 bind-key C-t send-prefix
17 17
18 bind r source-file ~/.config/tmux/tmux.conf 18 bind r source-file ~/.config/tmux/tmux.conf
19 19
@@ -27,19 +27,19 @@
27 27
28 # pane binds 28 # pane binds
29 bind-key h select-pane -L 29 bind-key h select-pane -L
30 bind-key j select-pane -D 30 bind-key n select-pane -D
31 bind-key k select-pane -U 31 bind-key e select-pane -U
32 bind-key l select-pane -R 32 bind-key i select-pane -R
33 bind-key -r H resize-pane -L 5 33 bind-key -r H resize-pane -L 5
34 bind-key -r J resize-pane -D 5 34 bind-key -r N resize-pane -D 5
35 bind-key -r K resize-pane -U 5 35 bind-key -r E resize-pane -U 5
36 bind-key -r L resize-pane -R 5 36 bind-key -r I resize-pane -R 5
37 37
38 # window binds 38 # window binds
39 bind -n M-h previous-window 39 bind -n M-h previous-window
40 bind -n M-l next-window 40 bind -n M-i next-window
41 bind-key "|" split-window -h -c "#{pane_current_path}" 41 bind-key "{" split-window -h -c "#{pane_current_path}"
42 bind-key "-" split-window -v -c "#{pane_current_path}" 42 bind-key "}" split-window -v -c "#{pane_current_path}"
43 bind-key s choose-session 43 bind-key s choose-session
44 bind-key c new-window -c "#{pane_current_path}" 44 bind-key c new-window -c "#{pane_current_path}"
45 bind-key ) swap-window -t +1 45 bind-key ) swap-window -t +1
@@ -84,6 +84,7 @@
84 # status left 84 # status left
85 set -g status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') " 85 set -g status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') "
86 set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')" 86 set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')"
87 set status-left-length 50
87 ''; 88 '';
88 }; 89 };
89} 90}