diff --git a/bin/fzf-tmux b/bin/fzf-tmux new file mode 120000 index 0000000..e47790f --- /dev/null +++ b/bin/fzf-tmux @@ -0,0 +1 @@ +/home/keegan/.dotfiles/src/fzf/bin/fzf-tmux \ No newline at end of file diff --git a/install.conf.yaml b/install.conf.yaml index ebeb90d..254729e 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -13,14 +13,12 @@ - clean: ~/.vim: recursive: true - ~/.tmux: - recurive: true ~/.oh-my-zsh/custom: recursive: true - shell: - [bin/pre-install.sh] - - [git submodule update --init --recursive, Installing submodules] + - [git submodule update --init --recursive --remote, Installing submodules] - [cd src/tmux-mem-cpu-load && cmake . && make, Building tmux-mem-cpu-load] - [cd src/fzf && make, Building fzf] @@ -29,7 +27,6 @@ ~/.vimrc: ~/.zshrc: force: true - ~/.tmux: ~/.tmux.conf: ~/.oh-my-zsh/custom: path: oh-my-zsh/custom @@ -48,8 +45,3 @@ ~/bin/fzf-tmux: src/fzf/bin/fzf-tmux # custom systemd for time tracking ~/.config/systemd/user/timesheet.service: src/timetracker/timesheet.service - -# need to do after folders linked -- shell: - - [~/.tmux/plugins/tpm/bin/install_plugins, Installing Tmux Plugins] - - [~/.tmux/plugins/tpm/bin/update_plugins all, Updating Tmux Plugins] diff --git a/tmux.conf b/tmux.conf index 2f41818..cbc07a7 100644 --- a/tmux.conf +++ b/tmux.conf @@ -41,5 +41,8 @@ set -g status-left-length 100 #set -g @continuum-systemd-start-cmd 'new-session -d -s doormat' +# auto install plugins +if "test ! -d ~/.tmux/plugins/tpm" \ + "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'" # run tpm run '~/.tmux/plugins/tpm/tpm' diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm deleted file mode 160000 index b699a7e..0000000 --- a/tmux/plugins/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b699a7e01c253ffb7818b02d62bce24190ec1019