From 2a5b2400d7be43736bac80240a3646f4be0688fa Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 22 Dec 2022 13:59:00 +0200 Subject: [PATCH] Add tmux config, fix ssh config, updated nvim pkg --- config/nvim/plugin/packer_compiled.lua | 10 ++--- config/tmux/tmux.conf | 53 ++++++++++++++++++++++++++ scripts/install-dotfiles.sh | 1 + ssh/config | 15 +++++++- 4 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 config/tmux/tmux.conf diff --git a/config/nvim/plugin/packer_compiled.lua b/config/nvim/plugin/packer_compiled.lua index 516468f..d1846f8 100644 --- a/config/nvim/plugin/packer_compiled.lua +++ b/config/nvim/plugin/packer_compiled.lua @@ -146,16 +146,16 @@ _G.packer_plugins = { path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/opt/nvim-treesitter-textobjects", url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects" }, - ["onedark.nvim"] = { - loaded = true, - path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/onedark.nvim", - url = "https://github.com/navarasu/onedark.nvim" - }, ["packer.nvim"] = { loaded = true, path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/packer.nvim", url = "https://github.com/wbthomason/packer.nvim" }, + ["palenight.vim"] = { + loaded = true, + path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/palenight.vim", + url = "https://github.com/drewtempelmeyer/palenight.vim" + }, ["plenary.nvim"] = { loaded = true, path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/plenary.nvim", diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf new file mode 100644 index 0000000..d3cbb4c --- /dev/null +++ b/config/tmux/tmux.conf @@ -0,0 +1,53 @@ +# ~/.config/tmux/tmux.conf, or .dotfiles/config/tmux/tmux.conf +# +# Contains configuration from the follwing sources: +# - https://tmuxguide.readthedocs.io/en/latest/tmux/tmux.html +# - + +# unbind default prefix and set it to ctrl-a +unbind C-b +set -g prefix C-a +bind C-a send-prefix + +# make delay shorter +set -sg escape-time 0 + + + +#### key bindings #### + +# reload config file +bind r source-file ~/.dotfiles/config/tmux/tmux.conf \; display "tmux.conf reloaded!" + +# quickly open a new window +bind N new-window + +# synchronize all panes in a window +bind y setw synchronize-panes + +# pane movement shortcuts (same as vim) +bind h select-pane -L +bind j select-pane -D +bind k select-pane -U +bind l select-pane -R + +# enable mouse support for switching panes/windows +#set -g mouse-utf8 on +#set -g mouse on + +#### copy mode : vim #### + +# set vi mode for copy mode +setw -g mode-keys vi + +# copy mode using 'Esc' +unbind [ +bind Escape copy-mode + +# start selection with 'space' and copy using 'y' +#bind -t vi-copy 'y' copy-selection + +# paste using 'p' +unbind p +bind p paste-buffer + diff --git a/scripts/install-dotfiles.sh b/scripts/install-dotfiles.sh index e0c2cb1..e5bed2a 100644 --- a/scripts/install-dotfiles.sh +++ b/scripts/install-dotfiles.sh @@ -77,6 +77,7 @@ handle_file_ln "$HOME/.dotfiles/config/git/config" "$HOME/.config/git/config" handle_file_ln "$HOME/.dotfiles/config/git/gitignore" "$HOME/.config/git/gitignore" handle_file_ln "$HOME/.dotfiles/config/nvim/init.lua" "$HOME/.config/nvim/init.lua" handle_file_ln "$HOME/.dotfiles/config/nvim/plugin/packer_compiled.lua" "$HOME/.config/nvim/plugin/packer_compiled.lua" +handle_file_ln "$HOME/.dotfiles/config/tmux/tmux.conf" "$HOME/.config/tmux/tmux.conf" handle_file_ln "$HOME/.dotfiles/config/wtf/config.yml" "$HOME/.config/wtf/config.yml" handle_file_ln "$HOME/.dotfiles/git_profiles" "$HOME/.git_profiles" handle_file_ln "$HOME/.dotfiles/huskyrc" "$HOME/.huskyrc" diff --git a/ssh/config b/ssh/config index 10cab31..80f478e 100644 --- a/ssh/config +++ b/ssh/config @@ -1,2 +1,15 @@ Host * - IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" + IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" + +Host github.com + HostName github.com + IdentityFile ~/.ssh/id_rsa + +Host bitbucket.com + Hostname bitbucket.com + IdentityFile ~/.ssh/id_rsa + +Host gitlab.com + Hostname gitlab.com + IdentityFile ~/.ssh/id_rsa +