Changed ssh config host order, added zdots alias

config/alias

@@ -68,9 +68,11 @@ alias code_scanner='docker run \
 alias composerUp='composer global update'
 alias npmUp='npm -g up'
 
-alias zedit='code ~/.zshrc ~/.alias'
+alias zedit='$EDITOR ~/.zshrc ~/.alias'
+alias zdots='$EDITOR ~/.dotfiles'
 
 if [[ -f "$HOME/.aliases.local" ]]; then
   # shellcheck disable=SC1091
   source "$HOME/.aliases.local"
 fi
+

config/nvim/init.lua

@@ -57,6 +57,17 @@ require('packer').startup(function(use)
   -- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available
   use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', cond = vim.fn.executable 'make' == 1 }
 
+  use {
+    "folke/which-key.nvim",
+    config = function()
+      require("which-key").setup {
+        -- your configuration comes here
+        -- or leave it empty to use the default settings
+        -- refer to the configuration section below
+      }
+    end
+  }
+
   -- Add custom plugins to packer from ~/.config/nvim/lua/custom/plugins.lua
   local has_plugins, plugins = pcall(require, 'custom.plugins')
   if has_plugins then
@@ -196,8 +207,12 @@ require('telescope').setup {
 pcall(require('telescope').load_extension, 'fzf')
 
 -- See `:help telescope.builtin`
-vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
-vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
+vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, {
+  desc = '[?] Find recently opened files'
+})
+vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, {
+  desc = '[ ] Find existing buffers'
+})
 vim.keymap.set('n', '<leader>/', function()
   -- You can pass additional configuration to telescope to change theme, layout, etc.
   require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {

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",
@@ -188,10 +188,20 @@ _G.packer_plugins = {
     loaded = true,
     path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/vim-sleuth",
     url = "https://github.com/tpope/vim-sleuth"
+  },
+  ["which-key.nvim"] = {
+    config = { "\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14which-key\frequire\0" },
+    loaded = true,
+    path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/which-key.nvim",
+    url = "https://github.com/folke/which-key.nvim"
   }
 }
 
 time([[Defining packer_plugins]], false)
+-- Config for: which-key.nvim
+time([[Config for which-key.nvim]], true)
+try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14which-key\frequire\0", "config", "which-key.nvim")
+time([[Config for which-key.nvim]], false)
 -- Conditional loads
 time([[Conditional loading of telescope-fzf-native.nvim]], true)
   require("packer.load")({"telescope-fzf-native.nvim"}, {}, _G.packer_plugins)

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
+

local/bin/dfm

@@ -32,7 +32,7 @@ function section_install
       curl -L git.io/antigen > "$DOTFILES/local/bin/antigen.zsh" && msg_done "🎉 Done!"
       ;;
     brew)
-      brew bundle install --file="$BREWFILE" && echo "🎉 Done!"
+      brew bundle install --file="$BREWFILE" && msg_done "🎉 Done!"
       ;;
     macos)
       bash "$DOTFILES/scripts/set-macos-defaults.sh" && msg_done "🎉 Done!"
@@ -70,7 +70,7 @@ function section_brew
 
   case "$1" in
     install)
-      brew bundle install --file="$BREWFILE" && echo "🎉 Done!"
+      brew bundle install --file="$BREWFILE" && msg_done "🎉 Done!"
       ;;
     update)
       brew update && brew outdated && brew upgrade && brew cleanup
@@ -81,7 +81,7 @@ function section_brew
       brew bundle dump \
         --force \
         --file="$BREWFILE" \
-        --describe && msg_ok "🎉 Done!"
+        --describe && msg_done "🎉 Done!"
       ;;
     autoupdate)
       brew autoupdate start 43200 --upgrade --cleanup --immediate
@@ -102,7 +102,7 @@ function section_dotfiles
 
   case "$1" in
     link)
-      rcup -B "$HOSTNAME" -f -v && echo "🎉 Done!"
+      rcup -B "$HOSTNAME" -f -v && msg_done "🎉 Done!"
       ;;
     update)
       # Updates .dotfiles/scripts/install.sh and formats it
@@ -111,7 +111,7 @@ function section_dotfiles
         && sed -i '' "s|$HOME|\$HOME|g" "$INSTALL_SCRIPT" \
         && sed -i '' "s|install.sh|$(basename $INSTALL_SCRIPT)|g" "$INSTALL_SCRIPT"
       $0 dotfiles shfmt
-      echo "🎉 Done!"
+      msg_done "🎉 Done!"
       ;;
     shfmt)
       # Format shell scripts according to following rules.
@@ -121,7 +121,6 @@ function section_dotfiles
         --write \
         --diff \
         --simplify \
-        --language-dialect bash \
         --indent 2 \
         --binary-next-line \
         --case-indent \

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"

ssh/config

@@ -1,2 +1,16 @@
+Host github.com
+ User git
+ 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
+
 Host *
-	IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+ IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+

vuerc

@@ -20,4 +20,5 @@
       "cssPreprocessor": "dart-sass"
     }
   }
-}
+}
+

zshrc

@@ -27,6 +27,10 @@ if command -v go &> /dev/null; then
     fi
 fi
 
+if command -v nvim &> /dev/null; then
+    export EDITOR="nvim"
+fi
+
 LOCAL_BIN="$HOME/.local/bin"
 COMPOSER_DIR="$HOME/.composer/vendor/bin"
 export PATH="$LOCAL_BIN:$COMPOSER_DIR:$PATH"