chore(config): add LM Studio to path

Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>

.github/workflows/update-submodules.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
-          fetch-depth: 1
+          fetch-depth: 2
           token: ${{secrets.GITHUB_TOKEN}}
       - name: Config Git User
         run: |

.gitignore

@@ -22,6 +22,8 @@ config/npm/npmrc
 config/nvim/lazy-lock.json
 config/nvim/spell/*
 !config/nvim/spell/.gitkeep
+config/git/local.d/*
+!config/git/local.d/.gitkeep
 config/zed/*
 !config/zed/settings.json
 config/zsh/.zcompdump
@@ -36,3 +38,4 @@ ssh/local.d/*
 config/fish/fish_variables
 **/exports-secret.fish
 config/fish/completions/asdf.fish
+config/vim/.netrwhist

.pre-commit-config.yaml

@@ -49,7 +49,7 @@ repos:
       - id: actionlint
 
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 39.178.1
+    rev: 39.182.3
     hooks:
       - id: renovate-config-validator
 

base/bashrc

@@ -25,3 +25,6 @@ x-have antidot && {
 PROMPT_DIRTRIM=3
 PROMPT_COMMAND='PS1_CMD1=$(git branch --show-current 2>/dev/null)'
 PS1='\[\e[95m\]\u\[\e[0m\]@\[\e[38;5;22;2m\]\h\[\e[0m\] \[\e[38;5;33m\]\w\[\e[0m\] \[\e[92;2m\]${PS1_CMD1}\n\[\e[39m\]➜\[\e[0m\] '
+
+# Added by LM Studio CLI (lms)
+export PATH="$PATH:$HOME/.lmstudio/bin"

base/zshrc

@@ -22,7 +22,6 @@ FPATH="$ZSH_COMPLETIONS:$FPATH"
 ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 
 source "$DOTFILES/config/zsh/antidote.zsh"
-# source "$DOTFILES/config/zsh/prompt.zsh"
 
 # Function to source FZF configuration
 source_fzf_config()
@@ -61,3 +60,6 @@ bashcompinit
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 export P10K_CONFIG="$DOTFILES/config/zsh/p10k.zsh"
 [[ ! -f "$P10K_CONFIG" ]] || source "$P10K_CONFIG"
+
+# Added by LM Studio CLI (lms)
+export PATH="$PATH:$HOME/.lmstudio/bin"

config/aerospace/aerospace.toml

@@ -119,6 +119,10 @@ run = ['layout floating']
 if.app-id = 'com.philipyoungg.session-setapp' # Session app (Setapp)
 run = ['layout floating']
 
+[[on-window-detected]]
+if.app-id = 'com.microsoft.rdc.macos' # Remote Desktop
+run = ['layout floating']
+
 # Possible values: (qwerty|dvorak)
 # See https://nikitabobko.github.io/AeroSpace/guide#key-mapping
 [key-mapping]

config/fish/config.fish

@@ -14,3 +14,6 @@ if status is-interactive
   # Start tmux if not already running and not in SSH
   open-tmux # defined in functions/open-tmux.fish
 end
+
+# Added by LM Studio CLI (lms)
+set -gx PATH $PATH $HOME/.lmstudio/bin

config/fish/exports.fish

@@ -19,6 +19,9 @@ set -q HOSTNAME; or set -x HOSTNAME (hostname -s)
 # Add local bin to path
 fish_add_path "$XDG_BIN_HOME"
 
+# Add cargo bin to path
+fish_add_path "$XDG_SHARE_HOME/cargo/bin"
+
 # NPM configuration
 set -q NPM_CONFIG_PREFIX; or set -x NPM_CONFIG_PREFIX "$XDG_DATA_HOME/npm"
 fish_add_path "$NPM_CONFIG_PREFIX/bin"
@@ -107,6 +110,9 @@ set -q OP_CACHE; or set -x OP_CACHE "$XDG_STATE_HOME/1password"
 set -q WORKON_HOME; or set -x WORKON_HOME "$XDG_DATA_HOME/virtualenvs"
 set -q PYENV_ROOT; or set -x PYENV_ROOT "$XDG_DATA_HOME/pyenv"
 fish_add_path "$PYENV_ROOT/bin"
+if x-have pyenv; and not functions -q pyenv
+  status --is-interactive; and source (pyenv init - | psub)
+end
 
 # Poetry configuration
 set -q POETRY_HOME; or set -x POETRY_HOME "$XDG_DATA_HOME/poetry"

config/homebrew/Brewfile

@@ -217,8 +217,6 @@ brew "nss"
 brew "openldap"
 # ISO-C API and CLI for generating UUIDs
 brew "ossp-uuid"
-# General-purpose scripting language
-brew "php@8.2"
 # Execute binaries from Python packages in isolated environments
 brew "pipx"
 # Python version management
@@ -235,6 +233,8 @@ brew "ruby-build"
 brew "rbenv"
 # Generate C-based recognizers from regular expressions
 brew "re2c"
+# Rust toolchain installer
+brew "rustup"
 # Static analysis and lint tool, for (ba)sh scripts
 brew "shellcheck"
 # Send macOS User Notifications from the command-line
@@ -288,9 +288,11 @@ brew "shivammathur/extensions/uuid@8.3"
 # Yaml PHP extension
 brew "shivammathur/extensions/yaml@8.3"
 # General-purpose scripting language
-brew "shivammathur/php/php"
-# General-purpose scripting language
 brew "shivammathur/php/php-debug"
+# General-purpose scripting language
+brew "shivammathur/php/php@8.2", link: true
+# General-purpose scripting language
+brew "shivammathur/php/php@8.2-debug"
 # Command-line interface for 1Password
 cask "1password-cli"
 # AeroSpace is an i3-like tiling window manager for macOS

config/tmux/tmux.conf

@@ -3,7 +3,7 @@
 # Contains configuration from the following sources:
 # - https://tmuxguide.readthedocs.io/en/latest/tmux/tmux.html
 # - https://github.com/dreamsofcode-io/tmux/blob/main/tmux.conf
-
+#
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Settings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
@@ -62,6 +62,7 @@ set -g window-status-format ' #I:#W '
 #  │ Bindings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
 # bind flags
+# -N = Note / description of the command
 # -r = repeatable, only needs prefix once
 # -n = doesn't need prefix
 # -t = binds to a certain key-table (root, copy-mode, prefix, etc.)
@@ -95,10 +96,10 @@ unbind p
 bind p paste-buffer
 
 # tms bindings
-bind C-f display-popup -E "tms"
+bind -N "tms"         t   display-popup -E "tms"
-bind C-w display-popup -E "tms windows"
+bind -N "tms windows" C-w display-popup -E "tms windows"
-bind C-s display-popup -E "tms switch"
+bind -N "tms switch"  C-s display-popup -E "tms switch"
-bind C-r display-popup -E "tms refresh"
+bind -N "tms refresh" C-r display-popup -E "tms refresh"
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins                                                  │

config/vim/vimrc

@@ -7,12 +7,10 @@ set viminfo+=n$XDG_CACHE_HOME/vim/viminfo
 set runtimepath=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after,$VIM,$VIMRUNTIME
 let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc"
 
-set v=$XDG_CONFIG_HOME/vim
-
 "*****************************************************************************
 "" Vim-Plug core
 "*****************************************************************************
-let vimplug_exists=expand(v . '/autoload/plug.vim')
+let vimplug_exists=expand('$HOME/.config/autoload/plug.vim')
 if has('win32')&&!has('win64')
   let curl_exists=expand('C:\Windows\Sysnative\curl.exe')
 else
@@ -38,7 +36,7 @@ if !filereadable(vimplug_exists)
 endif
 
 " Required:
-call plug#begin(expand(v . '/plugged'))
+call plug#begin(expand('$HOME/.config/vim/plugged'))
 
 "*****************************************************************************
 "" Plug install packages
@@ -246,7 +244,7 @@ endif
 "" Disable the blinking cursor.
 set gcr=a:blinkon0
 
-set scrolloff=3
+set scrolloff=10
 
 
 "" Status bar

docs/tmux-keybindings.md

@@ -3,10 +3,16 @@
 Leader: `<ctrl><space>`
 
 ```txt
+    Space   Select next layout
+    !       Break pane to a new window
+    "       Split window vertically
+    #       List all paste buffers
     $       Rename current session
     %       Split window horizontally
     &       Kill current window
     '       Prompt for window index to select
+    (       Switch to previous client
+    )       Switch to next client
     ,       Rename current window
     -       Delete the most recent paste buffer
     .       Move the current window
@@ -25,6 +31,7 @@ Leader: `<ctrl><space>`
     ;       Move to the previously active pane
     =       Choose a paste buffer from a list
     ?       List key bindings
+    D       Choose and detach a client from a list
     E       Spread panes out evenly
     L       Switch to the last client
     M       Clear the marked pane
@@ -33,11 +40,13 @@ Leader: `<ctrl><space>`
     d       Detach the current client
     f       Search for a pane
     i       Display window information
+    l       Select the previously current window
     m       Toggle the marked pane
+    n       Select the next window
     o       Select the next pane
     q       Display pane numbers
     s       Choose a session from a list
-    t       Show a clock
+    t       tms
     w       Choose a window from a list
     x       Kill the active pane
     z       Zoom the active pane
@@ -65,6 +74,9 @@ Leader: `<ctrl><space>`
     M-Left  Resize the pane left by 5
     M-Right Resize the pane right by 5
     C-o     Rotate through the panes
+    C-r     tms refresh
+    C-s     tms switch
+    C-w     tms windows
     C-z     Suspend the current client
     C-Up    Resize the pane up
     C-Down  Resize the pane down
@@ -75,3 +87,4 @@ Leader: `<ctrl><space>`
     S-Left  Move the visible part of the window left
     S-Right Move the visible part of the window right
 ```
+