From 0f7e6e7763774eb848b929b7cf1c6f8026e8fe49 Mon Sep 17 00:00:00 2001
From: Marc Coquand <marc@mccd.space>
Date: Tue, 16 Jul 2024 14:37:31 -0500
Subject: Updates

---
 Xresources |  6 +++---
 kshrc      | 17 -----------------
 profile    |  6 +-----
 shrc       | 18 ++++++++++++++++++
 xsession   | 10 ++++------
 5 files changed, 26 insertions(+), 31 deletions(-)
 delete mode 100644 kshrc
 create mode 100644 shrc

diff --git a/Xresources b/Xresources
index f8f34b3..6d4cd83 100644
--- a/Xresources
+++ b/Xresources
@@ -1,8 +1,8 @@
-#Xcursor*theme: Adwaita
-#Xcursor*size: 64
+Xcursor*theme: Adwaita
+Xcursor*size: 64
 XTerm*faceSize: 14
 XTerm*selectToClipboard: true
-XTerm*faceName: Iosevka SS13 Extended:style=light: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
diff --git a/kshrc b/kshrc
deleted file mode 100644
index b013f1d..0000000
--- a/kshrc
+++ /dev/null
@@ -1,17 +0,0 @@
-#export HISTFILE="$HOME/.history"
-#alias grep="ugrep --exclude-dir=node-modules --exclude-dir=_build"
-alias e="$EDITOR"
-alias go=go122
-alias g="git"
-alias grep="ugrep"
-alias tldr="NO_COLOR=1 tldr"
-alias fd="NO_COLOR=1 fdfind"
-alias de='eval "$(direnv export bash)"'
-alias f-commit="fossil commit && fossil git export"
-alias jrnl='stitch -t :journal:'
-alias bat='envstat -d acpibat0 | grep 'charge:' | awk "{print $6}"'
-
-set -o emacs
-PS1='${PWD##*/} '
-
-eval "$(zoxide init posix --hook prompt)"
diff --git a/profile b/profile
index f3c46fb..730bcbf 100644
--- a/profile
+++ b/profile
@@ -26,7 +26,7 @@ export GSETTINGS_SCHEMA_DIR=/usr/pkg/share/glib-2.0/schemas
 
 #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/.kshrc
+export ENV=$HOME/.shrc
 export HISTSIZE=65535
 export HISTFILE=$HOME/.history
 export STITCH_DIRECTORY=/home/mccd/notes
@@ -34,9 +34,5 @@ export STITCH_GREP_CMD=ugrep
 
 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
 
-if [ -z $DISPLAY ] && [ $(tty) = /dev/tty1 ]; then 
-	exec startx
-fi
-
 # 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
new file mode 100644
index 0000000..01dd767
--- /dev/null
+++ b/shrc
@@ -0,0 +1,18 @@
+#export HISTFILE="$HOME/.history"
+#alias grep="ugrep --exclude-dir=node-modules --exclude-dir=_build"
+alias e="$EDITOR"
+alias g="git"
+alias grep="ugrep"
+alias tldr="NO_COLOR=1 tldr"
+alias fd="NO_COLOR=1 fdfind"
+alias de='eval "$(direnv export bash)"'
+alias f-commit="fossil commit && fossil git export"
+alias jrnl='stitch -t :journal:'
+alias bat='envstat -d acpibat0 | grep 'charge:' | awk "{print $6}"'
+
+set -o emacs
+set -o promptcmds
+set -o tabcomplete
+PS1="${PWD##*/} $PS1"
+
+eval "$(zoxide init posix --hook prompt)"
diff --git a/xsession b/xsession
index fea1fbc..5392b6b 100755
--- a/xsession
+++ b/xsession
@@ -1,14 +1,12 @@
 . /home/mccd/.profile
 xrdb -load ~/.Xresources &
-xsetroot -solid '#EEEEEE' &
-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]" &
+xset fp+ /usr/pkg/share/fonts/X11/uni-vga &
+xsetroot -solid '#DDDDDD' &
+xclock -digital -geometry +7+1400 -face "Iosevka Aile:pixelsize=18:style=Semibold Italic" -bg \#DDDDDD -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 'Iosevka Aile' &
 gsettings set org.gnome.desktop.interface cursor-size 32 &
 gsettings set org.gnome.desktop.interface cursor-theme Adwaita &
-#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 &
 xinput set-prop 6 271 0.3 & #Speed up cursor
-setxkbmap -layout us -variant colemak & # -option "caps:capslock" & 
+setxkbmap -layout us -variant colemak -option "caps:swapescape" & 
 dbus-run-session cwm
-- 
cgit v1.2.3