feat(nvim): Update astronvim and tweak null-ls

.ecrc

@@ -0,0 +1,19 @@
+{
+  "Version": "2.7.0",
+  "Verbose": false,
+  "Debug": false,
+  "IgnoreDefaults": false,
+  "SpacesAftertabs": false,
+  "NoColor": false,
+  "Exclude": [],
+  "AllowedContentTypes": [],
+  "PassedFiles": [],
+  "Disable": {
+    "EndOfLine": false,
+    "Indentation": false,
+    "InsertFinalNewline": false,
+    "TrimTrailingWhitespace": false,
+    "IndentSize": false,
+    "MaxLineLength": false
+  }
+}

.gitmodules

@@ -19,7 +19,7 @@
 	url = https://github.com/AstroNvim/AstroNvim.git
 	ignore = dirty
 	branch = main
-	update = checkout
+	shallow = true
 
 [submodule "cheat-community"]
 	path = config/cheat/cheatsheets/community
@@ -29,3 +29,4 @@
 [submodule "tmux/tpm"]
 	path = config/tmux/plugins/tpm
 	url = https://github.com/tmux-plugins/tpm.git
+	ignore = dirty

.shellcheckrc

@@ -0,0 +1,7 @@
+# This is shellcheck configuration file.
+
+# Set whether or not to follow arbitrary file
+# paths in source statements (since 0.8.0).
+external-sources=true
+includeAllWorkspaceSymbols=true
+

base/zshrc

@@ -3,6 +3,7 @@
 
 autoload -U colors zsh/terminfo
 colors
+setopt correct
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"

config/astronvim/lua/user/plugins/community.lua

@@ -6,7 +6,7 @@ return {                      -- Add the community repository of plugin specific
     import = "astrocommunity.colorscheme.catppuccin",
     opts = {
       flavour = "mocha",
-      transparent_background = false,
+      transparent_background = true,
       dim_inactive = {
         enabled = true,
         shade = "dark",
@@ -23,9 +23,8 @@ return {                      -- Add the community repository of plugin specific
       disabled_filetypes = { "help", "text", "markdown" },
     },
   },
-  { import = "astrocommunity.code-runner.overseer-nvim" },
-  --- { import = "astrocommunity.diagnostics.lsp_lines-nvim" },
-  --- { import = "astrocommunity.diagnostics.trouble-nvim" },
+  { import = "astrocommunity.diagnostics.lsp_lines-nvim" },
+  { import = "astrocommunity.diagnostics.trouble-nvim" },
   { import = "astrocommunity.editing-support.refactoring-nvim" },
   { import = "astrocommunity.editing-support.neogen" },
   { import = "astrocommunity.editing-support.nvim-regexplainer" },

config/astronvim/lua/user/plugins/mason.lua

@@ -13,16 +13,13 @@ return { -- use mason-lspconfig to configure LSP installations
         "diagnosticls",
         "docker_compose_language_service",
         "dockerls",
-        "emmet_ls",
         "eslint",
         "graphql",
         "html",
         "intelephense",
         "jsonls",
-        "marksman",
         "psalm",
         "stylelint_lsp",
-        "sqlls",
         "tailwindcss",
         "tsserver",
         "vuels",

config/astronvim/lua/user/plugins/null-ls.lua

@@ -12,7 +12,6 @@ return {
       null_ls.builtins.code_actions.eslint,
       null_ls.builtins.code_actions.refactoring,
       null_ls.builtins.code_actions.shellcheck,
-      null_ls.builtins.code_actions.xo,
       null_ls.builtins.diagnostics.actionlint,
       null_ls.builtins.diagnostics.alex,
       null_ls.builtins.diagnostics.ansiblelint,
@@ -21,13 +20,10 @@ return {
       null_ls.builtins.diagnostics.eslint,
       null_ls.builtins.diagnostics.jsonlint,
       null_ls.builtins.diagnostics.luacheck,
-      null_ls.builtins.diagnostics.markdownlint,
-      null_ls.builtins.diagnostics.mypy,
       null_ls.builtins.diagnostics.php,
       null_ls.builtins.diagnostics.phpcs,
       null_ls.builtins.diagnostics.phpstan,
       null_ls.builtins.diagnostics.psalm,
-      null_ls.builtins.diagnostics.pydocstyle,
       null_ls.builtins.diagnostics.semgrep,
       null_ls.builtins.diagnostics.shellcheck,
       null_ls.builtins.diagnostics.standardjs,
@@ -38,26 +34,16 @@ return {
       null_ls.builtins.diagnostics.vacuum,
       null_ls.builtins.diagnostics.vint,
       null_ls.builtins.diagnostics.vulture,
-      null_ls.builtins.diagnostics.xo,
       null_ls.builtins.diagnostics.yamllint,
       null_ls.builtins.diagnostics.zsh,
-      null_ls.builtins.formatting.black,
       null_ls.builtins.formatting.blade_formatter,
-      null_ls.builtins.formatting.cbfmt,
       null_ls.builtins.formatting.clang_format,
       null_ls.builtins.formatting.eslint,
       null_ls.builtins.formatting.fixjson,
       null_ls.builtins.formatting.isort,
       null_ls.builtins.formatting.jq,
-      null_ls.builtins.formatting.markdownlint,
-      null_ls.builtins.formatting.nginx_beautifier,
-      null_ls.builtins.formatting.pg_format,
       null_ls.builtins.formatting.phpcsfixer,
-      null_ls.builtins.formatting.prettier_eslint,
-      null_ls.builtins.formatting.prettier,
-      null_ls.builtins.formatting.puppet_lint,
-      null_ls.builtins.formatting.rome,
-      null_ls.builtins.formatting.rustfmt,
+      null_ls.builtins.formatting.prettierd,
       null_ls.builtins.formatting.shfmt.with {
         args = { "-i", "1", "-bn", "-ci", "-sr", "-kb", "-fn" },
       },

config/exports-apps

@@ -109,3 +109,5 @@ export _Z_DATA="$XDG_STATE_HOME/z"
 export ANDROID_HOME="$XDG_DATA_HOME/android"
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
+export TMUX_CONF="$DOTFILES/config/tmux/tmux.conf"
+

config/iterm2/com.googlecode.iterm2.plist

@@ -10,16 +10,8 @@
 	<true/>
 	<key>AlternateMouseScroll</key>
 	<true/>
-	<key>AppleAntiAliasingThreshold</key>
-	<integer>1</integer>
-	<key>ApplePressAndHoldEnabled</key>
-	<false/>
-	<key>AppleScrollAnimationEnabled</key>
-	<integer>0</integer>
-	<key>AppleSmoothFixedFontsSizeThreshold</key>
-	<integer>1</integer>
-	<key>AppleWindowTabbingMode</key>
-	<string>manual</string>
+	<key>AutoHideTmuxClientSession</key>
+	<true/>
 	<key>Custom Color Presets</key>
 	<dict>
 		<key>catppuccin-mocha</key>
@@ -1049,13 +1041,17 @@
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>JetBrainsMonoNerdFontCompleteM-Light 15</string>
+			<string>JetBrainsMonoNFM-Regular 13</string>
 			<key>Only The Default BG Color Uses Transparency</key>
 			<true/>
+			<key>Open Password Manager Automatically</key>
+			<true/>
 			<key>Option Key Sends</key>
 			<integer>0</integer>
 			<key>Prompt Before Closing 2</key>
 			<false/>
+			<key>Reduce Flicker</key>
+			<true/>
 			<key>Right Option Key Sends</key>
 			<integer>0</integer>
 			<key>Rows</key>
@@ -1092,12 +1088,77 @@
 			</dict>
 			<key>Send Code When Idle</key>
 			<false/>
+			<key>Set Local Environment Vars</key>
+			<false/>
 			<key>Shortcut</key>
-			<string></string>
+			<string>T</string>
+			<key>Show Status Bar</key>
+			<true/>
+			<key>Show Timestamps</key>
+			<integer>2</integer>
 			<key>Silence Bell</key>
 			<false/>
 			<key>Smart Cursor Color</key>
 			<true/>
+			<key>Status Bar Layout</key>
+			<dict>
+				<key>advanced configuration</key>
+				<dict>
+					<key>algorithm</key>
+					<integer>0</integer>
+					<key>auto-rainbow style</key>
+					<integer>3</integer>
+					<key>font</key>
+					<string>.AppleSystemUIFont 12</string>
+					<key>remove empty components</key>
+					<false/>
+				</dict>
+				<key>components</key>
+				<array>
+					<dict>
+						<key>class</key>
+						<string>iTermStatusBarJobComponent</string>
+						<key>configuration</key>
+						<dict>
+							<key>knobs</key>
+							<dict>
+								<key>base: compression resistance</key>
+								<integer>1</integer>
+								<key>base: priority</key>
+								<real>5</real>
+								<key>maxwidth</key>
+								<real>+infinity</real>
+								<key>minwidth</key>
+								<integer>0</integer>
+								<key>shared text color</key>
+								<dict>
+									<key>Alpha Component</key>
+									<real>1</real>
+									<key>Blue Component</key>
+									<real>0.63</real>
+									<key>Color Space</key>
+									<string>sRGB</string>
+									<key>Green Component</key>
+									<real>0.63</real>
+									<key>Red Component</key>
+									<real>0.90000000000000002</real>
+								</dict>
+							</dict>
+							<key>layout advanced configuration dictionary value</key>
+							<dict>
+								<key>algorithm</key>
+								<integer>0</integer>
+								<key>auto-rainbow style</key>
+								<integer>3</integer>
+								<key>font</key>
+								<string>.AppleSystemUIFont 12</string>
+								<key>remove empty components</key>
+								<false/>
+							</dict>
+						</dict>
+					</dict>
+				</array>
+			</dict>
 			<key>Sync Title</key>
 			<false/>
 			<key>Tags</key>

config/tmux/tmux.conf

@@ -51,17 +51,35 @@ bind N new-window
 
 # Plugins related configurations
 
+## https://github.com/jaclu/tmux-menus
+set -g @menus_trigger 'm'
+
 ## https://github.com/catppuccin/tmux
 set -g @catppuccin_flavour 'mocha' # latte/frappe/macchiato/mocha
 set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs
 
+## https://github.com/tmux-plugins/tmux-continuum
+set -g @continuum-restore 'on'
+set -g @continuum-boot 'on'
+set -g @continuum-boot-options 'iterm'
+
+## https://github.com/tmux-plugins/tmux-resurrect
+set -g @resurrect-strategy-nvim 'session'
+
+## https://github.com/sainnhe/tmux-fzf
+TMUX_FZF_LAUNCH_KEY="l"
+
+## Install plugins, starting with plugin manager
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'jaclu/tmux-menus'
 set -g @plugin 'christoomey/vim-tmux-navigator'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'catppuccin/tmux'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
+set -g @plugin 'tmux-plugins/tmux-sessionist'
+set -g @plugin 'sainnhe/tmux-fzf'
 
 # set vi-mode
 set-window-option -g mode-keys vi

install-without-plugins

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-CONFIG="install.conf.yaml"
-DOTBOT_DIR="dotbot"
-
-DOTBOT_BIN="bin/dotbot"
-BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-DOTBOT_HOST="$(hostname -s)" || ''
-DOTBOT_BIN_PATH="${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}"
-
-cd "$BASEDIR"
-git submodule sync --quiet --recursive
-git submodule update --init --recursive
-
-"${DOTBOT_BIN_PATH}" \
-  -d "${BASEDIR}" \
-  --plugin-dir=dotbot-include \
-  -c "${CONFIG}" \
-  "${@}"
-
-if [ "${DOTBOT_HOST}" != "" ]; then
-  DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
-  echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
-  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \
-    && echo "(!) Found $DOTBOT_HOST_CONFIG" \
-    && "$DOTBOT_BIN_PATH" \
-      -d "$BASEDIR" \
-      --plugin-dir=dotbot-include \
-      -c "$DOTBOT_HOST_CONFIG" \
-      "${@}"
-fi

install.conf.yaml

@@ -1,4 +1,4 @@
-- include: 'hosts/defaults.yaml'
+- include: "hosts/defaults.yaml"
 - clean:
     ~/:
     ~/.config:
@@ -9,6 +9,7 @@
     ~/.cache:
     ~/.cache/git:
     ~/.config:
+    ~/.config/cheat/cheatsheets/personal:
     ~/.local:
     ~/.local/run:
     ~/.local/share:

local/bin/dfm

@@ -61,7 +61,7 @@ function section_install
       $0 install z
       ;;
     antigen)
-      curl -L git.io/antigen > "$DOTFILES/local/bin/antigen.zsh" \
+      curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
         && msg_yay "New antigen installed!"
       ;;
     composer)
@@ -92,7 +92,9 @@ function section_install
         && msg_yay "imagick installed!"
       ;;
     starship)
-      curl -sS https://starship.rs/install.sh | sh -s -- --bin-dir ~/.local/bin \
+      curl -sS https://starship.rs/install.sh | sh -s -- \
+        --bin-dir ~/.local/bin \
+        --yes \
         && msg_yay "starship installed!"
       ;;
     macos)