commit caf096f38c7eb3718e70b2aa889f2a1d7daa5998
Author: Simon Watson <spw01@protonmail.com>
Date:   Thu Dec 29 15:30:34 2022 -0500

    Random updates

diff --git a/bashrc/bashrc-all b/bashrc/bashrc-all
index e1e3c2e..86b82da 100644
--- a/bashrc/bashrc-all
+++ b/bashrc/bashrc-all
@@ -15,8 +15,13 @@ fi
 export EDITOR=$(which vim)
 
 BPYTOP_PATH=$(which bpytop)
-if [ ! -z "$BPYTOP_PATH" ]; then
+BTOP_PATH=$(which btop)
+if [ ! -z "$BPYTOP_PATH" ] && [ -z $BTOP_PATH ]; then
     alias htop="bpytop -b \"cpu mem net proc\""
+elif [ ! -z "$BTOP_PATH" ] && [ -z $BPYTOP_PATH ]; then
+    alias htop="btop"
+elif [ ! -z "$BTOP_PATH" ] && [ ! -z $BPYTOP_PATH ]; then
+    alias htop="btop"
 fi
 
 EXA_PATH=$(which exa)
diff --git a/emacs/.emacs-all b/emacs/.emacs-all
index feac811..32e5af1 100644
--- a/emacs/.emacs-all
+++ b/emacs/.emacs-all
@@ -47,6 +47,9 @@
  '(fzf :type git :host github
    :repo "bling/fzf.el"))
 
+;; EasyPG settings
+(setq epa-pinentry-mode 'loopback)
+
 ;; newlisp mode
 (straight-use-package
  '(newlisp-mode
@@ -139,10 +142,10 @@
 ;; MELPA interface, but it's working and I'm too lazy to change it
 ;; 2022/03/03 - Using straight MEPLA interface also surfaces this bug.
 ;; Below seems to be only reliable cross platform way to include this package
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
-(package-install 'symon)
-;;(symon-mode 1)
+;; (require 'package)
+;; (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
+;; (package-install 'symon)
+;; ;;(symon-mode 1)
 
 (straight-use-package
  '(telephone-line :type git :host github
@@ -210,6 +213,7 @@
 (require 'auto-complete)
 (global-auto-complete-mode t)
 
+;; Common Lisp
 (require 'slime)
 (require 'ac-slime)
 (slime-setup '(slime-fancy ac-slime))
@@ -218,6 +222,11 @@
 (eval-after-load "auto-complete"
   '(add-to-list 'ac-modes 'slime-repl-mode))
 
+;; Guile
+(straight-use-package 'geiser)
+(straight-use-package 'geiser-guile)
+(setq geiser-active-implementations '(guile))
+
 (require 'markdown-mode)
 
 (require 'neotree)
@@ -417,5 +426,8 @@
   (progn
     (load "~/Repos/dotfiles/emacs/linux-load/customs.el")
     (xterm-mouse-mode t)
+    (global-set-key (kbd "C-c c c") (lambda ()
+				      (interactive)
+				      (shell-command-on-region (point) (mark) "xclip -selection clipboard")))
     (load (expand-file-name "~/quicklisp/slime-helper.el"))
     (setq inferior-lisp-program (locate-file "sbcl" exec-path exec-suffixes 1))))
diff --git a/lemonbar/swatson-casana/startLemon.sh b/lemonbar/swatson-casana/startLemon.sh
index 29011b3..76ad3d0 100755
--- a/lemonbar/swatson-casana/startLemon.sh
+++ b/lemonbar/swatson-casana/startLemon.sh
@@ -4,6 +4,11 @@ if [[ $1 == "--single-1080" ]]; then
     /home/swatson/.config/lemonbar/bar.sh | lemonbar -p -g 1920x15+1920+0
 fi
 
+if [[ $1 == "--xfce" ]]; then
+    /home/swatson/.config/lemonbar/bar.sh | lemonbar -p -g 1920x15+0+0
+fi
+
+
 if [[ $1 == "--single-1440" ]]; then
     /home/swatson/.config/lemonbar/bar.sh | lemonbar -p -g 1440x15+0+0
 fi
diff --git a/tint2/tint2rc b/tint2/tint2rc
index ea2ed59..b8476c8 100644
--- a/tint2/tint2rc
+++ b/tint2/tint2rc
@@ -54,7 +54,7 @@ panel_dock = 0
 panel_pivot_struts = 0
 panel_position = bottom center horizontal
 panel_layer = bottom
-panel_monitor = DP-1-2
+panel_monitor = DP-2-1
 panel_shrink = 0
 autohide = 1
 autohide_show_timeout = 0.3
diff --git a/xinit/swatson-casana-xinitrc b/xinit/swatson-casana-xinitrc
index 80fb413..0c596e1 100644
--- a/xinit/swatson-casana-xinitrc
+++ b/xinit/swatson-casana-xinitrc
@@ -1,9 +1,11 @@
 nitrogen --restore &
 xinput set-button-map 11 1 1 3 4 5 6 7 & # Disable track pad middle click
 xmodmap ~/.xmodmap & # Swap CapsLock to L_Ctrl
-/home/swatson/.config/lemonbar/startLemon.sh &
+#/home/swatson/.config/lemonbar/startLemon.sh &
 guake &
 tint2 &
-exec openbox
-.screenlayout/new_docked.sh &
+exec xfce4-session
+/home/swatson/.config/lemonbar/startLemon.sh &
+wpa_gui &
+#.screenlayout/new_docked.sh &
 #exec stumpwm