restructure of files

Author: RWejlgaard

Makefile

@@ -1,10 +1,15 @@
-install:
+full-install:
 	@bash ./install-scripts/01-install-packages.sh
 	@bash ./install-scripts/02-move-files.sh
 	@fish ./install-scripts/03-fisher-install.fish
 	@fish ./install-scripts/04-fish-plugins.fish
 	@fish ./install-scripts/05-tmux-plugins.fish
 	@fish ./install-scripts/06-vim-setup.fish
 	@bash ./install-scripts/07-last-touches.sh
+	@exec fish
 
-.PHONY: install
+refresh:
+	@bash ./install-scripts/02-move-files.sh
+	@exec fish
+
+.PHONY: full-install

config.fish

@@ -0,0 +1,27 @@
+# aliases
+
+# Package manager aliases
+if [ uname = "Darwin" ]
+    alias get="brew install"
+    alias search="brew search"
+else if [ -f /etc/arch-release ]
+    alias get="sudo pacman -S"
+    alias search="pacman -Ss"
+else if [ -f /etc/lsb-release ]
+    alias get="sudo apt install"
+    alias search="apt search"
+else if [ -f /etc/alpine-release ]
+    alias get="apk add"
+    alias search="apk search"
+else if [ uname = "FreeBSD" ]
+    alias get="sudo pkg install -y"
+    alias search="pkg search"
+end
+
+alias vim=nvim
+alias cat="bat -Pp"
+
+alias k="kubectl"
+alias kp="kubectl get pods -A"
+alias gswitch="gcloud config configurations activate"
+alias kc="kubectx"

config/fish/aliases.fish

@@ -0,0 +1,2 @@
+export fish_greeting="" # Silence welcome message
+export EDITOR=nvim

config/fish/config.fish

@@ -0,0 +1,20 @@
+# Replicate the behavior of `!!` in bash
+function last_history_item
+    echo $history[1]
+end
+abbr -a !! --position anywhere --function last_history_item
+
+# lookup various commands/syntax in a pinch
+function cheat --description "help <field> <topic>"
+	set args (echo $argv[2..-1] | tr ' ' '+')
+	curl "cht.sh/$argv[1]/$args"
+end
+
+# update master and create a branch with value: $1
+function gitissue
+  git reset --hard
+  git checkout master
+  git pull origin master
+  git branch $argv[1]
+  git checkout $argv[1]
+end

envvars.fish config/fish/envvars.fishenvvars.fish renamed to config/fish/envvars.fish

@@ -2,8 +2,6 @@ set -g prefix C-a
 unbind-key C-b
 bind-key C-a send-prefix
 
-set-option -g default-terminal "screen-256color"
-
 bind -n M-_ split-window -h -c "#{pane_current_path}"
 bind -n M-- split-window -v -c "#{pane_current_path}"
 unbind '"'
@@ -86,5 +84,5 @@ setw -g window-status-format ' #I #W ' # Window ID, Window Name
 setw -g window-status-bell-style 'fg=colour234 bg=colour0 bold'
 
 # plugins runs
-set-option -g status-interval 1
+set-option -g status-interval 5
 run -b '~/.tmux/plugins/tpm/tpm'

config/fish/functions.fish

@@ -180,7 +180,6 @@ require('mason-lspconfig').setup({
         'jsonls',
         'yamlls',
         'pyright',
-        'terraformls'
     },
     handlers = {
         lsp_zero.default_setup,
@@ -267,4 +266,4 @@ vim.diagnostic.config {
     underline = true
 }
 
-vim.cmd('colorscheme carbonfox')
+vim.cmd('colorscheme murphy')

tmux.conf config/tmux/tmux.conftmux.conf renamed to config/tmux/tmux.conf

@@ -11,6 +11,7 @@ PACKAGES=(
   "go"
   "npm"
   "ripgrep"
+  "exa"
 )
 
 # if MacOS install Homebrew
@@ -25,19 +26,21 @@ fi
 # if Arch install
 if [ -f /etc/arch-release ]; then
     # install yay
-    sudo pacman -S --noconfirm base-devel
-    git clone https://aur.archlinux.org/yay.git
-    cd yay
-    makepkg -si --noconfirm
-    cd ..
-    rm -rf yay
+    if [ -z $(which yay) ]; then
+        sudo pacman -S --noconfirm base-devel
+        git clone https://aur.archlinux.org/yay.git
+        cd yay
+        makepkg -si --noconfirm
+        cd ..
+        rm -rf yay
+    fi
 
     # install packages
     sudo pacman -S --noconfirm "${PACKAGES[@]}"
 fi
 
 # if debian or ubuntu install
-if [ -f /etc/lsb-release ] || [ -f /etc/debian_version ]; then
+if [ -f /etc/debian_version ]; then
     # replace "go" with "golang" for debian
     PACKAGES=("${PACKAGES[@]/go/golang}")
 

init.lua config/vim/init.luainit.lua renamed to config/vim/init.lua

@@ -7,15 +7,18 @@ mkdir -p ~/.config/fish
 mkdir -p ~/.config/fish/conf.d
 
 # vim
-cp init.lua ~/.config/nvim/
+cp config/vim/init.lua ~/.config/nvim/
 
 # fish
-cp config.fish ~/.config/fish/
+cp config/fish/config.fish ~/.config/fish/
+cp config/fish/aliases.fish ~/.config/fish/conf.d/
+cp config/fish/functions.fish ~/.config/fish/conf.d/
 
-# if envvars doesn't exist, copy it
+# Only copy envvars.fish if it doesn't exist.
+# This way we can override it with our own configs.
 if [ ! -f ~/.config/fish/conf.d/envvars.fish ]; then
-    cp envvars.fish ~/.config/fish/conf.d/
+    cp config/fish/envvars.fish ~/.config/fish/conf.d/
 fi
 
 # tmux
-cp tmux.conf ~/.tmux.conf
+cp config/tmux/tmux.conf ~/.tmux.conf