Updates

14 files changed, 42 insertions, 47 deletions

diff --git a/Xresources b/Xresources
index 490be89..87bdfbf 100644
--- a/Xresources
+++ b/Xresources
@@ -1,2 +1,4 @@
+xclock*background: #282c34
+xclock*foreground: #FFFFFF
 Xcursor.theme: Adwaita
-Xcursor.size: 48
+Xcursor.size: 68
diff --git a/alacritty.toml b/alacritty.toml
index 467f81c..f0c378e 100644
--- a/alacritty.toml
+++ b/alacritty.toml
@@ -1,6 +1,6 @@
 [font]
-normal = { family="terminus (TTF)" }
-size = 8
+normal = { family="Input Mono Condensed"}
+size = 6.5
 offset = { x = 0, y = 5 }
 
 [colors.primary]
diff --git a/config/kak/kakrc b/config/kak/kakrc
index ef397b6..02213b7 100644
--- a/config/kak/kakrc
+++ b/config/kak/kakrc
@@ -178,7 +178,7 @@ hook global WinCreate .* %{ evaluate-commands %sh{
 hook global RegisterModified '"' %{ nop %sh{
   case $(uname) in
     Linux)
-      wl-copy -n "$kak_main_reg_dquote" > /dev/null 2>&1 & ;; 
+      echo "$kak_main_reg_dquote" | xclip -selection clipboard -i  > /dev/null 2>&1 & ;; 
     Darwin)
       printf "%s" "$kak_main_reg_dquote" | pbcopy ;;
   esac
diff --git a/cwmrc b/cwmrc
index 8f62717..73136e2 100644
--- a/cwmrc
+++ b/cwmrc
@@ -16,8 +16,8 @@ color selfont "#000000" #black
 color activeborder "#559999"
 color inactiveborder "#E8E8E8"
 
-bind-key 0-XF86MonBrightnessUp "backlight -inc 10"
-bind-key 0-XF86MonBrightnessDown "backlight -dec 10"
+bind-key 0-XF86MonBrightnessUp "xbacklight -inc 10"
+bind-key 0-XF86MonBrightnessDown "xbacklight -dec 10"
 bind-key 0-XF86AudioLowerVolume "pamixer -d 5"
 bind-key 0-XF86AudioRaiseVolume "pamixer -i 5"
 bind-key 0-XF86AudioMute "pamixer -t"
@@ -26,19 +26,19 @@ bind-mouse 4-3 window-resize
 bind-mouse 4-1 window-move
 bind-key 4-s menu-window 
 bind-key 4-Return "alacritty"
-bind-key 4-e "alacritty -e aerc "
+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
 bind-key 4-u window-vmaximize
-bind-key 4-f window-move-right-big 4000
-bind-key 4S-f window-resize-right-big 4000
-bind-key 4-n window-move-down-big 4000
-bind-key 4S-n window-resize-down-big 4000
-bind-key 4-p window-move-up-big 4000
-bind-key 4S-p window-resize-up-big 4000
-bind-key 4-b window-move-left-big 4000
-bind-key 4S-b window-resize-left-big 4000
+bind-key 4-f window-move-right-big 50000
+bind-key 4S-f window-resize-right-big 50000
+bind-key 4-n window-move-down-big 50000
+bind-key 4S-n window-resize-down-big 50000
+bind-key 4-p window-move-up-big 50000
+bind-key 4S-p window-resize-up-big 50000
+bind-key 4-b window-move-left-big 50000
+bind-key 4S-b window-resize-left-big 50000
 bind-key 4S-r restart
 bind-key 4-space  menu-exec
 bind-key 4-Tab window-cycle
diff --git a/gitconfig b/gitconfig
index 52e8f08..13f29c4 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,7 @@
 [alias]
   pr = "!gh pr"
   issue = "!gh issue"
+  bug = "!git-bug"
 [user]
 	email = marc@mccd.space
 	name = Marc Coquand
diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf
index a41b213..4ac5d53 100644
--- a/gnupg/gpg-agent.conf
+++ b/gnupg/gpg-agent.conf
@@ -1,4 +1,4 @@
 default-cache-ttl 999999999 
 max-cache-ttl 999999999  
-pinentry-program /usr/local/bin/pinentry-tty
 allow-preset-passphrase
+pinentry-program /usr/bin/pinentry-curses
diff --git a/hooks/post-up/services b/hooks/post-up/services
index a507fda..0d36f7d 100755
--- a/hooks/post-up/services
+++ b/hooks/post-up/services
@@ -1,26 +1,25 @@
 #!/bin/sh
 
-if [ $(ls /var/service | grep NetworkManager -c) -eq 0 ]
+if [ $(ls /var/service | grep elogind -c) -eq 0 ]
 then
-  sudo xbps-install -y NetworkManager dbus
-  sudo ln -s /etc/sv/NetworkManager /var/service/
-  sudo ln -s /etc/sv/dbus /var/service
-  sudo sv stop wpa_supplicant
-  sudo sv stop dhcpcd
-  sudo unlink /var/service/wpa_supplicant
-  sudo unlink /var/service/dhcpcd
+  doas xbps-install -y elogind
+  doas ln -s /etc/sv/elogind /var/service/
   sleep 5
-  sudo sv start dbus
-  sudo sv start NetworkManager
+  doas sv start elogind
 fi
 
-
-if [ $(ls /var/service | grep elogind -c) -eq 0 ]
+if [ $(ls /var/service | grep NetworkManager -c) -eq 0 ]
 then
-  sudo xbps-install -y elogind
-  sudo ln -s /etc/sv/elogind /var/service/
+  doas xbps-install -y NetworkManager dbus
+  doas ln -s /etc/sv/NetworkManager /var/service/
+  doas ln -s /etc/sv/dbus /var/service
+  doas sv stop wpa_supplicant
+  doas sv stop dhcpcd
+  doas unlink /var/service/wpa_supplicant
+  doas unlink /var/service/dhcpcd
   sleep 5
-  sudo sv start elogind
+  doas sv start dbus
+  doas sv start NetworkManager
 fi
 
-xsync
+echo "Services setup; logout and in, then run xsync"
diff --git a/hooks/pre-up/1-ksh b/hooks/pre-up/1-ksh
deleted file mode 100755
index 30dd8e1..0000000
--- a/hooks/pre-up/1-ksh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if ! [ -x "$(command -v mksh)" ]; then
-  sudo xbps-install -y mksh
-  echo "Installed, run chsh -s /bin/mksh"
-fi
diff --git a/hooks/pre-up/2-nix b/hooks/pre-up/2-nix
index 0cb74ba..19ba279 100755
--- a/hooks/pre-up/2-nix
+++ b/hooks/pre-up/2-nix
@@ -3,6 +3,7 @@
 if ! [ -x "$(command -v nix)" ]; then
   echo "Installing Nix"
   doas install -d -m755 -o $(id -u) -g $(id -g) /nix
+  doas xbps-install -y xz
   curl -L https://nixos.org/nix/install | sh
   echo "Nix has been installed, you should run nix profile install nixpkgs#nix-direnv once profile has been refreshed"
 fi
diff --git a/hooks/pre-up/3-void b/hooks/pre-up/3-void
index f8b7bc5..f2523f4 100755
--- a/hooks/pre-up/3-void
+++ b/hooks/pre-up/3-void
@@ -2,9 +2,9 @@
 
 # We'll use xpkg from xtools to find installable packages
 if ! [ -x "$(command -v xpkg)" ]; then
-  sudo xbps-install -y xtools
+  doas xbps-install -y xtools
 fi
 
 if [ ! "$(cat ~/repository.list | grep 'void-repo-nonfree')" ]; then
-  sudo xbps-install -y void-repo-nonfree
+  doas xbps-install -y void-repo-nonfree
 fi
diff --git a/hooks/pre-up/4-mbsync b/hooks/pre-up/4-mbsync
index 6d58bb1..b49b258 100755
--- a/hooks/pre-up/4-mbsync
+++ b/hooks/pre-up/4-mbsync
@@ -1,3 +1,2 @@
 #!/bin/sh
 mkdir -p ~/mail-home
-mkdir -p ~/mail-work
\ No newline at end of file
diff --git a/kshrc b/kshrc
index d6b5ac8..2da6dd1 100644
--- a/kshrc
+++ b/kshrc
@@ -15,6 +15,5 @@ if [ -x "$(command -v opam)" ]; then
   eval $(opam env)
 fi
 
-display-battery-freebsd.sh
-
+void-battery-status
 eval "$(zoxide init posix --hook prompt)"
diff --git a/profile b/profile
index 81e85c1..dd47b6e 100644
--- a/profile
+++ b/profile
@@ -1,11 +1,10 @@
 if [ -e /home/mccd/.nix-profile/etc/profile.d/nix.sh ]; then . /home/mccd/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
 
-export XDG_RUNTIME_DIR=/var/run/user/`id -u`
 export EDITOR="kak"
 export GDK_DPI_SCALE="1.5"
 export GDK_SCALE="1.5"
 export XCURSOR_SIZE="32"
-export PF_INFO="ascii title os editor shell wm"
+export PF_INFO="ascii title editor shell wm"
 export PF_ALIGN="5"
 export PF_COLOR="0"
 export PATH=${PATH}:~/.local/bin
@@ -18,4 +17,5 @@ export TERM=xterm-256color
 
 test -r /home/mccd/.opam/opam-init/init.sh && . /home/mccd/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
 
+if [ "$(tty)" == "/dev/tty1" ]; then exec dbus-run-session startx; fi
 
diff --git a/xinitrc b/xinitrc
index 9ac8bc4..9d03cd2 100755
--- a/xinitrc
+++ b/xinitrc
@@ -1,6 +1,6 @@
-xsetroot -solid '#244A51' &
+xsetroot -solid '#282C34' &
 xrdb -load ~/.Xresources & 
-xclock -geometry +2350+30 &
+xclock -digital -geometry +2250+1400 -face "Ttyp0:pixelsize=24:antialias=false:autohint=false" &
 gsettings set org.gnome.desktop.interface document-font-name 'Input Sans Compressed' &
 gsettings set org.gnome.desktop.interface font-name 'Input Sans Compressed' &
 gsettings set org.gnome.desktop.interface cursor-size 32 &