feat: Cleanup some nvim config

nvim/m-housh/init.lua

@@ -9,7 +9,7 @@ require('user.autocmd')
 require('user.plugins')
 
 -- Key maps
-require('user.mappings')
+require('user.keymaps')
 
 -- Theme (must stay after plugins are loaded)
 require('user.theme')
@@ -18,4 +18,3 @@ require('user.theme')
 require('user.settings')
 
 vim.o.shiftwidth = 2
-

nvim/m-housh/lua/user/keymaps.lua

@@ -0,0 +1,107 @@
+vim.g.mapleader = " "
+vim.g.maplocalleader = " "
+
+local keymap = vim.keymap.set
+local default_options = {noremap = true, silent = true}
+local telescope = require('telescope.builtin')
+local wk = require("which-key")
+
+local wk_add = function(mode, keymaps)
+  wk.add(keymaps, { mode = mode, noremap = true, silent = true })
+end
+
+local find_files = function(dir)
+  return function()
+    telescope.find_files({ cwd = dir, hidden = true, no_ignore = true })
+  end
+end
+
+--------------------------------------------------------------------------------
+-- Insert Mode
+--------------------------------------------------------------------------------
+-- easier escape key mapping
+keymap('i', 'jk', '<ESC>', default_options)
+wk_add("i", {
+  { "<C-s>", "<ESC>:write<CR>a", desc = "[S]ave" }
+})
+
+--------------------------------------------------------------------------------
+-- Normal Mode
+--------------------------------------------------------------------------------
+wk_add("n", {
+  { "<Left>", ":vertical resize +1<CR>", desc = "Resize Pane Left" },
+  { "<Right>", ":vertical resize -1<CR>", desc = "Resize Pane Right" },
+  { "<Up>", "resize -1<CR>", desc = "Resize Pane Up" },
+  { "<Down>", "resize +1<CR>", desc = "Resize Pane Down" },
+
+  { "<leader>n", "<CMD>:noh<CR>", desc = "[N]o highlighting" },
+  { "<leader>s", "<CMD>:set spell!<CR>", desc = "[S]pell check toggle" },
+  { "<C-n>", "<CMD>:Neotree toggle<CR>", desc = "Toggle Neotree" },
+  { "<C-s>", "<CMD>:write<CR>", desc = "[S]ave" },
+
+  -- Git
+  { "<leader>gg", ":LazyGit<CR>", desc = "Open [G]it" },
+  { "<leader>gf", ":Telescope git_files<CR>", desc = "Find [G]it [F]ile" },
+  { "<leader>t", ":ToggleTerm<CR>", desc = "Open [T]erminal" },
+
+  -- Telescope keymaps
+  { "<leader>ff", telescope.find_files, desc = "[F]ind [F]iles" },
+  { "<leader>fg", telescope.live_grep, desc = "[F]ind [G]rep" },
+  { "<leader>fb", telescope.buffers, desc = "[F]ind [B]uffers" },
+  { "<leader>fh", telescope.help_tags, desc = "[F]ind [H]elp" },
+  { "<leader>fd", find_files('$DOTFILES'), desc = "[F]ind [D]otfiles" },
+  { "<leader>fn", find_files('$DOTFILES/nvim/m-housh'), desc = "[F]ind [N]vim file" },
+  { "<leader>fs", find_files('$DOTFILES/scripts/scripts'), desc = "[F]ind [S]cript" },
+  { "<leader>fz", find_files('$DOTFILES/zsh/config'), desc = "[F]ind [Z]sh config file" },
+  { "<leader>z", "<CMD>:ZenMode<CR>", desc = "[Z]en Mode" },
+})
+
+--------------------------------------------------------------------------------
+-- Visual Mode
+--------------------------------------------------------------------------------
+wk_add("v", {
+  { "p", "\"_dP", desc = "[P]aste" },
+})
+
+wk_add("x", {
+  { "K", ":move '<-2<CR>gv-gv", desc = "Move selected block up" },
+  { "J", ":move '>+1<CR>gv-gv", desc = "Move selected block down" },
+})
+
+-- Toggle term key maps, that get attached when terminal is opened.
+function _G.set_terminal_keymaps()
+  local opts = { buffer = 0 }
+  keymap('t', '<esc>', [[<C-\><C-n>]], opts)
+end
+vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')
+
+-- LuaSnip Keymaps
+--local ls = require('luasnip')
+
+-- <c-k> to expand snippets.
+-- This will expand the snippet or jump to the next item within the snippet.
+-- vim.keymap.set({ "i", "s" }, "<c-k>", function()
+--   if ls.expand_or_jumpable() then
+--     ls.expand_or_jump()
+--   end
+-- end, { silent = true })
+
+
+-- <c-j>
+-- This will jump backwards in the snippet.
+-- vim.keymap.set({ "i", "s" }, "<c-j>", function()
+--   if ls.jumpable(-1) then
+--     ls.jump(-1)
+--   end
+-- end, { silent = true })
+
+-- <c-l>
+-- This is for selecting withing a list of options.
+-- vim.keymap.set("i", "<c-l>", function()
+--   if ls.choice_active() then
+--     ls.change_choice(1)
+--   end
+-- end, { silent = true })
+
+-- Reload the snippets.
+--vim.keymap.set("n", "<leader><leader>s", "<cmd>source ~/.config/m-housh/lua/snippets/init.lua<cr>")

nvim/m-housh/lua/user/mappings.lua

@@ -1,126 +0,0 @@
-local keymap = vim.keymap.set
-local default_options = {noremap = true, silent = true}
-local telescope = require('telescope.builtin')
--- local expr_options = {noremap = true, expr = true, silent = true}
-vim.g.mapleader = " "
-vim.g.maplocalleader = " "
-
--- easier escape key mapping
-keymap('i', 'jk', '<ESC>', default_options)
-
-keymap('n', '<c-s>', ':w<CR>', default_options)
-keymap('i', '<c-s>', '<ESC>:w<CR>a', default_options)
-
--- paste over currently selected text without yanking it
-keymap("v", "p", "\"_dP", default_options)
-
--- buffer focus
--- keymap('n', '<c-j>', '<c-w>j', default_options)
--- keymap('n', '<c-h>', '<c-w>h', default_options)
--- keymap('n', '<c-k>', '<c-w>k', default_options)
--- keymap('n', '<c-l>', '<c-w>l', default_options)
-
--- Resizing panes
-keymap("n", "<Left>", ":vertical resize +1<CR>", default_options)
-keymap("n", "<Right>", ":vertical resize -1<CR>", default_options)
-keymap("n", "<Up>", ":resize -1<CR>", default_options)
-keymap("n", "<Down>", ":resize +1<CR>", default_options)
-
--- Move selected line / block of text in visual mode
-keymap("x", "K", ":move '<-2<CR>gv-gv", default_options)
-keymap("x", "J", ":move '>+1<CR>gv-gv", default_options)
-
--- Toggle neo-tree open or closed
-keymap("n", "<c-n>", "<CMD>:Neotree toggle<CR>", default_options)
-
--- Toggle Lazy Git
-keymap("n", '<leader>gg', ':LazyGit<CR>', default_options)
-keymap("n", "<leader>gf", ":Telescope git_files<CR>", default_options)
-keymap("n", "<leader>t", ":ToggleTerm<CR>", default_options)
-
--- Zen Mode Toggle
-keymap('n', '<leader>z', "<cmd>:ZenMode<CR>", default_options)
-
--- Toggle term key maps, that get attached when terminal is opened.
-function _G.set_terminal_keymaps()
-  local opts = { buffer = 0 }
-  vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
-end
-
-vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')
-
--- Formatting
-keymap('n', '<leader>f', '<cmd>:Format<CR>', default_options)
-keymap('n', '<leader>F', '<cmd>:FormatWrite<CR>', default_options)
-
--- Telescope keymaps
-vim.keymap.set('n', '<leader>ff', telescope.find_files, {})
-vim.keymap.set('n', '<leader>fg', telescope.live_grep, {})
-vim.keymap.set('n', '<leader>fb', telescope.buffers, {})
-vim.keymap.set('n', '<leader>fh', telescope.help_tags, {})
-
--- Find espanso config files.
-keymap('n', '<leader>fe', function()
-  telescope.find_files({
-    cwd='$HOME/.dotfiles/espanso/espanso'
-  })
-end, default_options)
-
--- Find nvim config files.
-keymap('n', '<leader>fn', function()
-  telescope.find_files({
-    cwd='$HOME/.dotfiles/nvim/m-housh'
-  })
-end, default_options)
-
--- Find script files.
-keymap('n', '<leader>fs', function()
-  telescope.find_files({
-    cwd='$HOME/.dotfiles/scripts/scripts'
-  })
-end, default_options)
-
---   Find zsh config files.
-keymap('n', '<leader>fz', function()
-  telescope.find_files({
-    cwd = '$HOME/.dotfiles/zsh/config',
-    hidden = true
-  })
-end, default_options)
-
--- Turn off highlighting after search.
-keymap('n', '<leader>n', '<cmd>:noh<cr>', default_options)
-
--- Toggle Spell Checking.
-keymap('n', '<leader>s', '<cmd>:set spell!<cr>', default_options)
-
--- LuaSnip Keymaps
---local ls = require('luasnip')
-
--- <c-k> to expand snippets.
--- This will expand the snippet or jump to the next item within the snippet.
--- vim.keymap.set({ "i", "s" }, "<c-k>", function()
---   if ls.expand_or_jumpable() then
---     ls.expand_or_jump()
---   end
--- end, { silent = true })
-
-
--- <c-j>
--- This will jump backwards in the snippet.
--- vim.keymap.set({ "i", "s" }, "<c-j>", function()
---   if ls.jumpable(-1) then
---     ls.jump(-1)
---   end
--- end, { silent = true })
-
--- <c-l>
--- This is for selecting withing a list of options.
--- vim.keymap.set("i", "<c-l>", function()
---   if ls.choice_active() then
---     ls.change_choice(1)
---   end
--- end, { silent = true })
-
--- Reload the snippets.
---vim.keymap.set("n", "<leader><leader>s", "<cmd>source ~/.config/m-housh/lua/snippets/init.lua<cr>")

zsh/config/.zshenv

@@ -3,7 +3,7 @@
 # This includes general default environment variables, local overrides may be stored
 # in `$XDG_DATA_HOME/zsh/env.zsh`.
 
-# XDG
+# XDG Directories
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_STATE_HOME="$HOME/.local/state"
@@ -12,7 +12,7 @@ export XDG_CACHE_HOME="$HOME/.cache"
 # Config
 export ZDOTDIR="$HOME/.config/zsh"
 export ZFUNCDIR="$ZDOTDIR/functions"
-export SHELL="$(which zsh)"
+export SHELL="$(command -v zsh)"
 export TERM=xterm-256color
 export EDITOR=nvim
 export VISUAL=nvim
@@ -26,33 +26,28 @@ export GITUSER="m-housh"
 export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
 
 # Directories
+export ANSIBLE_GEN_DIR="$GHREPOS/ansible/ansible-gen-playbook"
+export ANSIBLE_LOCAL="$GHREPOS/ansible"
+export ANSIBLE_MACOS_PLAYBOOK_DIR="$HOME/ansible-macos-playbook"
 export ARCHIVE="/Volumes/Archive"
 export BUCKET="/Volumes/Bucket"
-export REPOS="/Volumes/Bucket/Repos"
+export DOTFILES="$HOME/.dotfiles"
-export GHREPOS="$REPOS/github.com"
-#export HHEREPOS="$REPOS/github.com/hhe-dev"
-#export HVACIOTREPOS="$REPOS/github.com/hvac-iot"
-export LOCAL_REPOS="$REPOS/local"
-export LOCAL_ENV="$XDG_DATA_HOME/zsh/env.zsh"
-#export HCP_NOTES="$HHEREPOS/hcp-notes"
-#export HXZET="$BUCKET/Repos/github.com/hvac-hx/hx-zets"
-#export HAAS="$BUCKET/Repos/github.com/haas"
-#export HAASZET="$HAAS/zets"
 export DOCUMENTS="$HOME/Documents"
 export DOWNLOADS="$HOME/Downloads"
-export PDFS="$HOME/Library/Mobile Documents/com~apple~Preview/Documents"
+export GHREPOS="$REPOS/github.com"
-export PROPOSALS="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work/Proposals"
+export LOCAL_REPOS="$REPOS/local"
-export SCREENSHOTS="$BUCKET/Pictures/Screenshots"
+export LOCAL_ENV="$XDG_DATA_HOME/zsh/env.zsh"
-export DOTFILES="$HOME/.dotfiles"
-export SCRIPTS="$XDG_DATA_HOME/scripts"
-export WORK="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work"
-export ZETDIR="$GHREPOS/zets"
 export MYZSHRC="$ZDOTDIR/.zshrc"
 export NAP_CONFIG="$HOME/.config/nap/config.yaml"
-export SKELETONDIR="$DOTFILES/skeleton"
+export PDFS="$HOME/Library/Mobile Documents/com~apple~Preview/Documents"
-export ANSIBLE_GEN_DIR="$GHREPOS/ansible/ansible-gen-playbook"
+export PROPOSALS="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work/Proposals"
-export ANSIBLE_MACOS_PLAYBOOK_DIR="$GHREPOS/ansible/ansible-macos-playbook"
+export REPOS="/Volumes/Bucket/Repos"
+export SCREENSHOTS="$BUCKET/Pictures/Screenshots"
+export SCRIPTS="$XDG_DATA_HOME/scripts"
 export SITES="$GHREPOS/sites"
+export SKELETONDIR="$DOTFILES/skeleton"
+export WORK="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work"
+export ZETDIR="$GHREPOS/zets"
 
 # NPM
 export NPM_CONFIG_CACHE="$XDG_DATA_HOME/npm"
@@ -82,7 +77,6 @@ export PSQL_HISTORY="$XDG_DATA_HOME/psql_history"
 export VAULT_ADDR="https://vault.housh.dev"
 
 # Ansible
-export ANSIBLE_LOCAL="$GHREPOS/ansible"
 export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible"
 export ANSIBLE_VAULT_PASSWORD_FILE="$XDG_DATA_HOME/ansible/.vaultpwd"
 export DEFAULT_VAULT_PASSWORD_FILE="$XDG_DATA_HOME/ansible/.vaultpwd"