openbsd updates

9 files changed, 72 insertions, 59 deletions

diff --git a/Xresources b/Xresources
index eb2d4c3..461ec50 100644
--- a/Xresources
+++ b/Xresources
@@ -1,13 +1,15 @@
 Xcursor*theme: Adwaita
-Xcursor*size: 64
-XTerm*faceSize: 14
+Xcursor*size: 32
+XTerm*faceSize: 6
 XTerm*selectToClipboard: true
-XTerm*faceName: GoMono:style=regular:antialias=true:hinting=false
+XTerm*faceName: Iosevka SS13 Extended:style=regular:antialias=true:hinting=false
 xterm*scrollBar: false
 xterm*rightScrollbar: false
 XTerm.termName: xterm-256color
-XTerm*Background: #F6FFFA
+XTerm*Background: #FFFFFF
 XTerm*Foreground: #000000
-XTerm*HiBackColor: #F6FFFA
+XTerm*HiBackColor: #FFFFFF
 XTerm*scaleHeight: 1.2
+VT100.translations: #override \n\
+        <Btn3Down>: exec-formatted("xdg-open '%t'", PRIMARY)
 
diff --git a/alacritty.toml b/alacritty.toml
index 77a703e..f3e46c5 100644
--- a/alacritty.toml
+++ b/alacritty.toml
@@ -1,9 +1,10 @@
 [window]
-padding = { x = 4, y = 4 }
+padding = { x = 2, y = 2 }
 
 [font]
 normal = { family = "Iosevka SS13 Extended", style = "Regular" }
-size = 14
+size = 6.5
+offset.y = 2
 
 [colors.primary]
 foreground = "#000000"
diff --git a/cwmrc b/cwmrc
index f67b9db..dcab746 100644
--- a/cwmrc
+++ b/cwmrc
@@ -1,10 +1,10 @@
 sticky yes
-fontname "Liberation Serif:pixelsize=22:Normal"
-borderwidth 3 
+fontname "Iosevka Aile:pixelsize=18:Normal"
+borderwidth 4 
 autogroup 0 xclock,XClock
 autogroup 0 xarclock, XClock
 autogroup 0 clock, clock
-autogroup 0 xclock, xterm
+autogroup 0 xclock, alacritty
 vtile 55
 ignore xclock
 
@@ -13,17 +13,17 @@ color menufg "#FFFFFF" #black
 color font "#000000" #black
 color menubg "#DDDDDD" "#000000"
 color selfont #white #white
-color activeborder "#AAAAAA"
-color inactiveborder "#111111"
+color activeborder "#68b0b3"
+color inactiveborder "#AAAAAA"
 
-bind-key 0-XF86MonBrightnessUp "backlight incr 10"
-bind-key 0-XF86MonBrightnessDown "backlight decr 10"
+#bind-key 0-XF86MonBrightnessUp "backlight incr 10"
+#bind-key 0-XF86MonBrightnessDown "backlight decr 10"
 
 bind-mouse 4-3 window-resize
 bind-mouse 4-1 window-move
 bind-key 4-s menu-window 
-bind-key 4-Return xterm
-bind-key 4-e "xterm -e aerc"
+bind-key 4-Return alacritty
+bind-key 4-e "alacritty -e aerc"
 bind-key 4-q window-close
 bind-key 4-m window-fullscreen
 bind-key 4-l window-vtile
diff --git a/local/bin/pfetch b/local/bin/pfetch
index 0c2cb53..bfc58b6 100755
--- a/local/bin/pfetch
+++ b/local/bin/pfetch
@@ -1051,7 +1051,7 @@ get_wm() {
         ;;
     esac
 
-    log wm "hikari" >&6
+    log wm "cwm" >&6
 }
 
 
diff --git a/profile b/profile
index 17f8691..121b0fc 100644
--- a/profile
+++ b/profile
@@ -1,7 +1,8 @@
-PATH=${PATH}:/home/mccd/go/bin:/home/mccd/.local/bin:/home/mccd/.cargo/bin
+test -r /home/mccd/.opam/opam-init/init.sh && . /home/mccd/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
+PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin:/home/mccd/go/bin:/home/mccd/.cargo/bin:/home/mccd/.local/bin
+export PATH HOME TERM
+
 
-export MOZ_ENABLE_WAYLAND=1
-#export LIBSEAT_BACKEND="seatd"
 export EDITOR="vim"
 export GDK_DPI_SCALE="1.5"
 export GDK_SCALE="1.5"
@@ -13,14 +14,8 @@ export PF_ALIGN="5"
 export PF_COLOR="0"
 export MOZ_ACCELERATED=1
 
-#test -r /home/mccd/.opam/opam-init/init.sh && . /home/mccd/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
-#export XDG_DATA_DIRS=${XDG_DATA_DIRS}:~/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/pkg/share:/usr/local/share
-export ENV=$HOME/.shrc
+export ENV=$HOME/.kshrc
 export HISTSIZE=65535
 export HISTFILE=$HOME/.history
 export STITCH_DIRECTORY=/home/mccd/notes
 export STITCH_GREP_CMD=ugrep
-
-
-# opam configuration
-test -r /home/mccd/.opam/opam-init/init.sh && . /home/mccd/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
diff --git a/shrc b/shrc
index bf6ca78..2632b06 100644
--- a/shrc
+++ b/shrc
@@ -1,21 +1,5 @@
 # # be paranoid
-# alias cp='cp -ip'
-# alias mv='mv -i'
 alias rm='rm -i'
-alias restart-wifi="doas service netif restart"
-
-# # csh like history on arrow up and down
-bind ^[[A ed-search-prev-history
-bind ^[[B ed-search-next-history
-
-# # ctrl+arrow allow to jump from words to words
-bind "\\e[1;5C" em-next-word
-bind "\\e[1;5D" ed-prev-word
-alias history='fc -l'
-
-# Fix home/del for mobaxterm
-bind ^[[5~ ed-move-to-beg
-bind ^[[6~ ed-move-to-end
 
 alias grep="ugrep --exclude-dir=node-modules --exclude-dir=_build"
 alias e="$EDITOR"
@@ -25,20 +9,33 @@ alias tldr="NO_COLOR=1 tldr"
 alias fd="find . -name $1*"
 alias dedoc="dedoc --color off"
 alias doc="dedoc --color off search"
+alias kill-sessions="tmux kill-session -a"
 
+kill-unattached() {
+	tmux list-sessions -F '#{session_attached} #{session_id}' | \
+		awk '/^0/{print $2}' | \
+		xargs -n 1 tmux kill-session -t
+}
+
+refs() {
+	recsel -q $1 ~/refs.rec
+}
+
+addref() {
+	$EDITOR /tmp/description
+	cat /tmp/description | xargs -I {} recins refs.rec -f Title -v $1 -f Tags -v $2 -f Text -v {} 
+}
 
 notes() {
 	grep -i "$1" --format='%f%~' ~/notes/ | xargs -I {} cat {}
 }
 
-eval "$(opam env)"
+#eval "$(opam env)"
 
 echo "BAT: $(apm -l), $(apm -b)"
 
 set -o vi
 
-eval "$(zoxide init posix --hook prompt)"
-
 export PS1='\W \$ '
-
-
+eval "$(zoxide init posix --hook prompt)"
+#[[ $TERM != "tmux-256color" ]] && exec tmux 
diff --git a/tmux.conf b/tmux.conf
index 014cfa9..50b5a56 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,3 +1,8 @@
 set -g mouse on
-set -g status-style bg=#F6FFFA
+set -g status-style bg=#FFFFFF
 set -s escape-time 0
+run-shell ~/.config/tmux/urlview.tmux
+set -g default-terminal "tmux-256color"
+set -g xterm-keys on
+new-session -n $HOST
+
diff --git a/vimrc b/vimrc
index bcbd257..a66c580 100644
--- a/vimrc
+++ b/vimrc
@@ -22,18 +22,27 @@ set matchpairs+=<:>
 syntax on
 set title
 set background=light
-set termguicolors
 colorscheme quiet
 set t_Co=256
-set tgc
+set termguicolors
+if &term =~ '256color'
+    " disable Background Color Erase (BCE) so that color schemes
+    " render properly when inside 256-color tmux and GNU screen.
+    " see also https://sunaku.github.io/vim-256color-bce.html
+    set t_ut=
+endif
 hi Normal guifg=black  guibg=#FFFFFF
-"hi String guifg=blue 
-hi Comment guifg=blue cterm=italic
+"hi String guifg=blue guibg=white
+hi Comment guifg=blue guibg=white cterm=italic
 hi Directory cterm=bold 
 hi SpellBad term=reverse term=underline guibg=#FFFFFF  
 hi SpellCap term=reverse term=underline guibg=#FFFFFF  
 hi SpellRare term=reverse term=underline guibg=#FFFFFF  
 hi SpellLocal term=reverse term=underline guibg=#FFFFFF  
+hi clear StatusLine 
+hi clear PmenuKindSel 
+hi PmenuKindSel term=bold guifg=blue guibg=#333333
+hi StatusLine term=bold guifg=white guibg=#333333
 
 "" Cursor - switch between line and full when going to insert mode
 let &t_SI = "\<Esc>[6 q"
diff --git a/xsession b/xsession
index 8fd8944..2b0636d 100755
--- a/xsession
+++ b/xsession
@@ -1,12 +1,16 @@
-. /home/mccd/.profile
+. ~/.profile 
+export LC_ALL=en_US.UTF-8
 xrdb -load ~/.Xresources &
-xset fp+ /usr/pkg/share/fonts/X11/uni-vga &
-xsetroot -solid '#333333' &
-xclock -geometry +2373+20 -bg \#FEFFFFA -fg \#444444  &
+autocutsel &
+xsetroot -solid '#282C34' &
+ulimit -Sc 0 &
+#xclock -digital -geometry +7+1400 -face "Iosevka Aile:pixelsize=18:style=Semibold Italic" -bg \#EEEEEE -fg \#444444 -strftime "%a %d %b %H:%M [Unix Machine]" &
 gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile' &
-gsettings set org.gnome.desktop.interface font-name 'Liberation Serif' &
+gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' &
 gsettings set org.gnome.desktop.interface cursor-size 32 &
 gsettings set org.gnome.desktop.interface cursor-theme Adwaita &
-#xinput set-prop 6 271 0.3 & #Speed up cursor
+xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1 &
+xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Button" 2 &
+xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Axes" 6 7 4 5 &
 setxkbmap -layout us -variant colemak -option "caps:swapescape" & 
 dbus-run-session cwm