feat: More lazyvim configuration changes.

.markdownlint.jsonc

@@ -0,0 +1,3 @@
+{
+  "MD013": { "code_blocks": false }
+}

.prettierrc.yaml

@@ -0,0 +1,2 @@
+proseWrap: always
+printWidth: 80

gopass/config

@@ -1,13 +1,15 @@
 [mounts]
 	path = /Users/michael/.local/share/password-store
 [recipients]
-	hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3
+	hash = b73e3c328517ad0b8a03ab1ba113e117595d40ae355f1e42984a8f8144bafc4a
 [mounts "servers"]
 	path = /Users/michael/.local/share/gopass/stores/servers
 [recipients "homelab"]
-	hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3
+	hash = e4e019251bcd688aa1691b6b4363a9798593f4aed464afb63d11149ea771b4e0
 [mounts "homelab"]
 	path = /Users/michael/.local/share/gopass/stores/homelab
 [recipients "new-test"]
 	hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3
 [mounts "new-test"]
+[recipients "servers"]
+	hash = e4e019251bcd688aa1691b6b4363a9798593f4aed464afb63d11149ea771b4e0

gpg/LaunchAgents/gnupg.gpg-agent-symlink.plist

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/ProperyList-1.0/dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>net.jms1.gpg-agent-symlink</string>
+    <key>ProgramArguments</key>
+    <array>
+      <string>/bin/sh</string>
+      <string>-c</string>
+      <string>/bin/ln -sf $HOME/.gnupg/S.gpg-agent.ssh $SSH_AUTH_SOCK</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+  </dict>
+</plist>

gpg/LaunchAgents/gnupg.gpg-agent.plist

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>net.jms1.gpg-agent</string>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <false/>
+    <key>ProgramArguments</key>
+    <array>
+      <string>/usr/local/MacGPG2/bin/gpg-connect-agent</string>
+      <string>/bye</string>
+    </array>
+  </dict>
+</plist>

gpg/gpg-agent.conf

@@ -10,4 +10,4 @@ max-cache-ttl 120
 #pinentry-program /usr/bin/pinentry-x11
 #pinentry-program /usr/local/bin/pinentry-curses
 
-#pinentry-program /opt/homebrew/bin/pinentry-mac
+pinentry-program /opt/homebrew/bin/pinentry-mac

nvim/lazynvim/lazyvim.json

@@ -1,14 +1,28 @@
 {
   "extras": [
-    "lazyvim.plugins.extras.coding.luasnip",
+    "lazyvim.plugins.extras.coding.mini-snippets",
+    "lazyvim.plugins.extras.coding.mini-surround",
+    "lazyvim.plugins.extras.editor.fzf",
     "lazyvim.plugins.extras.editor.harpoon2",
     "lazyvim.plugins.extras.formatting.prettier",
     "lazyvim.plugins.extras.lang.ansible",
     "lazyvim.plugins.extras.lang.clangd",
-    "lazyvim.plugins.extras.lang.docker"
+    "lazyvim.plugins.extras.lang.cmake",
+    "lazyvim.plugins.extras.lang.docker",
+    "lazyvim.plugins.extras.lang.git",
+    "lazyvim.plugins.extras.lang.json",
+    "lazyvim.plugins.extras.lang.markdown",
+    "lazyvim.plugins.extras.lang.sql",
+    "lazyvim.plugins.extras.lang.tailwind",
+    "lazyvim.plugins.extras.lang.tex",
+    "lazyvim.plugins.extras.lang.toml",
+    "lazyvim.plugins.extras.lang.yaml",
+    "lazyvim.plugins.extras.util.project",
+    "lazyvim.plugins.extras.util.startuptime"
   ],
+  "install_version": 8,
   "news": {
     "NEWS.md": "10960"
   },
-  "version": 7
+  "version": 8
 }

nvim/lazynvim/lua/config/autocmds.lua

@@ -1,13 +1,14 @@
 local defaultGroupOptions = { clear = true }
 local markdownGroup = vim.api.nvim_create_augroup("MyMarkdownGroup", defaultGroupOptions)
-local spellGroup = vim.api.nvim_create_augroup("SpellGroup", defaultGroupOptions)
 local createCmd = vim.api.nvim_create_autocmd
 
--- Spell check
 createCmd("BufEnter", {
-  pattern = { "*.md", "*.markdown", "*.txt", "*.tex" },
-  group = spellGroup,
+  pattern = "*.md",
+  group = markdownGroup,
   callback = function(_)
+    -- HACK: Set filetype to markdown for '.md' files.
+    -- Not sure why it doesn't detect these as markdown files, but this fixes the issue.
+    vim.cmd.setlocal("filetype=markdown")
     vim.cmd.setlocal("textwidth=80")
     vim.cmd.setlocal("spell spelllang=en_us")
   end,

nvim/lazynvim/lua/config/lazy.lua

@@ -5,7 +5,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
   if vim.v.shell_error ~= 0 then
     vim.api.nvim_echo({
       { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out, "WarningMsg" },
+      { out,                            "WarningMsg" },
       { "\nPress any key to exit..." },
     }, true, {})
     vim.fn.getchar()
@@ -18,6 +18,22 @@ require("lazy").setup({
   spec = {
     -- add LazyVim and import its plugins
     { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+    {
+      import = "lazyvim.plugins.extras.editor.mini-files",
+      opts = {
+        options = {
+          use_as_default_explorer = true,
+        },
+      },
+    },
+    {
+      import = "lazyvim.plugins.extras.coding.blink",
+      keymap = {
+        preset = "enter",
+        ["<C-y>"] = { "select_and_accept" },
+      },
+    },
+
     -- import/override with your plugins
     { import = "plugins" },
   },
@@ -34,7 +50,7 @@ require("lazy").setup({
   checker = {
     enabled = true, -- check for plugin updates periodically
     notify = false, -- notify on update
-  }, -- automatically check for plugin updates
+  },                -- automatically check for plugin updates
   performance = {
     rtp = {
       -- disable some rtp plugins

nvim/lazynvim/lua/plugins/cmp.lua

@@ -0,0 +1,8 @@
+return {
+  "saghen/blink.cmp",
+  opts = {
+    keymap = {
+      preset = "default"
+    }
+  }
+}

nvim/lazynvim/lua/plugins/disabled.lua

@@ -1,3 +1,4 @@
 return {
   { "nvim-neo-tree/neo-tree.nvim", enabled = false },
+  { "akinsho/bufferline.nvim",     enabled = false },
 }

nvim/lazynvim/lua/plugins/formatter.lua

@@ -6,12 +6,7 @@ return {
       markdown = {
         "prettier",
         prepend_args = {
-          "--print-width",
-          "100",
-          "--prose-wrap",
-          "always",
-          "--parser",
-          "markdown",
+          "--config", "~/.prettierrc.yaml"
         },
       },
       swift = { "swiftformat" },

nvim/lazynvim/lua/plugins/init.lua

@@ -1,32 +1,11 @@
 -- Plugins that don't require much configuration are in here.
 --
 return {
-  { import = "lazyvim.plugins.extras.lang.ansible" },
-  { import = "lazyvim.plugins.extras.lang.cmake" },
-  { import = "lazyvim.plugins.extras.lang.docker" },
-  { import = "lazyvim.plugins.extras.lang.json" },
-  { import = "lazyvim.plugins.extras.lang.markdown" },
-  { import = "lazyvim.plugins.extras.lang.yaml" },
-  { import = "lazyvim.plugins.extras.coding.luasnip" },
-  {
-    import = "lazyvim.plugins.extras.editor.mini-files",
-    opts = {
-      options = {
-        use_as_default_explorer = true,
-      },
-    },
-  },
   {
     "folke/snacks.nvim",
     opts = {
       indent = { enabled = false },
     },
   },
-  {
-    import = "lazyvim.plugins.extras.coding.blink",
-    keymap = {
-      preset = "enter",
-      ["<C-y>"] = { "select_and_accept" },
-    },
-  },
+
 }

nvim/lazynvim/lua/plugins/lint.lua

@@ -0,0 +1,12 @@
+return {
+  {
+    "mfussenegger/nvim-lint",
+    opts = {
+      linters = {
+        markdownlint = {
+          args = { "--config", "~/.markdownlint.jsonc", "--" },
+        },
+      },
+    },
+  },
+}

nvim/lazynvim/lua/plugins/telescope.lua

@@ -1,6 +1,7 @@
 return {
   {
     import = "lazyvim.plugins.extras.editor.telescope",
+    enabled = false,
     opts = {
       ensure_installed = {
         "swift",

zsh/config/.zshrc

@@ -175,9 +175,9 @@ alias gs='git status'                   # git status quickly
 alias hn='hugo new'                     # generate a hugo site
 alias hnc='hugo new content'            # generate new hugo site content quickly
 alias j='just'                          # run justfile's quickly.
-alias l='eza --long --git --group --links --icons'                # better ls command.
+alias l='eza --long --git --group --links --icons --all'                # better ls command.
 alias lfs='ls -lahH --color=auto "$ZDOTDIR/functions"'    # List functions.
-alias ls='eza --long --git --group --links --icons'
+alias ls='eza --long --git --group --links --icons --all'
 alias lt='eza --long --git --group --links --icons --tree'
 alias pass='gopass'
 alias p='gopass'                        # run the pass command quickly.
@@ -203,6 +203,8 @@ alias nvim-mhoush='NVIM_APPNAME=m-housh && nvim'      # set neovim to use my con
 alias nvim-kickstart='NVIM_APPNAME=kickstart nvim'    # set neovim to use kickstart config.
 alias nvim-lazy='NVIM_APPNAME=lazy nvim'              # set neovim to use lazy config.
 alias wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts"  # set wget history location.
+# GPG Yubikey restart relearn when switching keys and stubbed.
+alias yubikeyrestart='gpg-connect-agent killagent /bye && gpg-connect-agent "scd serialno" "learn --force" /bye && gpg --card-status'
 
 # NOTE: This needs to stay near the bottom, or it doesn't work properly.
 # Use fzf in history / search contexts.

zsh/config/functions/n

@@ -8,17 +8,17 @@
 #
 
 function n() {
-  if [ -z "$1" ]; then
-    local gitdir=$(git rev-parse --show-toplevel 2> /dev/null)
-
-    [ -n "$gitdir" ] \
-      && nvim -c ":Telescope git_files" \
-      && return 0
-
-    [ -d "$1" ] \
-      && nvim -c ":Telescope find_files" \
-      && return 0
-  fi
+  # if [ -z "$1" ]; then
+  #   local gitdir=$(git rev-parse --show-toplevel 2> /dev/null)
+  #
+  #   [ -n "$gitdir" ] \
+  #     && nvim -c ":Telescope git_files" \
+  #     && return 0
+  #
+  #   [ -d "$1" ] \
+  #     && nvim -c ":Telescope find_files" \
+  #     && return 0
+  # fi
 
   nvim "$1"
 }