From d3b2fc6b41764620a4d324eca60007424bf2ba81 Mon Sep 17 00:00:00 2001
From: Marley Rae <marley@punkfairie.net>
Date: Mon, 29 Jan 2024 20:06:46 -0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=20Use=20ln=20instead=20of?=
 =?UTF-8?q?=20ls=20for=20soft=20links?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .tmux.conf      | 70 -------------------------------------------------
 script/dot.fish |  4 +--
 2 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 .tmux.conf

diff --git a/.tmux.conf b/.tmux.conf
deleted file mode 100644
index fd47739..0000000
--- a/.tmux.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'catppuccin/tmux'
-set -g @plugin 'Morantron/tmux-fingers'
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-# catppuccin
-set -g @catppuccin_flavour 'mocha'
-
-set -g @catppuccin_window_left_separator " "
-set -g @catppuccin_window_right_separator ""
-set -g @catppuccin_window_middle_separator "█ "
-set -g @catppuccin_window_number_position "left"
-
-set -g @catppuccin_window_default_fill "number"
-set -g @catppuccin_window_default_text "#W"
-
-set -g @catppuccin_window_current_fill "number"
-set -g @catppuccin_window_current_text "#W"
-
-set -g @catppuccin_status_modules_left "directory"
-set -g @catppuccin_status_modules_right "user host session date_time"
-set -g @catppuccin_status_left_separator  " "
-set -g @catppuccin_status_right_separator ""
-set -g @catppuccin_status_right_separator_inverse "no"
-set -g @catppuccin_status_fill "icon"
-set -g @catppuccin_status_connect_separator "no"
-
-set -g @catppuccin_directory_text "#{pane_current_path}"
-set -g @catppuccin_date_time_text "%b %d • %I:%M %p"
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-
-# Remap prefix.
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-# Vi copy mode.
-set-window-option -g mode-keys vi
-
-bind-key -T copy-mode-vi 'v' send -X begin-selection
-bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel
-
-# Better split commands.
-bind | split-window -h -c "#{pane_current_path}" # cmd-| in iTerm2
-bind - split-window -v -c "#{pane_current_path}" # cmd-- in iTerm2
-unbind '"'
-unbind %
-
-# Vi-like resizing.
-bind-key j resize-pane -D # cmd-j in iTerm2
-bind-key k resize-pane -U # cmd-k in iTerm2
-bind-key h resize-pane -L # cmd-h in iTerm2
-bind-key l resize-pane -R # cmd-l in iTerm2
-
-# Easy reload config.
-bind r source-file ~/.tmux.conf
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-# Install tpm if not already installed.
-if "test ! -d ~/.tmux/plugins/tpm" \
-   "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
-
-# Init tmux plugin manager.
-# Must be very last line!!
-run '~/.tmux/plugins/tpm/tpm'
diff --git a/script/dot.fish b/script/dot.fish
index 2d30551..4b3d01f 100755
--- a/script/dot.fish
+++ b/script/dot.fish
@@ -96,7 +96,7 @@ function link_file -a src dst
     if string match -e '.hardlink' "$src" &> /dev/null
       ln "$src" "$dst" &> /dev/null
     else
-      ls -s "$src" "$dst" &> /dev/null
+      ln -s "$src" "$dst" &> /dev/null
     end
 
     print_success "Linked $src to $dst"
@@ -114,7 +114,7 @@ function install_dotfiles
   set -l regex (string join '' '^' "$path" '\/[a-zA-Z]+\/(.+)\.(sym|hard)link$')
 
   for src in (find -H "$DOT" -name "*.symlink" -or -name "*.hardlink" -not -path ".git")
-    link_file $src "$(string replace -r $regex '$1' "$src")"
+    link_file $src "$HOME/$(string replace -r $regex '$1' "$src")"
   end
 end