From ed3b3470003bf3bcb9ea605daf9d8c68458474df Mon Sep 17 00:00:00 2001
From: Matt Singleton <matt@xcolour.net>
Date: Tue, 11 Apr 2023 16:05:05 -0500
Subject: streamline deploy script

---
 config/all/tmux/tmux.conf | 55 -----------------------------------
 deploy.sh                 | 73 ++++++++++-------------------------------------
 2 files changed, 15 insertions(+), 113 deletions(-)
 delete mode 100644 config/all/tmux/tmux.conf

diff --git a/config/all/tmux/tmux.conf b/config/all/tmux/tmux.conf
deleted file mode 100644
index b1b98e0..0000000
--- a/config/all/tmux/tmux.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-# vi bindings
-set -g status-keys vi
-setw -g mode-keys vi
-
-# reasonable history buffer
-set -g history-limit 10000
-
-# status line
-setw -g window-status-current-style bright
-set -g status-right '#(date "+%H:%M %Z %Y-%m-%d")'
-set -g status-style bg=white
-set -g status-left " #S@#h "
-set -g status-left-length 15
-set -g status-left-style bg=green,fg=white
-
-# ui
-set -g set-titles on
-set -g default-terminal "screen-256color"
-set -ga terminal-overrides ",xterm-256color:Tc"
-set -g pane-border-style fg=white
-
-# splits
-bind | split-window -h
-bind \\ split-window -h
-bind - split-window -v
-
-# reversed to match vim split names
-bind v select-layout even-horizontal
-bind h select-layout even-vertical
-
-# vim-style resize
-bind -r H resize-pane -L 2
-bind -r J resize-pane -D 2
-bind -r K resize-pane -U 2
-bind -r L resize-pane -R 2
-
-# vim-style move
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# unbind arrow keys
-unbind Up
-unbind Down
-unbind Left
-unbind Right
-unbind M-Up
-unbind M-Down
-unbind M-Left
-unbind M-Right
-unbind C-Up
-unbind C-Down
-unbind C-Left
-unbind C-Right
diff --git a/deploy.sh b/deploy.sh
index 1ff1d37..4fae34d 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -41,43 +41,37 @@ if [ "linux" = "$uname" ]; then
 fi
 
 function link {
-    link_src="$1"
-    link_dest="$2"
-    if [ -e "$link_dest" ] && [ ! -L "$link_dest" ]; then
-        mkdir -p "../dotfiles-backup"
-        mv "$link_dest" "../dotfiles-backup/."
-    fi
-    ln -snf "$link_src" "$link_dest"
+  link_src="$1"
+  link_dest="$2"
+  if [ -e "$link_dest" ] && [ ! -L "$link_dest" ]; then
+    mkdir -p "dotfiles-backup"
+    mv "$link_dest" "dotfiles-backup/."
+  fi
+  ln -snf "$link_src" "$link_dest"
 }
 
 function deploy {
   deploy_src="$1"
   deploy_dest="$2"
   if [ -e "$deploy_src/all" ]; then
-    cd "$deploy_src/all"
-    for f in *
+    for f in "$deploy_src/all"/*
     do
-        link "$(pwd)/${f}" "$deploy_dest/${f}"
+      link "$(pwd)/$f" "$deploy_dest/$(basename "$f")"
     done
-    cd ../..
   fi
   if [ -e "$deploy_src/$uname" ]; then
-    cd "$deploy_src/$uname"
-    for f in *
+    for f in "$deploy_src/$uname"/*
     do
-        link "$(pwd)/${f}" "$deploy_dest/${f}"
+      link "$(pwd)/$f" "$deploy_dest/$(basename "$f")"
     done
-    cd ../..
   fi
 }
 
 # deploy to home
-cd home
-for f in *
+for f in home/*
 do
-    link "$(pwd)/${f}" "$HOME/.${f}"
+  link "$(pwd)/$f" "$HOME/.$(basename "$f")"
 done
-cd ..
 
 # deploy to XDG dirs
 deploy config "$xconfig"
@@ -98,12 +92,10 @@ if [ ! -e "$HOME/.vim/autoload/plug.vim" ]; then
 fi
 
 # deploy custom scripts to vim autoload
-cd vim
-for f in *
+for f in vim/*
 do
-    link "$(pwd)/$f" "$autoload/$f"
+  link "$(pwd)/$f" "$autoload/$(basename "$f")"
 done
-cd ..
 
 # create local files
 if [ ! -e "$HOME/.config/zsh/00-local.zsh" ]; then
@@ -122,38 +114,3 @@ if [ "$uname" = "linux" ]; then
       cp local/duplicity-excludes "$dconfig/excludes"
   fi
 fi
-
-# download custom fonts
-if command -v fc-cache > /dev/null; then
-    new_font=0
-    function get_font {
-        local font_name="$1"
-        local font_url="$2"
-        shift 2
-        local font_dir="$HOME/.local/share/fonts/$font_name"
-        mkdir -p "$font_dir"
-        if [ ! -d "$font_dir" ] || [ -z "$(ls -A "$font_dir" 2> /dev/null)" ]; then
-            $DLCMD "$font_dir/font.zip" "$font_url"
-            $UNZIPCMD "$font_dir/font.zip" "$@" -d "$font_dir"
-            rm "$font_dir/font.zip"
-            new_font=1
-        fi
-    }
-    if [ "$new_font" = "1" ]; then
-        echo "Hint: Run 'fc-cache -v' to rebuild your font cache"
-    fi
-fi
-
-# download sway wallpaper
-if command -v sway > /dev/null; then
-  bg_dir="$xdata/backgrounds"
-  if [ ! -d "$bg_dir" ] || [ -z "$(ls -A "$bg_dir" 2> /dev/null)" ]; then
-    mkdir -p "$bg_dir"
-  fi
-  if [ ! -e "$bg_dir/sway.png" ]; then
-    $DLCMD "$bg_dir/sway.png" "https://raw.githubusercontent.com/swaywm/sway/master/assets/Sway_Wallpaper_Blue_1366x768.png"
-  fi
-  if [ ! -e "$bg_dir/default" ]; then
-    ln -s "$bg_dir/sway.png" "$bg_dir/default"
-  fi
-fi
-- 
cgit v1.2.3