From be94425fb779edae9b51009e74808588be4d5e51 Mon Sep 17 00:00:00 2001
From: Cullum Smith <cullum@sacredheartsc.com>
Date: Thu, 25 Sep 2025 09:40:50 -0400
Subject: update dotfiles

---
 Makefile                    | 14 +++++++++-----
 git/.gitconfig              | 35 -----------------------------------
 git/git/config              | 35 +++++++++++++++++++++++++++++++++++
 sh/.shrc                    |  2 +-
 tmux/.config/tmux/tmux.conf | 22 ----------------------
 tmux/tmux/tmux.conf         | 22 ++++++++++++++++++++++
 6 files changed, 67 insertions(+), 63 deletions(-)
 delete mode 100644 git/.gitconfig
 create mode 100644 git/git/config
 delete mode 100644 tmux/.config/tmux/tmux.conf
 create mode 100644 tmux/tmux/tmux.conf

diff --git a/Makefile b/Makefile
index 6da2664..dfb4bdd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,18 @@
-PACKAGES  != find . -type d -depth 1 -not -name .git -exec basename {} \;
-STOW_ARGS  = --verbose --no-folding --target ${HOME}
+HOME_PACKAGES = readline sh vi vim
+XDG_PACKAGES  = tmux git
+STOW_ARGS  = --verbose --no-folding
 
 .PHONY: dry-run
 dry-run:
-	stow --no --restow ${STOW_ARGS} ${PACKAGES}
+	stow --no --restow ${STOW_ARGS} --target ${HOME}            ${HOME_PACKAGES}
+	stow --no --restow ${STOW_ARGS} --target ${XDG_CONFIG_HOME} ${XDG_PACKAGES}
 
 .PHONY: install
 install:
-	stow --restow ${STOW_ARGS} ${PACKAGES}
+	stow --restow ${STOW_ARGS} --target ${HOME}            ${HOME_PACKAGES}
+	stow --restow ${STOW_ARGS} --target ${XDG_CONFIG_HOME} ${XDG_PACKAGES}
 
 .PHONY: uninstall
 uninstall:
-	stow --delete ${STOW_ARGS} ${PACKAGES}
+	stow --delete ${STOW_ARGS} --target ${HOME}            ${HOME_PACKAGES}
+	stow --delete ${STOW_ARGS} --target ${XDG_CONFIG_HOME} ${XDG_PACKAGES}
diff --git a/git/.gitconfig b/git/.gitconfig
deleted file mode 100644
index 69405ed..0000000
--- a/git/.gitconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-[user]
-  name = Cullum Smith
-  email = cullum@sacredheartsc.com
-
-[core]
-  pager = less -FX
-  askPass =
-
-[color]
-  ui = auto
-
-[diff]
-  mnemonicPrefix = true
-  colorMoved = zebra
-
-[grep]
-  extendedRegexp = true
-
-[merge]
-  conflictStyle = diff3
-
-[fetch]
-  prune = true
-
-[pull]
-  ff = only
-
-[status]
-  showUntrackedFiles = all
-
-[tag]
-  sort = version:refname
-
-[http]
-  emptyAuth = true
diff --git a/git/git/config b/git/git/config
new file mode 100644
index 0000000..69405ed
--- /dev/null
+++ b/git/git/config
@@ -0,0 +1,35 @@
+[user]
+  name = Cullum Smith
+  email = cullum@sacredheartsc.com
+
+[core]
+  pager = less -FX
+  askPass =
+
+[color]
+  ui = auto
+
+[diff]
+  mnemonicPrefix = true
+  colorMoved = zebra
+
+[grep]
+  extendedRegexp = true
+
+[merge]
+  conflictStyle = diff3
+
+[fetch]
+  prune = true
+
+[pull]
+  ff = only
+
+[status]
+  showUntrackedFiles = all
+
+[tag]
+  sort = version:refname
+
+[http]
+  emptyAuth = true
diff --git a/sh/.shrc b/sh/.shrc
index c35c7bd..80195c8 100644
--- a/sh/.shrc
+++ b/sh/.shrc
@@ -6,7 +6,7 @@ unset reset blue green
 
 export CLICOLOR=1
 export PAGER=less
-export LESS='-iMRS -x2'
+export LESS='-iMRSF -x2'
 export EDITOR=vim
 export LSCOLORS=DxfxgxgxcxxbxbaCacADAd
 
diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf
deleted file mode 100644
index 3192bf2..0000000
--- a/tmux/.config/tmux/tmux.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-set -g default-terminal "tmux-256color"
-set -s escape-time 0
-setw -g mode-keys vi
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-bind-key -T copy-mode-vi 'v' send -X begin-selection
-bind-key -T copy-mode-vi 'y' send -X copy-selection
-
-# zenburn
-setw -g clock-mode-colour colour117
-setw -g mode-style bold,fg=colour117,bg=colour238
-set -g status-style bg=colour235,fg=colour248
-setw -g window-status-current-style bold,fg=colour223,bg=colour237
-set -g message-style bold,fg=colour117,bg=colour235
-
-set-option -g set-titles on
-set-option -g set-titles-string "tmux [#S:#I] #T"
-set-option -g status-right "#(whoami)@#h #[fg=colour187,bold]%a %Y-%m-%d %H:%M"
-set -g status-right-length 50
-set -g status-left-length 20
diff --git a/tmux/tmux/tmux.conf b/tmux/tmux/tmux.conf
new file mode 100644
index 0000000..3192bf2
--- /dev/null
+++ b/tmux/tmux/tmux.conf
@@ -0,0 +1,22 @@
+set -g default-terminal "tmux-256color"
+set -s escape-time 0
+setw -g mode-keys vi
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+bind-key -T copy-mode-vi 'v' send -X begin-selection
+bind-key -T copy-mode-vi 'y' send -X copy-selection
+
+# zenburn
+setw -g clock-mode-colour colour117
+setw -g mode-style bold,fg=colour117,bg=colour238
+set -g status-style bg=colour235,fg=colour248
+setw -g window-status-current-style bold,fg=colour223,bg=colour237
+set -g message-style bold,fg=colour117,bg=colour235
+
+set-option -g set-titles on
+set-option -g set-titles-string "tmux [#S:#I] #T"
+set-option -g status-right "#(whoami)@#h #[fg=colour187,bold]%a %Y-%m-%d %H:%M"
+set -g status-right-length 50
+set -g status-left-length 20
-- 
cgit v1.2.3