Merge remote-tracking branch 'refs/remotes/origin/u/pking/neovim-bulk…

…-update-2024' into u/pking/neovim-bulk-update-2024

.github/workflows/docker-image.yml

@@ -11,6 +11,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@97a652b80035363df47baee5031ec8670b8878ac
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
       - name: Build the Docker image
         run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)

Darwin/defaults.sh

@@ -14,7 +14,7 @@ while true; do
 done 2>/dev/null &
 
 # Get all current update
-#softwareupdate --download --verbose --all
+softwareupdate --download --verbose --install --all
 
 # Agree to the Xcode license
 if /usr/bin/xcode-select -p; then
@@ -140,14 +140,14 @@ defaults write com.apple.dock expose-animation-duration -float 0.1 # Speed up Mi
 # ========================================================================= }}}
 # Safari ================================================================== {{{
 
-defaults write com.apple.Safari HomePage -string "about:blank"           # Set Safari’s home page to `about:blank` for faster loading
-defaults write com.apple.Safari ShowFavoritesBar -bool false             # Hide Safari’s bookmarks bar by default
-defaults write com.apple.Safari ShowSidebarInTopSites -bool false        # Hide Safari’s sidebar in Top Sites
-defaults write com.apple.Safari ShowFullURLInSmartSearchField -bool true # Show the full URL in the address bar
+# defaults write com.apple.Safari HomePage -string "about:blank"           # Set Safari’s home page to `about:blank` for faster loading
+# defaults write com.apple.Safari ShowFavoritesBar -bool false             # Hide Safari’s bookmarks bar by default
+# defaults write com.apple.Safari ShowSidebarInTopSites -bool false        # Hide Safari’s sidebar in Top Sites
+# defaults write com.apple.Safari ShowFullURLInSmartSearchField -bool true # Show the full URL in the address bar
 
 # Don’t send search queries to Apple
-defaults write com.apple.Safari UniversalSearchEnabled -bool false
-defaults write com.apple.Safari SuppressSearchSuggestions -bool true
+# defaults write com.apple.Safari UniversalSearchEnabled -bool false
+# defaults write com.apple.Safari SuppressSearchSuggestions -bool true
 
 # ========================================================================= }}}
 
@@ -180,7 +180,6 @@ defaults write com.apple.TextEdit PlainTextEncodingForWrite -int 4
 # Time Machine ============================================================ {{{
 
 exclusions=("$HOME/.local"
-	"$HOME/.Trash"
 	"$HOME/Downloads"
 	"$HOME/Dropbox"
 	"$HOME/Library/Caches"

Dockerfile

@@ -1,6 +1,6 @@
 # Patrick King's homedir container
 # Includes typical client utilities for percona, postgres and redis.
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV TZ=US/Pacific
 ENV DEBIAN_FRONTEND=noninteractive

homemaker.toml

@@ -39,7 +39,7 @@ accepts = [["which", "npm"]]
             ["which", "fish"],
             ["echo", "$SHELL", "|", "grep", "fish"],
         ]
-    cmds = [["chsh", "-s", "/usr/bin/fish"]]
+    cmds = [["chsh", "-s", "/opt/homebrew/bin/fish"]]
 
 [tasks.terminfo]
     accepts = [["which", "tic"]]
@@ -53,7 +53,8 @@ accepts = [["which", "npm"]]
 # ========================================================================= }}}
 # meta ==================================================================== {{{
 [tasks.default]
-    deps = ["links", "systemconfig", "pip", "npm", "fish", "fish_completions", "terminfo"]
+    # deps = ["links", "systemconfig", "pip", "npm", "fish", "fish_completions", "terminfo"]
+    deps = ["links", "pip", "npm", "fish", "fish_completions", "terminfo"]
 
 # ========================================================================= }}}
 # macOS =================================================================== {{{

tilde/.config/fish/conf.d/env.fish

@@ -39,12 +39,18 @@ set -gx QUBES_GPG_DOMAIN gpg
 set -gx HOMEBREW_PREFIX $__brew_prefix
 set -gx HOMEBREW_CELLAR $__brew_prefix/Cellar
 set -gx HOMEBREW_REPOSITORY $__brew_prefix
+set -gx HOMEBREW_GNUBIN $__brew_prefix/opt/coreutils/libexec/gnubin
+set -gx HOMEBREW_GNUMAN $__brew_prefix/opt/coreutils/libexec/gnuman
+
 set -q PATH; or set PATH ''
-set -gx PATH $__brew_prefix/opt/gnu-sed/libexec/gnubin $__brew_prefix/bin $__brew_prefix/sbin $PATH
+set -gx PATH $HOMEBREW_GNUBIN $__brew_prefix/bin $__brew_prefix/sbin $PATH
+
 set -q MANPATH; or set MANPATH ''
-set -gx MANPATH /opt/homebrew/share/man $MANPATH
+set -gx MANPATH $HOMEBREW_GNUMAN /opt/homebrew/share/man $MANPATH
+
 set -q INFOPATH; or set INFOPATH ''
 set -gx INFOPATH $__brew_prefix/share/info $INFOPATH
+
 if test -e $__brew_prefix/opt/fish/share/fish/__fish_build_paths.fish
     source $__brew_prefix/opt/fish/share/fish/__fish_build_paths.fish
 end
@@ -55,6 +61,7 @@ fish_add_path --path $HOME/.yarn/bin
 fish_add_path --path $HOME/.config/yarn/global/node_modules/.bin
 fish_add_path --path $HOME/go/bin
 fish_add_path --path $HOME/.cargo/bin
+fish_add_path --path $HOME/.local/bin # pipx path
 fish_add_path --path $__brew_prefix/opt/homebrew/opt/coreutils/libexec/gnubin
 fish_add_path --path $__brew_prefix/share/google-cloud-sdk/path.fish.inc
 

tilde/.config/nvim/lua/pking/plugin/auto-session.lua

@@ -5,6 +5,9 @@ return {
             auto_session_enabled = true,
             auto_session_create_enabled = true,
             auto_session_use_git_branch = true,
+            auto_session_enable_last_session = true,
+            auto_save_enabled = true,
+            auto_restore_enabled = true,
             auto_session_suppress_dirs = { "~/", "~/Downloads", "~/Library", "/"},
 
 

tilde/.config/nvim/lua/pking/plugin/lsp/lspconfig.lua

@@ -111,6 +111,7 @@ return {
                 "bashls",
                 "dockerls",
                 "eslint", -- Javascript
+                "harper_ls",
                 "jsonls",
                 "lua_ls",
                 "ruff_lsp", -- Python

tilde/.config/nvim/lua/pking/plugin/lsp/null-ls.lua

@@ -12,7 +12,12 @@ return {
             -- with mason-lspconfig in lspconfig.lua
             null_ls.setup({
                 sources = {
+                    -- Everything but LSPs are listed here. All automatic LSP
+                    -- installs can be found in lspconfig.lua under
+                    -- `ensure_installed` for the mason-lspconfig setup.
+
                     -- Bash
+
                     null_ls.builtins.formatting.shellharden,
                     null_ls.builtins.formatting.shfmt,
 
@@ -33,11 +38,11 @@ return {
                     null_ls.builtins.formatting.golines,
 
                     -- Lua
+                    null_ls.builtins.diagnostics.selene,
                     null_ls.builtins.formatting.stylua,
 
                     -- Markdown / Text
                     null_ls.builtins.code_actions.proselint,
-                    null_ls.builtins.diagnostics.vale,
                     null_ls.builtins.diagnostics.write_good.with({ filetypes = { "markdown", "text" }}),
                     null_ls.builtins.formatting.markdownlint,
 

tilde/.config/nvim/lua/pking/plugin/lualine.lua

@@ -7,7 +7,19 @@ return {
         event = { 'UIEnter' },
         dependencies = {
             "nvim-tree/nvim-web-devicons",
-            "WhoIsSethDaniel/lualine-lsp-progress",
+            {
+                "linrongbin16/lsp-progress.nvim",
+                config = function()
+                    require ('lsp-progress').setup()
+
+                    vim.api.nvim_create_augroup("lualine_augroup", { clear = true })
+                    vim.api.nvim_create_autocmd("User", {
+                          group = "lualine_augroup",
+                          pattern = "LspProgressStatusUpdated",
+                          callback = require("lualine").refresh,
+                    })
+                end,
+            },
             "AndreM222/copilot-lualine",
         },
         config = function()
@@ -127,6 +139,10 @@ return {
 
             end
 
+            local function auto_session()
+                return "󱎤 "..require('auto-session.lib').current_session_name()
+            end
+
             require('lualine').setup {
                 options = {
                     icons_enabled = true,
@@ -181,8 +197,10 @@ return {
                                 newfile = '  ',       -- Text to show for new created file before first writting
                             }
                         },
+                        auto_session,
                         'location',
                         require('auto-session.lib').current_session_name,
+                        require('lsp-progress').progress,
                     },
                     lualine_x = {
                         { searchCount },

tilde/.gitconfig

@@ -5,10 +5,10 @@
 	name  = Patrick King
 	email = patrick@patrickcking.com
 	username = mr-mustash
-	signingkey = 0x944E36F397047609
+	#signingkey = 0x944E36F397047609
 
 [gpg]
-	program = /usr/local/MacGPG2/bin/gpg
+	#program = /usr/local/MacGPG2/bin/gpg
 
 # Non-template things
 [alias]
@@ -21,7 +21,7 @@
 	sort = -committerdate
 
 [commit]
-	gpgsign = true
+	#gpgsign = true
 
 [core]
 	editor=nvim
@@ -80,3 +80,5 @@
 	path = ~/.gitconfig.local
 
 # vim: set noexpandtab tabstop=4 nolist:
+[credential]
+	helper = store

tilde/.hammerspoon/init.lua

@@ -84,6 +84,8 @@ menubarLargeStyle = { font = { name = "DejaVuSansMono Nerd Font Mono", size = 20
 
 defaultStyle = { font = { name = ".AppleSystemUIFont", size = 13 } }
 
+Homedir = os.getenv( "HOME" )
+
 -- ========================================================================= }}}
 -- Important functions ===================================================== {{{
 run = require("functions/run")
@@ -109,6 +111,7 @@ display = require("system/display")
 Dock = require("system/dock")
 networking = require("system/networking")
 videoCalls = require("system/videoCalls")
+-- Keytrap = require("system/keytrap")
 
 
 audioControl.init()
@@ -118,6 +121,7 @@ display.init()
 Dock.init()
 networking.init()
 videoCalls.init()
+-- Keytrap.init()
 -- ========================================================================= }}}
 
 -- App configuration ======================================================= {{{

tilde/.hammerspoon/spoon-config/urls.lua

@@ -28,14 +28,16 @@ function urls.init()
     spoon.URLDispatcher.url_patterns = {
         {"https://captive.apple.com/", builtin},
         {"https?://%w+.beatsense.com", builtin},
-        {"https?://%w+.twitter.com/", builtin},
-        {"https?://%w+.zoom.us/j/", meetings},
         {"https?://%w+.tiktok.com", builtin},
+        {"https?://%w+.twitter.com/", builtin},
         {"https?://%w+.w2g.tv", builtin},
+        {"https?://%w+.x.com/", builtin},
+        {"https?://%w+.zoom.us/j/", meetings},
+        {"https?://meet.google.com", builtin},
         {"https?://tiktok.com", builtin},
-        {"https?://twitter.com/", builtin},
         {"https?://w2g.tv", builtin},
         {"https?://www.beatsense.com", builtin},
+        {"https?://x.com/", builtin},
         {"https?://zoom.us/j/", meetings},
     }