Merge branch 'master' of github.com:yulqen/openbsddotfiles

3 files changed, 33 insertions, 61 deletions

diff --git a/Xresources_openbsd b/Xresources_openbsd
index 23a45dd..18a2cb3 100644
--- a/Xresources_openbsd
+++ b/Xresources_openbsd
@@ -13,21 +13,21 @@ Xft.rgba      : rgb
 !xterm*font: -Misc-Fixed-Medium-R-Normal--20-200-75-75-C-100-ISO10646-1
 !xterm*faceName		: FiraCode-Medium:size=10
 !xterm*faceName      : Mx437 ToshibaTxL1 8x16:style=Regular
-xterm*faceName		: Fixed:size=12
+!xterm*faceName		: Fixed:size=12
 !xterm*faceName: xft:monospace:pixelsize=15
 !xterm*faceName		: DejaVu Sans mono:size=10
 !xterm*faceName		: Hack-Regular:size=8
 !xterm*faceName		: Terminus:size=10:style=Bold
-!xterm*faceName		: JetBrainsMono:size=9
+xterm*faceName		: JetBrainsMono:size=9
 XTerm*backarrowKey	: false
 XTerm.vt100.backarrowKey: false
 XTerm.ttyModes		: erase ^?
 XTerm.vt100.locale	: true
 XTerm*selectToClipboard	: true
-!XTerm*background	: #000000
-XTerm*background	: #fef8ed
-!XTerm*foreground	: #ffffff
-XTerm*foreground	: #000000
+XTerm*background	: #000000
+!XTerm*background	: #fef8ed
+XTerm*foreground	: #ffffff
+!XTerm*foreground	: #000000
 !remove the additional black border
 XTerm*borderWidth            : 0
 XTerm*internalBorder         : 2
diff --git a/fish/functions/lbuckets.fish b/fish/functions/lbuckets.fish
new file mode 100644
index 0000000..d22768a
--- /dev/null
+++ b/fish/functions/lbuckets.fish
@@ -0,0 +1,3 @@
+function lbuckets --wraps='ledger bal not Equity and not Income and not Expenses and not Liabilities and not Investments' --description 'alias lbuckets=ledger bal not Equity and not Income and not Expenses and not Liabilities and not Investments'
+  ledger bal not Equity and not Income and not Expenses and not Liabilities and not Investments $argv; 
+end
diff --git a/tmux.conf b/tmux.conf
index 506c4aa..7e4b3a2 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -94,28 +94,29 @@ bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
 #bind -t vi-copy y copy-pipe "xclip -sel clip -i"
 
 # geohot colors
-# set -g status-position bottom
-# set -g status-bg colour234
-# set -g status-fg colour137
-# set -g status-style dim
-# set -g status-left ''
-# set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M:%S '
-# set -g status-right-length 50
-# set -g status-left-length 20
-
-# setw -g window-status-current-style fg=colour81
-# setw -g window-status-current-style bg=colour238
-# setw -g window-status-current-style bold
-# setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F '
-
-# setw -g window-status-style fg=colour138
-# setw -g window-status-style bg=colour235
-# setw -g window-status-style none
-# setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F '
-
-# setw -g window-status-bell-style bold
-# setw -g window-status-bell-style fg=colour255
-# setw -g window-status-bell-style bg=colour1
+set -g status-position bottom
+set -g status-bg colour234
+set -g status-fg colour137
+set -g status-style dim
+set -g status-left ''
+set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M:%S '
+set -g status-right-length 50
+set -g status-left-length 20
+
+setw -g window-status-current-style fg=colour81
+setw -g window-status-current-style bg=colour238
+setw -g window-status-current-style bold
+setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F '
+
+setw -g window-status-style fg=colour138
+setw -g window-status-style bg=colour235
+setw -g window-status-style none
+setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F '
+
+setw -g window-status-bell-style bold
+setw -g window-status-bell-style fg=colour255
+setw -g window-status-bell-style bg=colour1
+
 
 # fiddle with colors of status bar
 # set color for status bar
@@ -166,39 +167,7 @@ setw -g mode-keys vi
 
 # battery information in status bar
 set status-interval 40
-#set -g status-right "#[fg=colour155]#(apm -l)%% | #[fg=colour45]%d %b %R"
-
-# solarized light colours from https://raw.githubusercontent.com/seebi/tmux-colors-solarized/master/tmuxcolors-light.conf
-#### COLOUR (Solarized light)
-
-# default statusbar colors
-set-option -g status-style fg=magenta,bg=white #yellow and base2
-
-# default window title colors
-set-window-option -g window-status-style fg=black,bg=default #base0 and default
-#set-window-option -g window-status-style dim
-
-# active window title colors
-set-window-option -g window-status-current-style fg=brightred,bg=default #orange and default
-#set-window-option -g window-status-current-style bright
-
-# pane border
-set-option -g pane-border-style fg=white #base2
-set-option -g pane-active-border-style fg=brightcyan #base1
-
-# message text
-set-option -g message-style fg=brightred,bg=white #orange and base2
-
-# pane number display
-set-option -g display-panes-active-colour blue #blue
-set-option -g display-panes-colour brightred #orange
-
-# clock
-set-window-option -g clock-mode-colour red #green
-
-# bell
-set-window-option -g window-status-bell-style fg=white,bg=red #base2, red
-
+set -g status-right "#[fg=colour155]#(apm -l)%% | #[fg=colour45]%d %b %R"
 
 #
 ## Smart pane switching with awareness of Vim splits.