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

12 files changed, 83 insertions, 92 deletions

diff --git a/Xresources_openbsd b/Xresources_openbsd
index f47908d..1bdf517 100644
--- a/Xresources_openbsd
+++ b/Xresources_openbsd
@@ -1,4 +1,4 @@
-Xft.dpi: 192
+!Xft.dpi: 192
 !Xft.dpi: 96
 Xft.autohint  : 0
 Xft.lcdfilter : lcddefault
@@ -11,12 +11,12 @@ Xft.rgba      : rgb
 !XTerm*font         	: -misc-fixed-medium-r-semicondensed-*-32-*-*-*-*-*-iso10646-1
 !xterm*font: -Misc-Fixed-Medium-R-Normal--20-200-75-75-C-100-ISO10646-1
 !xterm*faceName		: FiraCode-Medium:size=10
-!xterm*faceName		: Fixed
+xterm*faceName		: Fixed
 !xterm*faceName: xft:monospace:pixelsize=15
 !xterm*faceName		: DejaVu Sans mono:size=10
 !xterm*faceName		: Hack-Regular:size=8
 !xterm*faceName		: Terminus:size=10
-xterm*faceName		: JetBrainsMono:size=9
+!xterm*faceName		: JetBrainsMono:size=9
 XTerm*backarrowKey	: false
 XTerm.vt100.backarrowKey: false
 XTerm.ttyModes		: erase ^?
@@ -66,34 +66,34 @@ XTerm*on3Clicks              : line
 ! Last Modified: 6 Sep 2014
 ! -----------------------------------------------------------------------------
 
-! hard contrast: *background: #1d2021
-*background: #282828
-! soft contrast: *background: #32302f
-*foreground: #ebdbb2
-! Black + DarkGrey
-*color0:  #282828
-*color8:  #928374
-! DarkRed + Red
-*color1:  #cc241d
-*color9:  #fb4934
-! DarkGreen + Green
-*color2:  #98971a
-*color10: #b8bb26
-! DarkYellow + Yellow
-*color3:  #d79921
-*color11: #fabd2f
-! DarkBlue + Blue
-*color4:  #458588
-*color12: #83a598
-! DarkMagenta + Magenta
-*color5:  #b16286
-*color13: #d3869b
-! DarkCyan + Cyan
-*color6:  #689d6a
-*color14: #8ec07c
-! LightGrey + White
-*color7:  #a89984
-*color15: #ebdbb2
+!! hard contrast: *background: #1d2021
+!*background: #282828
+!! soft contrast: *background: #32302f
+!*foreground: #ebdbb2
+!! Black + DarkGrey
+!*color0:  #282828
+!*color8:  #928374
+!! DarkRed + Red
+!*color1:  #cc241d
+!*color9:  #fb4934
+!! DarkGreen + Green
+!*color2:  #98971a
+!*color10: #b8bb26
+!! DarkYellow + Yellow
+!*color3:  #d79921
+!*color11: #fabd2f
+!! DarkBlue + Blue
+!*color4:  #458588
+!*color12: #83a598
+!! DarkMagenta + Magenta
+!*color5:  #b16286
+!*color13: #d3869b
+!! DarkCyan + Cyan
+!*color6:  #689d6a
+!*color14: #8ec07c
+!! LightGrey + White
+!*color7:  #a89984
+!*color15: #ebdbb2
 
 
 
diff --git a/cwmrc b/cwmrc
index 6bf427d..714e3b0 100644
--- a/cwmrc
+++ b/cwmrc
@@ -1,33 +1,14 @@
-#sticky yes
-#xrdb -merge ~/.Xresources
-#color activeborder	"#ffb3ff"
-#gap 0 0 24 0
-#borderwidth 3
-#bind-key 4-Return	terminal
-#bind-key 4-d		menu-exec
-#bind-key S4-q		restart
-#bind-key S4-f		window-fullscreen
-#bind-key 4-1 		group-only-1
-#bind-key 4-2 		group-only-2
-#bind-key 4-3 		group-only-3
-#bind-key 4-4 		group-only-4
-#bind-key 4-5 		group-only-5
-#bind-key 4S-1		window-movetogroup-1
-#bind-key 4S-2		window-movetogroup-2
-#bind-key 4S-3		window-movetogroup-3
-#bind-key 4S-4		window-movetogroup-4
-#bind-key 4S-5		window-movetogroup-5
-#bind-key 4S-k		window-htile
-#bind-key 4S-j		window-vtile
-#command qutebrowser	qutebrowser
-#command top		top
-
 # from https://www.c0ffee.net/blog/openbsd-on-a-laptop/ 
 # automatically add new windows to the current group
 sticky yes
+
+color activeborder #fccfcf
+borderwidth 1
+
 # snap windows to edges at 4 pixels distance
 snapdist 4
-# leave a gap for xclock
+
+# gaps top bottom left? right?
 gap 0 0 0 0
 
 # set font for menus
@@ -44,24 +25,30 @@ unbind-key all
 
 # mod + enter = new xterm
 bind-key 4-Return terminal
+
 # ctrl + alt + L = lock screen (xlock)
 bind-key CM-l lock
+
 # mod + backspace = hide window
 bind-key 4-BackSpace window-hide
 
 # mod + down arrow = lower window's focus
 bind-key 4-Down window-lower
+
 # mod + up arrow = raise window's focus
 bind-key 4-Up window-raise
+
 # mod/alt + tab = cycle through current windows
 bind-key 4-Tab window-cycle
 bind-key M-Tab window-cycle
+
 # mod/alt + shift + tab = same thing in reverse
 bind-key 4S-Tab window-rcycle
 bind-key MS-Tab window-rcycle
-# mod + w = kill window
+
 #bind-key 4-w window-delete
 bind-key 4S-q window-delete
+
 # set a window's label
 bind-key 4-n window-menu-label
 
@@ -77,6 +64,7 @@ bind-key 4-7 group-only-7
 bind-key 4-8 group-only-8
 bind-key 4-9 group-only-9
 
+
 # mod + shift +$N = move window to group $N
 bind-key 4S-1 window-movetogroup-1
 bind-key 4S-2 window-movetogroup-2
@@ -96,20 +84,27 @@ bind-key 4-g window-group
 # mod + right arrow = cycle through the window groups
 # (you can think of this as switching to the next virtual desktop)
 bind-key 4-Right group-cycle
+
 # mod + left arrow = same thing in reverse
 bind-key 4-Left group-rcycle
+
 # mod + S = stick current window to be visible in all groups
 bind-key 4-s window-stick
 
 # mod + F = make current window fullscreen
 bind-key 4-f window-fullscreen
+
 # mod + M = maximize current window
 bind-key 4-m window-maximize
+
 # mod + equals = maximize window in vertical direction only
 bind-key 4-equal window-vmaximize
+
 # mod + shift + equals = maximize window in horizontal direction only
 bind-key 4S-equal window-hmaximize
 
+moveamount 10
+
 # mod + H,J,K,L = move window left, down, up, right 10 pixels
 bind-key 4-h window-move-left-big
 bind-key 4-j window-move-down-big
@@ -122,17 +117,22 @@ bind-key 4S-j window-resize-down-big
 bind-key 4S-k window-resize-up-big
 bind-key 4S-l window-resize-right-big
 
+
 # mod + V = tile windows vertically, current window to the left
 bind-key 4-v window-vtile
+
 # mod + V = tile windows horizontally, current window to the top
 bind-key 4-c window-htile
 
 # mod + / = show popup menu of current windows
 bind-key 4-slash menu-window
+
 # mod + shift + d = show popup menu to run a command (configured below)
 bind-key 4S-d menu-cmd
+
 # mod + ? = show popup menu to run an arbitrary command
 bind-key 4-question menu-exec
+
 # mod + . = show popup menu of known ssh hosts to connect to
 bind-key 4-period menu-ssh
 
@@ -150,15 +150,20 @@ unbind-mouse CMS-3
 
 # mod + left click drag = move window
 bind-mouse 4-1 window-move
+
 # mod + right click drag = resize window
 bind-mouse 4-3 window-resize
+
 # mod + middle click = lower window's focus
 bind-mouse 4-2 window-lower
+
 # mod + shift + middle click = hide window
 bind-mouse 4S-2 window-hide
 
+
 # these commands will appear in the command menu
 command xterm  xterm
+
 #command chrome "chrome --enable-unveil"
 command chrome "chrome --enable-unveil"
 command xclock xclock
diff --git a/ksh_aliases b/ksh_aliases
index b07977f..c26d5c2 100644
--- a/ksh_aliases
+++ b/ksh_aliases
@@ -21,7 +21,6 @@ alias s='task sync'
 alias t='task'
 alias ttoday='task ml_due_or_scheduled_today'
 #alias du='ncdu --color dark -rr -x --exclude .git'
-alias free='free -h'
 alias gloga='git log --oneline --decorate --graph --all'
 alias taskallprojects='task rc.list.all.projects=1 projects'
 alias taskalltags='task rc.list.all.tags=1 tags'
diff --git a/mailcap b/mailcap
index c1be0b3..368c2fb 100644
--- a/mailcap
+++ b/mailcap
@@ -77,3 +77,6 @@ video/*; mpv -vo drm -quiet '%s'; needsterminal
 
 text/html; w3m %s; nametemplate=%s.html
 text/html; w3m -dump %s; nametemplate=%s.html; copiousoutput
+
+# pdf
+application/pdf; /usr/local/bin/zathura %s
diff --git a/mutt2022/aliases b/mutt2022/aliases
index fab124a..0db715b 100644
--- a/mutt2022/aliases
+++ b/mutt2022/aliases
@@ -6,3 +6,4 @@ alias henry Gavin Macfarlane <gavmacfarlane@gmail.com>
 alias dan Daniel Barwick <danbarwick@gmail.com>
 alias neil Neil Byrne <nbyrne@wandsworth.gov.uk>
 alias Keiron Keiron Hart <keironh@googlemail.com>
+alias openbsdlists <openbsdlists@speedymail.com>
diff --git a/mutt2022/mailcap b/mutt2022/mailcap
index fa01661..9f40b57 100644
--- a/mutt2022/mailcap
+++ b/mutt2022/mailcap
@@ -4,9 +4,9 @@
 # Images
 image/jpg; ~/.mutt/view_attachment.sh %s jpg feh
 image/jpeg; ~/.mutt/view_attachment.sh %s jpg feh
-image/pjpeg; ~/.mutt/view_attachment.sh %s jpg gpicview
-image/png; ~/.mutt/view_attachment.sh %s png gpicview
-image/gif; ~/.mutt/view_attachment.sh %s gif gpicview
+image/pjpeg; ~/.mutt/view_attachment.sh %s jpg feh
+image/png; ~/.mutt/view_attachment.sh %s png feh
+image/gif; ~/.mutt/view_attachment.sh %s gif feh
 #
 # patches
 text/x-patch; vimdiff '%s'; needsterminal
diff --git a/mutt2022/signature b/mutt2022/signature
index c375431..5ecd7a7 100644
--- a/mutt2022/signature
+++ b/mutt2022/signature
@@ -1,3 +1,2 @@
-
-Matthew Lemon
-Email: matt@matthewlemon.com
+Best regards,
+Matthew
diff --git a/newsboat/urls b/newsboat/urls
index b8700d5..fbe884b 100644
--- a/newsboat/urls
+++ b/newsboat/urls
@@ -1,3 +1,4 @@
+https://dataswamp.org/~solene/rss.xml
 https://nitter.net/openbsdnow/rss
 https://nitter.net/openbsd/rss
 https://nitter.net/djangonewsbot/rss
diff --git a/profile b/profile
index 6bd1476..56f69f7 100644
--- a/profile
+++ b/profile
@@ -2,29 +2,6 @@
 #
 # sh/ksh initialization
 
-#  # comment out when not using bash?
-#{ # from https://github.com/terminalforlife config
-#	# The RHEL recommended umask for much more safety when creating new files
-#	# and directories. This is the equivalent of octal 700 and 600 for
-#	# directories and files, respectively; drwx------ and -rw-------.
-#	umask 0077
-#
-#	# Set up the SSH agent for key management.
-#	if eval `ssh-agent -s`; then
-#		# Only want to add keys on an SSH client, not the server.
-#		if [ "$HOSTNAME" == 'x1bsd.my.domain' ]; then
-#			[ -z "$SSH_TTY" ] && ssh-add "$HOME"/.ssh/id_rsa
-#		fi
-#		trap 'kill $SSH_AGENT_PID' EXIT
-#	fi
-#
-#	. "$HOME"/.bashrc
-#
-#	PATH+=":$HOME/bin"
-#} &> /dev/null
-
-
-#PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin:/usr/games
-PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin:/usr/games
-export PATH HOME
-export ENV=$HOME/.kshrc
+PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin:/usr/games
+export ENV=~/.kshrc
+export PATH HOME TERM
diff --git a/tmux.conf b/tmux.conf
index 8acc4ff..7e4b3a2 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -165,6 +165,10 @@ set -g status-right-length 100
 # vim mode keys
 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"
+
 #
 ## Smart pane switching with awareness of Vim splits.
 ## See: https://github.com/christoomey/vim-tmux-navigator
diff --git a/vim/vimrc b/vim/vimrc
index a624db9..1a501c9 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -437,7 +437,7 @@ let g:gruvbox_number_column='bg0'
 let g:gruvbox_invert_signs='0'
 let g:gruvbox_improved_strings='0'
 set background=dark
-colorscheme gruvbox
+colorscheme desert
 
 " manual highlights
 " highlight Visual ctermfg=black ctermbg=LightMagenta
diff --git a/xsession_x220 b/xsession_x220
index e16e343..282d335 100644
--- a/xsession_x220
+++ b/xsession_x220
@@ -1,9 +1,11 @@
+. ~/.profile
 export LANG=en_GB.UTF-8
-export ENV=$HOME/.kshrc
 xrdb -merge $HOME/.Xresources
 xsetroot -solid cadetblue
 xidle &
+autocutsel &
 ulimit -Sc 0 # eliminate core dumps (https://www.kevinthomas.dev/posts/openbsd-thinkpadt480.html)
+scb 5600
 xset b off
 setxkbmap -option ctrl:nocaps
 setxkbmap gb