From e4648c2f637e9bb550d11e706d1c6757d9599af5 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Tue, 19 Jul 2022 15:22:22 +0930
Subject: [PATCH] updates across a collection of things

---
 .config/lf/lfrc       | 20 ++++++++++----------
 .config/nvim/init.vim |  6 ++++++
 .config/x11/xprofile  |  2 ++
 .config/zsh/.zshrc    |  2 +-
 .xmonad/xmonad.hs     |  5 ++++-
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index 2862c67..6533057 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -94,17 +94,17 @@ cmd copyto ${{
 }}
 
 cmd trash ${{
-	files=$(printf "$fx" | tr '\n' ';')
-	while [ "$files" ]; do
-		file=${files%%;*}
+  files=$(printf "$fx" | tr '\n' ';')
+  while [ "$files" ]; do
+    file=${files%%;*}
 
-		eval trash-put "$(basename "$file")"
-		if [ "$files" = "$file" ]; then
-			files=''
-		else
-			files="${files#*;}"
-		fi
-	done
+    trash-put "$(basename "$file")"
+    if [ "$files" = "$file" ]; then
+      files=''
+    else
+      files="${files#*;}"
+    fi
+  done
 }}
 
 cmd restore_trash ${{
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index a8069f9..675fd01 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -64,6 +64,10 @@ set noshowcmd
 	map <C-k> <C-w>k
 	map <C-l> <C-w>l
 
+" Add C-c and C-p to get stuff in and out of + buffer (if using gvim)
+	vnoremap <C-c> "+y
+	map <C-p> "+p
+
 " Replace ex mode with gq
 	map Q gq
 
@@ -105,6 +109,8 @@ set noshowcmd
 " Run xrdb whenever Xdefaults or Xresources are updated.
 	autocmd BufRead,BufNewFile Xresources,Xdefaults,xresources,xdefaults set filetype=xdefaults
 	autocmd BufWritePost Xresources,Xdefaults,xresources,xdefaults !xrdb %
+" Recompile xmonad on edit, also on xmobar edits
+	autocmd BufWritePost ~/.xmonad/xmonad.hs,~/.config/xmobar/xmobar-main.hs,~/.config/xmobar/xmobar-sub.hs,~/.config/xmobar/xmobar-single.hs !xmonad --restart
 
 " Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable.
 if &diff
diff --git a/.config/x11/xprofile b/.config/x11/xprofile
index c4d7d44..75c5bce 100755
--- a/.config/x11/xprofile
+++ b/.config/x11/xprofile
@@ -9,6 +9,8 @@ setxkbmap dvorak &
 # compositor
 picom --experimental-backend &
 
+redshift-gtk -l 34.92866:138.59863 &
+
 # cursor
 xsetroot -cursor_name left_ptr
 
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index dfa89ab..e582587 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,5 +1,5 @@
 # If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/.local/bin:$PATH
+export PATH=$HOME/.local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
 export ZSH="/home/solomon/.oh-my-zsh"
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 0e310da..7852621 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -1,5 +1,6 @@
 --
 -- Xmonad config for Solomon Laing
+-- Based heavily on the work of Derek Taylor (DistroTube)
 --
 
 -- Base
@@ -69,7 +70,7 @@ import XMonad.Util.SpawnOnce
 
 -- A simple way to switch between desktop and laptop related things
 isLaptop :: Bool
-isLaptop = True
+isLaptop = False
 
 
 --THEME
@@ -368,6 +369,8 @@ myStandardEZKeys =
     , ("S-<XF86AudioLowerVolume>", spawn "dec-source-volume") -- decrease input volume
     , ("S-<XF86AudioRaiseVolume>", spawn "inc-source-volume") -- increase input volume
     , ("S-<XF86AudioMute>", spawn "toggle-source-mute") -- toggle input mute
+    , ("<XF86AudioPlay>", spawn "playerctl play-pause") -- toggle play/pause for compatible media
+    , ("<XF86AudioPause>", spawn "playerctl play-pause") -- toggle play/pause for compatible media
 
     --NOTE extras
     , ("M-S-/", spawn "xmonad-keys-help") -- show keybinds