aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--programs/neovim.nix2
-rw-r--r--programs/tmux.nix16
-rw-r--r--theme/default.nix2
-rw-r--r--x/rxvt.nix6
4 files changed, 15 insertions, 11 deletions
diff --git a/programs/neovim.nix b/programs/neovim.nix
index 6095e0f..e593e44 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -36,7 +36,7 @@
36 vim-surround 36 vim-surround
37 vim-unimpaired 37 vim-unimpaired
38 vim-repeat 38 vim-repeat
39 # vim-fugitive 39 vim-fugitive
40 40
41 # syntax 41 # syntax
42 rust-vim 42 rust-vim
diff --git a/programs/tmux.nix b/programs/tmux.nix
index 11efa39..e9e626b 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -16,6 +16,10 @@ let
16 ${pkgs.cmus}/bin/cmus-remote -Q | awk '/status/ { print $2 }' 16 ${pkgs.cmus}/bin/cmus-remote -Q | awk '/status/ { print $2 }'
17 ''; 17 '';
18 18
19 date-bst = pkgs.writeScriptBin "date-bst" ''
20 env TZ=Europe/London date +"%H%M"
21 '';
22
19in 23in
20{ 24{
21 programs.tmux = { 25 programs.tmux = {
@@ -89,15 +93,15 @@ in
89 set -ag status-style "fg=colour7" 93 set -ag status-style "fg=colour7"
90 94
91 set status-right-length 70 95 set status-right-length 70
92 set -g status-right "#[fg=colour15]#(${cmus-np}/bin/cmus-np) #[fg=colour8]#(${cmus-status}/bin/cmus-status) " 96 set -g status-right "#[fg=colour15]#(date +"%H%M") #[fg=colour8]IST "
93 set -ag status-right "#[fg=colour15]#(date +"%H%M") #[fg=colour8]hrs " 97 set -ag status-right "#[fg=colour15]#(${date-bst}/bin/date-bst) #[fg=colour8]BST "
94 set -ag status-right "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y")" 98 set -ag status-right "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y")"
95 99
96 # status left 100 # status left
97 set status-left-length 50 101 set status-left-length 70
98 set -g status-left "#[fg=colour7]#(bat -q) " 102 # set -g status-left "#[fg=colour15]#(${cmus-np}/bin/cmus-np) #[fg=colour8]#(${cmus-status}/bin/cmus-status) "
99 set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') " 103 set -g status-left "#[fg=colour7]#(bat -q) "
100 set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')" 104 set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}')"
101 ''; 105 '';
102 }; 106 };
103} 107}
diff --git a/theme/default.nix b/theme/default.nix
index 7c67057..b3af086 100644
--- a/theme/default.nix
+++ b/theme/default.nix
@@ -3,4 +3,4 @@ let
3 night = import ./night.nix; 3 night = import ./night.nix;
4 gruvbox = import ./gruvbox.nix; 4 gruvbox = import ./gruvbox.nix;
5in 5in
6day 6night
diff --git a/x/rxvt.nix b/x/rxvt.nix
index 5744bd0..3498bd0 100644
--- a/x/rxvt.nix
+++ b/x/rxvt.nix
@@ -33,9 +33,9 @@ with theme;
33 "URxvt.font" = "xft:Nerd Input:size=11:style=Medium"; 33 "URxvt.font" = "xft:Nerd Input:size=11:style=Medium";
34 "URxvt.italicFont" = "xft:Nerd Input:size=11:style=Medium"; 34 "URxvt.italicFont" = "xft:Nerd Input:size=11:style=Medium";
35 "URxvt.boldFont" = "xft:Nerd Input:size=11:style=Medium"; 35 "URxvt.boldFont" = "xft:Nerd Input:size=11:style=Medium";
36 "*font" = "Berkeley Mono:size=11:style=Regular"; 36 "*font" = "Nerd Input:size=11:style=Regular";
37 "*italicFont" = "Berkeley Mono:size=11:style=Italic"; 37 "*italicFont" = "Nerd Input:size=11:style=Italic";
38 "*boldFont" = "Berkeley Mono:size=11:style=Bold"; 38 "*boldFont" = "Nerd Input:size=11:style=Bold";
39 39
40 "URxvt.lineSpace" = 0; 40 "URxvt.lineSpace" = 0;
41 "URxvt.letterSpace" = 0; 41 "URxvt.letterSpace" = 0;