chore(deps): bump cross-spawn from 7.0.3 to 7.0.6 (#43)

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.editorconfig

@@ -8,6 +8,9 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.md]
+max_line_length = 100
+
 [*.php]
 indent_size = 4
 

.github/README.md

@@ -6,10 +6,10 @@ aware of yet. As I find more interesting tools, configs and other stuff,
 this repository will live accordingly.
 
 Please for the love of everything good do not use these 1:1 as your own dotfiles,
-fork or download the repo as a zip and go from there with your own configs.
+fork or download the repository as a zip and go from there with your own configs.
 
 It would be nice if you'd add an issue linking to your fork or repo so I can
-see what interesing stuff you've done with it. Sharing is caring.
+see what interesting stuff you've done with it. Sharing is caring.
 
 ## Setup
 
@@ -28,9 +28,9 @@ see what interesing stuff you've done with it. Sharing is caring.
 
 ![screenshot of the oh-my-posh shell](./screenshots/oh-my-posh.png)
 
-![screenshot of light version of tmux with nvim editing this repo](./screenshots/tmux-nvim-kickstart-light.png)
+![screenshot of light version of tmux with nvim editing this repository](./screenshots/tmux-nvim-kickstart-light.png)
 
-![screenshot of dark version of tmux with nvim editing this repo](./screenshots/tmux-nvim-kickstart-dark.png)
+![screenshot of dark version of tmux with nvim editing this repository](./screenshots/tmux-nvim-kickstart-dark.png)
 
 ## Interesting files and locations
 
@@ -52,7 +52,7 @@ see what interesing stuff you've done with it. Sharing is caring.
 | `local/`  | `.local/`   | XDG Base folder: `bin`, `share` and `state` |
 | `ssh/`    | `.ssh/`     | SSH Configurations.                         |
 
-### dfm - the dotfiles manager
+### `dfm` - the dotfiles manager
 
 [`.local/bin/dfm`][dfm] is a shell script that has some tools that help with dotfiles management.
 

.gitmodules

@@ -23,10 +23,6 @@
 	path = config/tmux/plugins/tmux-continuum
 	url = https://github.com/tmux-plugins/tmux-continuum
 	ignore = dirty
-[submodule "tmux/tmux-resurrect"]
-	path = config/tmux/plugins/tmux-resurrect
-	url = https://github.com/tmux-plugins/tmux-resurrect
-	ignore = dirty
 [submodule "tmux/tmux-sensible"]
 	path = config/tmux/plugins/tmux-sensible
 	url = https://github.com/tmux-plugins/tmux-sensible.git

add-submodules.sh

@@ -23,8 +23,6 @@ git submodule add --name tmux/tmux-continuum \
   -f https://github.com/tmux-plugins/tmux-continuum config/tmux/plugins/tmux-continuum
 git submodule add --name tmux/tmux-mode-indicator \
   -f https://github.com/MunifTanjim/tmux-mode-indicator.git config/tmux/plugins/tmux-mode-indicator
-git submodule add --name tmux/tmux-resurrect \
-  -f https://github.com/tmux-plugins/tmux-resurrect config/tmux/plugins/tmux-resurrect
 git submodule add --name tmux/tmux-sensible \
   -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible
 git submodule add --name tmux/tmux-sessionist \
@@ -49,6 +47,7 @@ done
 [ -d "config/tmux/plugins/tpm" ] && rm -rf config/tmux/plugins/tpm
 [ -d "config/tmux/plugins/tmux" ] && rm -rf config/tmux/plugins/tmux
 [ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus
+[ -d "config/tmux/plugins/tmux-resurrect" ] && rm -rf config/tmux/plugins/tmux-resurrect
 [ -d "tools/dotbot-crontab" ] && rm -rf tools/dotbot-crontab
 [ -d "tools/dotbot-snap" ] && rm -rf tools/dotbot-snap
 [ -d "config/nvim-kickstart" ] && rm -rf config/nvim-kickstart

base/bashrc

@@ -14,10 +14,45 @@ source "$DOTFILES/config/shared.sh"
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null
 
-x-have oh-my-posh && {
-  eval "$(oh-my-posh init bash --config "$DOTFILES/config/omp/own.toml")"
-}
-
 x-have antidot && {
   eval "$(antidot init)"
 }
+
+# If not running interactively, don't do anything
+case $- in
+*i*) ;;
+*) return ;;
+esac
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+  debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+  # We have color support; assume it's compliant with Ecma-48
+  # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+  # a case would tend to support setf rather than setaf.)
+  color_prompt=yes
+else
+  color_prompt=
+fi
+
+if [ "$color_prompt" = yes ]; then
+  PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\u\[\033[01;33m\]@\[\033[01;36m\]\h \[\033[01;33m\]\w \[\033[01;35m\]\$ \[\033[00m\]'
+else
+  PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm* | rxvt*)
+  PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+  ;;
+*) ;;
+esac
+
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init bash --config "$DOTFILES/config/omp/own.toml")"
+}

base/zshenv

@@ -1,4 +1,5 @@
 # this is my zsh config. there are many like it, but this one is mine.
+# https://zsh.sourceforge.io/Intro/intro_3.html
 # shellcheck shell=bash
 
 # export VERBOSE=1
@@ -10,6 +11,16 @@ export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$LOCAL_SHARE/nvim/mason/bin:$L
 export SHARED_SCRIPTS_SOURCED=0
 
 source "$DOTFILES/config/shared.sh"
+source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
+
+export ZDOTDIR="$DOTFILES/zsh"
+ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+
+# If not running interactively, don't do anything
+case $- in
+  *i*) ;;
+    *) return;;
+esac
 
 eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
 
@@ -54,8 +65,9 @@ load_antigen()
     antigen bundle colored-man-pages
     antigen bundle zsh-users/zsh-completions
     x-have eza && antigen bundle eza
+    x-have tms && antigen bundle yuki-ycino/tms
 
-    # this needs to be the last item
+    # this needs to be the last bundle
     antigen bundle zsh-users/zsh-syntax-highlighting
     antigen apply
   fi
@@ -87,19 +99,16 @@ setup_tmux_window_name_plugin()
   fi
 }
 
-main()
-{
-  load_antigen
-  source_fzf_config
-  setup_tmux_window_name_plugin
-  if x-have antidot; then
-    eval "$(antidot init)"
-  fi
-  source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
-}
-
-main "$@"
+load_antigen
+source_fzf_config
+setup_tmux_window_name_plugin
+if x-have antidot; then
+  eval "$(antidot init)"
+fi
 
 # Lando
 export PATH="$HOME/.lando/bin${PATH+:$PATH}"; #landopath
 
+autoload -Uz compinit bashcompinit
+compinit -d $ZSH_COMPDUMP
+bashcompinit

config/asdf/python-packages

@@ -2,3 +2,4 @@ ansible
 pipenv
 semgrep
 neovim
+libtmux

config/exports

@@ -14,22 +14,21 @@
 # if DOTFILES is not set, set it to the default location
 [ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"
 
+# zsh completions directory
+[ -z "$ZSH_COMPLETIONS" ] && export ZSH_COMPLETIONS="$XDG_CONFIG_HOME/zsh/completion"
+
 export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
 
-# Load bash completions if available for zsh
-if [[ -n "$ZSH_VERSION" ]]; then
-  autoload bashcompinit
-  bashcompinit
-fi
+# Add zsh completions to FPATH, compinit will be called later
+FPATH="$ZSH_COMPLETIONS:$FPATH"
 
 # Load asdf
 export ASDF_DIR="$XDG_BIN_HOME/asdf"
 if [[ -d $ASDF_DIR ]]; then
-  [[ -d $ASDF_DIR/completions ]] && fpath=("$ASDF_DIR/completions" $fpath)
-  [[ -d $ASDF_DIR/plugins ]] && fpath=("$ASDF_DIR/plugins" $fpath)
+  [[ -d $ASDF_DIR/completions ]] && FPATH="$ASDF_DIR/completions:$FPATH"
+  [[ -d $ASDF_DIR/plugins ]] && FPATH="$ASDF_DIR/plugins:$FPATH"
   source "$ASDF_DIR/asdf.sh"
 fi
-export PATH="$ASDF_DIR/bin:$ASDF_DIR/shims:$PATH"
 
 if ! command -v msg &> /dev/null; then
   # Function to print messages if VERBOSE is enabled
@@ -124,7 +123,7 @@ preexec()
 dfu()
 {
   (
-    cd "$DOTFILES" && git pull --ff-only && ./install
+    cd "$DOTFILES" && git rebase --ff --autostash && ./install
   )
 }
 

config/homebrew/Brewfile

@@ -53,6 +53,10 @@ brew "aspell"
 brew "autoconf"
 # Collection of over 500 reusable autoconf macros
 brew "autoconf-archive"
+# Cryptographic recipes and primitives for Python
+brew "cryptography"
+# Official Amazon AWS command-line interface
+brew "awscli"
 # Bourne-Again SHell, a UNIX command interpreter
 brew "bash"
 # GNU multiple precision arithmetic library
@@ -71,8 +75,6 @@ brew "gettext"
 brew "glib"
 # Mozilla CA bundle for Python
 brew "certifi"
-# Cryptographic recipes and primitives for Python
-brew "cryptography"
 # Get a file from an HTTP, HTTPS or FTP server
 brew "curl"
 # Lightweight DNS forwarder and DHCP server
@@ -85,6 +87,12 @@ brew "freetds"
 brew "gd"
 # GitHub command-line tool
 brew "gh"
+# OpenType text shaping engine
+brew "harfbuzz"
+# Secure hashing function
+brew "libb2"
+# Framework for layout and rendering of i18n text
+brew "pango"
 # Distributed revision control system
 brew "git"
 # Render markdown on the CLI
@@ -97,12 +105,6 @@ brew "gnutls"
 brew "gnupg"
 # Image manipulation
 brew "netpbm"
-# C/C++ and Java libraries for Unicode and globalization
-brew "icu4c"
-# OpenType text shaping engine
-brew "harfbuzz"
-# Framework for layout and rendering of i18n text
-brew "pango"
 # Library to render SVG files using Cairo
 brew "librsvg"
 # Graph visualization software from AT&T and Bell Labs
@@ -127,8 +129,6 @@ brew "json-c"
 brew "krb5"
 # Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
 brew "legitify"
-# Secure hashing function
-brew "libb2"
 # Postgres C API library
 brew "libpq"
 # Multi-platform support library with a focus on asynchronous I/O
@@ -143,10 +143,14 @@ brew "m-cli"
 brew "nginx"
 # Port scanning utility for large networks
 brew "nmap"
+# Libraries for security-enabled client and server applications
+brew "nss"
 # Open source suite of directory software
 brew "openldap"
 # General-purpose scripting language
 brew "php"
+# General-purpose scripting language
+brew "php@8.2"
 # Manage compile and link flags for libraries
 brew "pkg-config"
 # Send macOS User Notifications from the command-line
@@ -204,6 +208,8 @@ cask "font-open-sans"
 cask "font-roboto"
 cask "font-source-code-pro"
 cask "font-source-code-pro-for-powerline"
+cask "font-source-sans-pro"
+cask "font-source-serif-pro"
 # GIT client
 cask "fork"
 # HTTP and GraphQL Client

config/nvim/.editorconfig

@@ -15,3 +15,6 @@ trim_trailing_whitespace = true
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
+
+[*.json]
+max_line_length = off

config/nvim/lua/autogroups.lua

@@ -51,4 +51,21 @@ autocmd('FileType', {
   callback = function(event) vim.bo[event.buf].buflisted = false end,
 })
 
+-- ── wrap and check for spell in text filetypes ──────────────────────
+vim.api.nvim_create_autocmd('FileType', {
+  group = augroup('wrap_spell', { clear = true }),
+  pattern = { 'text', 'plaintex', 'typst', 'gitcommit', 'markdown' },
+  callback = function()
+    vim.opt_local.wrap = true
+    vim.opt_local.spell = true
+  end,
+})
+
+-- ── Fix conceallevel for json files ─────────────────────────────────
+vim.api.nvim_create_autocmd({ 'FileType' }, {
+  group = augroup('json_conceal', { clear = true }),
+  pattern = { 'json', 'jsonc', 'json5' },
+  callback = function() vim.opt_local.conceallevel = 0 end,
+})
+
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/options.lua

@@ -19,6 +19,9 @@ vim.g.colors_variant_dark = 'tokyonight-storm'
 -- Make sure editorconfig support is enabled
 vim.g.editorconfig = true
 
+-- Enable the colorcolumn
+vim.api.nvim_set_option_value('colorcolumn', '+1', { scope = 'global' })
+
 -- Enable line numbers and relative line numbers
 vim.opt.number = true
 vim.opt.relativenumber = true

config/nvim/lua/plugins/conform.lua

@@ -1,49 +1,45 @@
 -- ── Formatting ──────────────────────────────────────────────────────
 -- Lightweight yet powerful formatter plugin for Neovim
 -- https://github.com/stevearc/conform.nvim
-return {
-  'stevearc/conform.nvim',
-  event = { 'BufWritePre' },
-  cmd = { 'ConformInfo' },
-  config = function()
-    -- Select first conform formatter that is available
-    ---@param bufnr integer
-    ---@param ... string
-    ---@return string
-    local function first(bufnr, ...)
-      local conform = require 'conform'
-      for i = 1, select('#', ...) do
-        local formatter = select(i, ...)
-        if conform.get_formatter_info(formatter, bufnr).available then
-          return formatter
-        end
-      end
-      return select(1, ...)
-    end
 
-    require('conform').setup {
+return {
+  {
+    'stevearc/conform.nvim',
+    event = { 'BufWritePre' },
+    cmd = { 'ConformInfo' },
+    opts = {
       -- Enable or disable logging
-      notify_on_error = true,
+      notify_on_error = false,
       -- Set the default formatter for all filetypes
       default_formatter = 'injected',
       -- Set the default formatter for all filetypes
       default_formatter_opts = {
         lsp_format = 'fallback',
         -- Set the default formatter for all filetypes
-        -- formatter = 'injected',
+        formatter = 'injected',
         -- Set the default formatter for all filetypes
         -- formatter_opts = {},
       },
+      -- The options you set here will be merged with the builtin formatters.
+      -- You can also define any custom formatters here.
+      formatters = {
+        injected = { options = { ignore_errors = true } },
+        -- # Example of using dprint only when a dprint.json file is present
+        -- dprint = {
+        --   condition = function(ctx)
+        --     return vim.fs.find({ "dprint.json" }, { path = ctx.filename, upward = true })[1]
+        --   end,
+        -- },
+        --
+        -- # Example of using shfmt with extra args
+        -- shfmt = {
+        --   prepend_args = { "-i", "2", "-ci" },
+        -- },
+      },
       formatters_by_ft = {
-        markdown = function(bufnr)
-          return { first(bufnr, 'prettierd', 'prettier'), 'injected' }
-        end,
-        javascript = function(bufnr)
-          return { first(bufnr, 'prettier', 'eslint'), 'injected' }
-        end,
         lua = { 'stylua' },
         -- Conform will run multiple formatters sequentially
-        -- python = { 'isort', 'black', lsp_format = 'fallback' },
+        go = { 'goimports', 'gofmt' },
         -- You can customize some of the format options for the filetype (:help conform.format)
         -- rust = { 'rustfmt', lsp_format = 'fallback' },
       },
@@ -59,9 +55,7 @@ return {
           return
         end
         -- Disable with a global or buffer-local variable
-        if
-            vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat
-        then
+        if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
           return
         end
         -- Disable autoformat for files in a certain path
@@ -73,12 +67,20 @@ return {
 
         return { timeout_ms = 500, lsp_format = 'fallback' }
       end,
-    }
-  end,
-  init = function()
-    -- If you want the formatexpr, here is the place to set it
-    vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
-  end,
-
-
+    },
+    init = function()
+      -- If you want the formatexpr, here is the place to set it
+      vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
+    end,
+  },
+  -- Automatically install formatters registered with conform.nvim via mason.nvim
+  -- https://github.com/zapling/mason-conform.nvim
+  {
+    'zapling/mason-conform.nvim',
+    depends = {
+      'stevearc/conform.nvim',
+      'williamboman/mason.nvim',
+    },
+    opts = {},
+  },
 }

config/nvim/lua/plugins/goto-preview.lua

@@ -19,7 +19,8 @@ return {
         hide_preview = false,
       },
     },
-    -- These two configs can also be passed down to the goto-preview definition and implementation calls for one off "peak" functionality.
+    -- These two configs can also be passed down to the goto-preview definition
+    -- and implementation calls for one off "peak" functionality.
     focus_on_open = true, -- Focus the floating window when opening it.
     dismiss_on_move = false, -- Dismiss the floating window when moving the cursor.
     force_close = true, -- passed into vim.api.nvim_win_close's second argument. See :h nvim_win_close

config/nvim/lua/plugins/ufo.lua

@@ -16,6 +16,28 @@ return {
         local builtin = require 'statuscol.builtin'
         require('statuscol').setup {
           relculright = true,
+          ft_ignore = {
+            'dashboard',
+            'NvimTree',
+            'help',
+            'vim',
+            'alpha',
+            'dashboard',
+            'neo-tree',
+            'Trouble',
+            'lazy',
+            'toggleterm',
+          },
+          bt_ignore = {
+            'help',
+            'vim',
+            'alpha',
+            'dashboard',
+            'neo-tree',
+            'Trouble',
+            'lazy',
+            'toggleterm',
+          },
           segments = {
             {
               text = { builtin.foldfunc },
@@ -41,7 +63,7 @@ return {
   config = function()
     local capabilities = vim.lsp.protocol.make_client_capabilities()
     capabilities.textDocument.foldingRange = {
-      dynamicRegistration = false,
+      dynamicRegistration = true,
       lineFoldingOnly = true,
     }
     local language_servers = require('lspconfig').util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
@@ -84,7 +106,13 @@ return {
       ---@param width number The width of the window.
       ---@param truncate function Truncate function
       ---@return table
-      fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
+      fold_virt_text_handler = function(
+        virtText,
+        lnum,
+        endLnum,
+        width,
+        truncate
+      )
         local newVirtText = {}
         local suffix = (' 󰁂 %d '):format(endLnum - lnum)
         local sufWidth = vim.fn.strdisplaywidth(suffix)

config/nvim/lua/plugins/ui.lua

@@ -27,9 +27,9 @@ return {
     },
   },
 
-  -- Extensible Neovim Scrollbar
-  -- https://github.com/petertriho/nvim-scrollbar
-  { 'petertriho/nvim-scrollbar', opts = {} },
+  -- A neovim plugin that shows colorcolumn dynamically
+  -- https://github.com/Bekaboo/deadcolumn.nvim
+  { 'Bekaboo/deadcolumn.nvim' },
 
   -- vim dashboard
   -- https://github.com/nvimdev/dashboard-nvim
@@ -110,25 +110,64 @@ return {
   {
     'lukas-reineke/indent-blankline.nvim',
     main = 'ibl',
-    config = function()
-      require('ibl').setup {
-        indent = {
-          char = '│',
+    opts = {
+      scope = { show_start = false, show_end = false },
+      indent = {
+        char = '│',
+        tab_char = '│',
+      },
+      exclude = {
+        filetypes = {
+          'Trouble',
+          'alpha',
+          'dashboard',
+          'help',
+          'lazy',
+          'lazyterm',
+          'mason',
+          'neo-tree',
+          'notify',
+          'terminal',
+          'toggleterm',
+          'trouble',
         },
-        exclude = {
-          filetypes = { 'terminal', 'dashboard' },
-          buftypes = { 'dashboard' },
-        },
-      }
+        buftypes = { 'dashboard' },
+      },
+    },
+  },
+
+  -- Display a character as the colorcolumn
+  -- https://github.com/lukas-reineke/virt-column.nvim
+  { 'lukas-reineke/virt-column.nvim', opts = {} },
+
+  -- icons
+  {
+    'echasnovski/mini.icons',
+    opts = {
+      file = {
+        ['.keep'] = { glyph = '󰊢', hl = 'MiniIconsGrey' },
+        ['devcontainer.json'] = { glyph = '', hl = 'MiniIconsAzure' },
+      },
+      filetype = {
+        dotenv = { glyph = '', hl = 'MiniIconsYellow' },
+      },
+    },
+    init = function()
+      package.preload['nvim-web-devicons'] = function()
+        require('mini.icons').mock_nvim_web_devicons()
+        return package.loaded['nvim-web-devicons']
+      end
     end,
   },
 
+  -- ui components
+  { 'MunifTanjim/nui.nvim', lazy = true },
+
   -- Git integration for buffers
   -- https://github.com/lewis6991/gitsigns.nvim
   {
     'lewis6991/gitsigns.nvim',
     version = false,
-    lazy = false,
     opts = {
       signs = {
         add = { text = '+' },
@@ -174,6 +213,7 @@ return {
       'TmuxNavigateRight',
       'TmuxNavigatePrevious',
     },
+    opts = {},
   },
 
   -- Cloak allows you to overlay *'s over defined patterns in defined files.

config/nvim/lua/plugins/which-key.lua

@@ -141,8 +141,8 @@ return {
       {
         '<leader>cf',
         '<cmd>lua require("conform").format({ async = true, lsp_fallback = true })<cr>',
-        mode = { 'n', 'v' },
-        desc = 'Format buffer',
+        mode = {},
+        desc = 'Format buffer with Conform',
       },
       {
         '<leader>ci',
@@ -509,7 +509,7 @@ return {
       },
 
       -- ── Old habits ──────────────────────────────────────────────────────
-      { '<C-s>', '<cmd>w<CR>', desc = 'Save file' },
+      { '<C-s>', '<cmd>w!<CR>', desc = 'Save file' },
 
       -- ── Text manipulation in visual mode ────────────────────────────────
       {

config/tmux/tmux.conf

@@ -147,16 +147,12 @@ set -g @tmux_window_name_max_name_len "20"
 set -g @tmux_window_name_use_tilde "True"
 set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh', 'oh-my-posh']"
 set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
-set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases', 'oh-my-posh', 'antidot', 'direnv']" # Default is []
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'oh-my-posh', 'antidot', 'direnv']" # Default is []
 set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local'), ('.+asdf', 'asdf')]"
 
 ## https://github.com/tmux-plugins/tmux-continuum
 # set -g @continuum-restore 'on'
 
-## https://github.com/tmux-plugins/tmux-resurrect
-# set -g @resurrect-strategy-nvim 'session'
-# set -g @resurrect-dir '~/.local/state/tmux/tmux-resurrect'
-
 ## https://github.com/MunifTanjim/tmux-mode-indicator
 set -g @mode_indicator_prefix_mode_style 'bg=default,fg=#7aa2f7'
 set -g @mode_indicator_copy_mode_style 'bg=default,fg=yellow'
@@ -169,7 +165,6 @@ set -g @mode_indicator_sync_mode_style 'bg=default,fg=red'
 
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-sensible/sensible.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-window-name/tmux_window_name.tmux
-# run-shell ~/.dotfiles/config/tmux/plugins/tmux-resurrect/resurrect.tmux
 # run-shell ~/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux
 # run-shell ~/.dotfiles/config/tmux/plugins/tmux-sessionist/sessionist.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-mode-indicator/mode_indicator.tmux

yarn.lock

@@ -2706,9 +2706,9 @@ cosmiconfig@^9.0.0:
     parse-json "^5.2.0"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"