Update niri settings for keybindings

CLAUDE.md

@@ -0,0 +1,64 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## What This Repo Is
+
+Personal dotfiles for a Linux desktop, currently running **Niri** (Wayland compositor) with **Noctalia** as the desktop shell. There are legacy X11 configs (i3, polybar, picom) that are no longer the primary setup.
+
+## Deployment
+
+Configs are deployed by symlinking into `~/.config/` and `~/.profile`:
+
+```bash
+bash ~/.dotfiles/setup.sh
+```
+
+The script is idempotent — it skips links that already exist. After adding a new top-level config directory, add a `configlink <dirname>` line to `setup.sh`.
+
+## Installing Desktop Applications
+
+```bash
+cd ansible.desktop
+./install-desktop-toolsontech.sh
+```
+
+This installs ansible if missing, then runs the playbook. Tasks are split by category in `ansible.desktop/tasks/`.
+
+## Architecture
+
+### Niri (Wayland compositor)
+`niri/config.kdl` is just includes — the real config lives in `niri/cfg/`:
+- `input.kdl` — keyboard/mouse/touchpad settings
+- `keybinds.kdl` — all keybindings
+- `layout.kdl` — gaps, border, window sizing
+- `display.kdl` — monitor layout and scaling
+- `autostart.kdl` — apps launched on compositor start
+- `rules.kdl` — window-specific rules
+- `animation.kdl`, `misc.kdl` — tweaks
+
+Edit the relevant split file, not `config.kdl` itself.
+
+### Noctalia (desktop shell / bar)
+All settings live in `noctalia/settings.json` (JSON, edited by the Noctalia GUI or directly). Colorschemes are in `noctalia/colorschemes/` and plugins in `noctalia/plugins/`.
+
+### Neovim
+Uses **LazyVIM** framework. Entry point is `nvim/init.lua` which bootstraps lazy.nvim via `nvim/lua/config/lazy.lua`.
+
+- `nvim/lua/config/` — core config (options, keymaps, autocmds)
+- `nvim/lua/plugins/` — plugin overrides/additions on top of LazyVIM defaults
+- `nvim/lua/colorschemes/` — colorscheme configs
+
+LazyVIM handles most plugin management; only deviations from LazyVIM defaults need entries in `lua/plugins/`.
+
+### tmux
+`tmux/tmux.conf` + catppuccin theme as a git submodule at `tmux/plugins/catppuccin/tmux`. After cloning, initialize the submodule:
+
+```bash
+git submodule update --init
+```
+
+### Shell / profile
+`profile` is symlinked to `~/.profile`. It sets up SSH keys via `keychain` and defines the `notes` alias (attaches/creates a tmux session with nvim opening `~/Notes/Personal`).
+
+`zoxide.bash` provides shell integration for zoxide (directory jumping) — sourced separately, not via `profile`.

ansible.desktop/tasks/base_packages.yml

@@ -36,11 +36,9 @@
   become: true
   apt:
     name:
+      - flameshot
       - peek
       - obs-studio
-      - grim
-      - satty
-      - slurp
 
 - name: Brave Browser
   become: true

claude/settings.json

@@ -1,5 +1,7 @@
 {
-  "theme": "dark",
+  "permissions": {
+    "defaultMode": "auto"
+  },
   "hooks": {
     "Stop": [
       {
@@ -21,5 +23,46 @@
         ]
       }
     ]
+  },
+  "statusLine": {
+    "type": "command",
+    "command": "bash \"/home/bgrolleman/.claude/statusline-command.sh\""
+  },
+  "enabledPlugins": {
+    "frontend-design@claude-plugins-official": true,
+    "lua-lsp@claude-plugins-official": true,
+    "ponytail@ponytail": true
+  },
+  "extraKnownMarketplaces": {
+    "ponytail": {
+      "source": {
+        "source": "github",
+        "repo": "DietrichGebert/ponytail"
+      }
+    },
+    "caveman": {
+      "source": {
+        "source": "github",
+        "repo": "juliusbrussee/caveman"
+      }
+    }
+  },
+  "effortLevel": "high",
+  "advisorModel": "opus",
+  "voice": {
+    "enabled": true,
+    "mode": "hold"
+  },
+  "theme": "dark",
+  "agentPushNotifEnabled": true,
+  "skipAutoPermissionPrompt": true,
+  "voiceEnabled": true,
+  "mcpServers": {
+    "comfyui-image-gen": {
+      "command": "/home/bgrolleman/Project/ComfyUI/.venv/bin/python",
+      "args": [
+        "/home/bgrolleman/Project/ComfyUI/mcp_server.py"
+      ]
+    }
   }
 }

claude/statusline-command.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+# Claude Code status line
+# Shows: model display name, a progress bar for context-window tokens
+# remaining in this session, current git branch, active subagent (if any),
+# and enabled plugins (read from ~/.claude/settings.json).
+
+input=$(cat)
+
+model=$(echo "$input" | jq -r '.model.display_name // "unknown"')
+cwd=$(echo "$input" | jq -r '.workspace.current_dir // empty')
+remaining=$(echo "$input" | jq -r '.context_window.remaining_percentage // empty')
+agent_name=$(echo "$input" | jq -r '.agent.name // empty')
+
+# --- Colors (kept modest; Claude Code renders the status line dimmed) ---
+c_model='\033[36m'   # cyan
+c_bar='\033[32m'     # green
+c_branch='\033[33m'  # yellow
+c_agent='\033[35m'   # magenta
+c_plugin='\033[34m'  # blue
+c_reset='\033[0m'
+
+# --- Git branch (skip optional locks; silent if not a repo) ---
+branch=""
+if [ -n "$cwd" ]; then
+  branch=$(git --no-optional-locks -C "$cwd" branch --show-current 2>/dev/null)
+fi
+
+# --- Enabled plugins, read from settings.json (not present on stdin) ---
+settings_file="$HOME/.claude/settings.json"
+plugins=""
+if [ -f "$settings_file" ]; then
+  plugins=$(jq -r '.enabledPlugins // {} | to_entries[] | select(.value == true) | .key | split("@")[0]' "$settings_file" 2>/dev/null | paste -sd, -)
+fi
+
+# --- Context-window remaining-tokens progress bar ---
+bar=""
+if [ -n "$remaining" ]; then
+  pct=${remaining%.*}
+  [ -z "$pct" ] && pct=0
+  [ "$pct" -lt 0 ] 2>/dev/null && pct=0
+  [ "$pct" -gt 100 ] 2>/dev/null && pct=100
+  total_blocks=10
+  filled=$(( pct * total_blocks / 100 ))
+  [ "$filled" -gt "$total_blocks" ] && filled=$total_blocks
+  [ "$filled" -lt 0 ] && filled=0
+  empty=$(( total_blocks - filled ))
+  bar="["
+  i=0
+  while [ "$i" -lt "$filled" ]; do bar="${bar}█"; i=$((i + 1)); done
+  i=0
+  while [ "$i" -lt "$empty" ]; do bar="${bar}░"; i=$((i + 1)); done
+  bar="${bar}] ${pct}% left"
+fi
+
+# --- Assemble the status line ---
+printf "${c_model}%s${c_reset}" "$model"
+
+if [ -n "$bar" ]; then
+  printf "  ${c_bar}%s${c_reset}" "$bar"
+fi
+
+if [ -n "$branch" ]; then
+  printf "  ${c_branch}git:%s${c_reset}" "$branch"
+fi
+
+if [ -n "$agent_name" ]; then
+  printf "  ${c_agent}agent:%s${c_reset}" "$agent_name"
+fi
+
+if [ -n "$plugins" ]; then
+  printf "  ${c_plugin}plugins:%s${c_reset}" "$plugins"
+fi
+
+printf '\n'

fish/conf.d/ssh-keychain.fish

@@ -0,0 +1,15 @@
+# Start keychain and source SSH agent variables for all private keys in ~/.ssh
+if status is-interactive
+    if type -q keychain
+        set -l _ssh_keys
+        for _pub in ~/.ssh/*.pub
+            set -l _key (string replace -r '\.pub$' '' $_pub)
+            if test -f $_key
+                set -a _ssh_keys $_key
+            end
+        end
+        if test (count $_ssh_keys) -gt 0
+            keychain --eval --quiet $_ssh_keys | source
+        end
+    end
+end

fish/config.fish

@@ -0,0 +1,4 @@
+# Machine-specific config (secrets, local overrides) — not tracked in dotfiles
+if test -f ~/.config/fish/local.fish
+    source ~/.config/fish/local.fish
+end

gitui/theme.ron

@@ -1,24 +0,0 @@
-// TokyoNight Night theme for gitui
-(
-    selected_tab: Reset,
-    command_fg: Rgb(192, 202, 245),
-    selection_bg: Rgb(41, 46, 66),
-    selection_fg: Rgb(192, 202, 245),
-    cmdbar_bg: Rgb(26, 27, 38),
-    cmdbar_extra_lines_bg: Rgb(26, 27, 38),
-    disabled_fg: Rgb(86, 95, 137),
-    diff_line_add: Rgb(158, 206, 106),
-    diff_line_delete: Rgb(247, 118, 142),
-    diff_file_added: Rgb(115, 218, 202),
-    diff_file_removed: Rgb(247, 118, 142),
-    diff_file_moved: Rgb(187, 154, 247),
-    diff_file_modified: Rgb(224, 175, 104),
-    commit_hash: Rgb(187, 154, 247),
-    commit_time: Rgb(125, 207, 255),
-    commit_author: Rgb(158, 206, 106),
-    danger_fg: Rgb(247, 118, 142),
-    push_gauge_bg: Rgb(65, 72, 104),
-    push_gauge_fg: Rgb(192, 202, 245),
-    tag_fg: Rgb(187, 154, 247),
-    branch_fg: Rgb(224, 175, 104),
-)

kanshi/config

@@ -0,0 +1,8 @@
+profile ultrawide-hdmi {
+    output "DP-1" mode 5120x1440 position 0,0 scale 1
+    output "HDMI-A-1" mode 1920x1080 position 1600,1440 scale 1
+}
+
+profile ultrawide {
+    output "DP-1" mode 5120x1440 position 0,0 scale 1
+}

niri/cfg/autostart.kdl

@@ -2,9 +2,4 @@
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous#spawn-sh-at-startup
 
     spawn-sh-at-startup "qs -c noctalia-shell"
-
+    spawn-at-startup "kanshi"
-    // Lock screen after 5 min, turn off monitors after 15 min
-    spawn-at-startup "swayidle" "-w"
-        "timeout" "300" "qs -c noctalia-shell ipc call lockScreen lock"
-        "timeout" "900" "niri msg action power-off-monitors"
-        "resume"        "niri msg action power-on-monitors"

niri/cfg/input.kdl

@@ -12,7 +12,7 @@ input {
     }
 
     touchpad {
-        //tap // Enable tap-to-click
+        tap // Enable tap-to-click
 	dwt
 	scroll-method "two-finger"
 	tap-button-map "left-right-middle"

niri/cfg/keybinds.kdl

@@ -9,12 +9,16 @@ binds {
     //Mod+Shift+ESCAPE    { show-hotkey-overlay; }
 
     Mod+h               { show-hotkey-overlay; }
-    Mod+Shift+S	{ spawn-sh "flameshot gui"; }
+    Mod+Shift+S	{ spawn-sh "grim -g \"$(slurp)\" - | satty --filename - -o ~/Pictures/Screenshots/satty-%Y%m%d-%H%M%S.png --copy-command wl-copy --actions-on-enter save-to-clipboard --save-after-copy"; }
 
     // ─── Applications ───
     Alt+Return                         hotkey-overlay-title="Open Terminal: Alacritty" { spawn "alacritty"; }
+    Mod+G                              hotkey-overlay-title="Focus: Gmail" { spawn-sh "$HOME/.config/niri/focus-or-launch.sh chrome-fmgjjmmmlfnkbppncabfkddbjimcfncm-Default /opt/helium-browser-bin/helium-wrapper --profile-directory=Default --app-id=fmgjjmmmlfnkbppncabfkddbjimcfncm"; }
+    Mod+W                              hotkey-overlay-title="Focus: WhatsApp" { spawn-sh "$HOME/.config/niri/focus-or-launch.sh chrome-hnpfjngllnobngcgfapefoaidbinmjnm-Default /opt/helium-browser-bin/helium-wrapper --profile-directory=Default --app-id=hnpfjngllnobngcgfapefoaidbinmjnm"; }
+    Mod+D                              hotkey-overlay-title="Focus: Todoist" { spawn-sh "$HOME/.config/niri/focus-or-launch.sh chrome-dlgohinmglaoopaiplliaecdpmnepmga-Default /opt/helium-browser-bin/helium-wrapper --profile-directory=Default --app-id=dlgohinmglaoopaiplliaecdpmnepmga"; }
     //Mod+CTRL+Return                     hotkey-overlay-title="Open App Launcher: noctalia launcher" { spawn-sh "qs -c noctalia-shell ipc call launcher toggle"; }
     Alt+Space                          hotkey-overlay-title="Open App Launcher: noctalia launcher" { spawn-sh "qs -c noctalia-shell ipc call launcher toggle"; }
+    Alt+Shift+Space                    hotkey-overlay-title="Open Window Search: noctalia launcher" { spawn-sh "qs -c noctalia-shell ipc call launcher windows"; }
     Mod+B                              hotkey-overlay-title="Open Browser: helium" { spawn "helium-browser"; }
     Mod+L                              hotkey-overlay-title="Lock Screen: noctalia lock" { spawn-sh "qs -c noctalia-shell ipc call lockScreen lock"; }
     Mod+Shift+Q                        hotkey-overlay-title="Session Menu: noctalia sessionMenu" { spawn-sh "qs -c noctalia-shell ipc call sessionMenu toggle"; }
@@ -98,22 +102,22 @@ binds {
     // Mod+CTRL+Shift+WheelScrollDown      { move-column-right; }
     // Mod+CTRL+Shift+WheelScrollUp        { move-column-left; }
 
-    Alt+1                               { focus-workspace 1; }
+    Alt+1                               { focus-workspace "1"; }
-    Alt+2                               { focus-workspace 2; }
+    Alt+2                               { focus-workspace "2"; }
-    Alt+3                               { focus-workspace 3; }
+    Alt+3                               { focus-workspace "3"; }
-    Alt+4                               { focus-workspace 4; }
+    Alt+4                               { focus-workspace "4"; }
-    Alt+5                               { focus-workspace 5; }
+    Alt+5                               { focus-workspace "5"; }
-    Alt+6                               { focus-workspace 6; }
+    Alt+6                               { focus-workspace "6"; }
     Alt+7                               { focus-workspace 7; }
     Alt+8                               { focus-workspace 8; }
     Alt+9                               { focus-workspace 9; }
 
-    Alt+Shift+1                          { move-column-to-workspace 1; }
+    Alt+Shift+1                          { move-column-to-workspace "1"; }
-    Alt+Shift+2                          { move-column-to-workspace 2; }
+    Alt+Shift+2                          { move-column-to-workspace "2"; }
-    Alt+Shift+3                          { move-column-to-workspace 3; }
+    Alt+Shift+3                          { move-column-to-workspace "3"; }
-    Alt+Shift+4                          { move-column-to-workspace 4; }
+    Alt+Shift+4                          { move-column-to-workspace "4"; }
-    Alt+Shift+5                          { move-column-to-workspace 5; }
+    Alt+Shift+5                          { move-column-to-workspace "5"; }
-    Alt+Shift+6                          { move-column-to-workspace 6; }
+    Alt+Shift+6                          { move-column-to-workspace "6"; }
     Alt+Shift+7                          { move-column-to-workspace 7; }
     Alt+Shift+8                          { move-column-to-workspace 8; }
     Alt+Shift+9                          { move-column-to-workspace 9; }
@@ -132,7 +136,6 @@ binds {
     // ─── Modes ───
     Mod+T                               { toggle-window-floating; }
     Mod+F                               { fullscreen-window; }
-    Mod+W                               { toggle-column-tabbed-display; }
 
     // ─── Screenshots ───
     CTRL+Shift+1                        { screenshot; }

niri/cfg/layout.kdl

@@ -5,7 +5,9 @@
         background-color "transparent" // <- needed for noctalia-shell to set wallpaper
 
 	//default-column-width { proportion 0.95; }
-	default-column-width { proportion 0.40; }
+	//default-column-width { proportion 0.40; }
+	//default-column-width {}
+	default-column-width { fixed 1200; }
 
         preset-column-widths {
             proportion 0.33333

niri/cfg/workspaces.kdl

@@ -1,2 +1,18 @@
-workspace "browser"
+workspace "1" {
-workspace "chat" 
+    open-on-output "DP-1"
+}
+workspace "2" {
+    open-on-output "DP-1"
+}
+workspace "3" {
+    open-on-output "DP-1"
+}
+workspace "4" {
+    open-on-output "DP-1"
+}
+workspace "5" {
+    open-on-output "DP-1"
+}
+workspace "6" {
+    open-on-output "HDMI-A-1"
+}

niri/focus-or-launch.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Focus an existing window by app-id, or launch it if not found.
+# If the target window is already focused, return to the previous window.
+# Usage: focus-or-launch.sh <app-id> <launch-command...>
+APP_ID="$1"
+shift
+
+WINDOWS=$(niri msg -j windows)
+FOCUSED_ID=$(echo "$WINDOWS" | jq -r '.[] | select(.is_focused == true) | .id')
+TARGET_ID=$(echo "$WINDOWS" | jq -r --arg app "$APP_ID" '.[] | select(.app_id == $app) | .id' | head -1)
+
+PREV_FILE="/tmp/niri-focus-prev-${APP_ID}"
+
+if [ "$FOCUSED_ID" = "$TARGET_ID" ]; then
+    if [ -f "$PREV_FILE" ]; then
+        niri msg action focus-window --id "$(cat "$PREV_FILE")" 2>/dev/null || true
+    fi
+else
+    echo "$FOCUSED_ID" > "$PREV_FILE"
+    if [ -n "$TARGET_ID" ]; then
+        niri msg action focus-window --id "$TARGET_ID"
+    else
+        exec "$@"
+    fi
+fi

noctalia/settings.json

@@ -60,6 +60,7 @@
         "middleClickCommand": "",
         "middleClickFollowMouse": false,
         "monitors": [
+            "DP-1"
         ],
         "mouseWheelAction": "none",
         "mouseWheelWrap": true,
@@ -149,7 +150,7 @@
                     "hideUnoccupied": false,
                     "iconScale": 0.8,
                     "id": "Workspace",
-                    "labelMode": "index",
+                    "labelMode": "name",
                     "occupiedColor": "secondary",
                     "pillSize": 0.6,
                     "showApplications": false,
@@ -182,6 +183,18 @@
                     "pinned": [
                     ]
                 },
+                {
+                    "displayMode": "onhover",
+                    "iconColor": "none",
+                    "id": "Network",
+                    "textColor": "none"
+                },
+                {
+                    "displayMode": "onhover",
+                    "iconColor": "none",
+                    "id": "Bluetooth",
+                    "textColor": "none"
+                },
                 {
                     "hideWhenZero": false,
                     "hideWhenZeroUnread": false,
@@ -341,23 +354,23 @@
         "groupClickAction": "cycle",
         "groupContextMenuMode": "extended",
         "groupIndicatorStyle": "dots",
-        "inactiveIndicators": false,
+        "inactiveIndicators": true,
         "indicatorColor": "primary",
         "indicatorOpacity": 0.6,
         "indicatorThickness": 3,
         "launcherIcon": "",
         "launcherIconColor": "none",
-        "launcherPosition": "end",
+        "launcherPosition": "start",
-        "launcherUseDistroLogo": false,
+        "launcherUseDistroLogo": true,
         "monitors": [
         ],
         "onlySameOutput": true,
         "pinnedApps": [
         ],
-        "pinnedStatic": false,
+        "pinnedStatic": true,
-        "position": "bottom",
+        "position": "left",
         "showDockIndicator": true,
-        "showLauncherIcon": false,
+        "showLauncherIcon": true,
         "sitOnFrame": false,
         "size": 1
     },
@@ -475,8 +488,8 @@
         "bluetoothRssiPollIntervalMs": 60000,
         "bluetoothRssiPollingEnabled": false,
         "disableDiscoverability": false,
-        "networkPanelView": "wifi",
+        "networkPanelView": "ethernet",
-        "wifiDetailsViewMode": "grid"
+        "wifiDetailsViewMode": "list"
     },
     "nightLight": {
         "autoSchedule": true,

nvim/disable/config.lua

@@ -0,0 +1,24 @@
+local rocks_config = {
+rocks_path = vim.env.HOME .. "/.local/share/nvim/rocks",
+}
+
+vim.g.rocks_nvim = rocks_config
+
+local luarocks_path = {
+vim.fs.joinpath(rocks_config.rocks_path, "share", "lua", "5.1", "?.lua"),
+vim.fs.joinpath(rocks_config.rocks_path, "share", "lua", "5.1", "?", "init.lua"),
+}
+package.path = package.path .. ";" .. table.concat(luarocks_path, ";")
+
+local luarocks_cpath = {
+vim.fs.joinpath(rocks_config.rocks_path, "lib", "lua", "5.1", "?.so"),
+vim.fs.joinpath(rocks_config.rocks_path, "lib64", "lua", "5.1", "?.so"),
+-- Remove the dylib and dll paths if you do not need macos or windows support
+vim.fs.joinpath(rocks_config.rocks_path, "lib", "lua", "5.1", "?.dylib"),
+vim.fs.joinpath(rocks_config.rocks_path, "lib64", "lua", "5.1", "?.dylib"),
+vim.fs.joinpath(rocks_config.rocks_path, "lib", "lua", "5.1", "?.dll"),
+vim.fs.joinpath(rocks_config.rocks_path, "lib64", "lua", "5.1", "?.dll"),
+}
+package.cpath = package.cpath .. ";" .. table.concat(luarocks_cpath, ";")
+
+vim.opt.runtimepath:append(vim.fs.joinpath(rocks_config.rocks_path, "lib", "luarocks", "rocks-5.1", "rocks.nvim", "*"))

nvim/disable/config.vim

@@ -0,0 +1,355 @@
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => General
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+set mouse=a
+" Sets how many lines of history VIM has to remember
+set history=500
+
+" Enable filetype plugins
+filetype plugin on
+filetype indent on
+
+" Set to auto read when a file is changed from the outside
+set autoread
+au FocusGained,BufEnter * checktime
+
+" With a map leader it's possible to do extra key combinations
+" like <leader>w saves the current file
+let mapleader = ","
+
+" Fast saving
+nmap <leader>s :w!<cr>
+
+" :W sudo saves the file 
+" (useful for handling the permission-denied error)
+command! W execute 'w !sudo tee % > /dev/null' <bar> edit!
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => VIM user interface
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Set 7 lines to the cursor - when moving vertically using j/k
+set so=7
+
+" Avoid garbled characters in Chinese language windows OS
+let $LANG='en' 
+set langmenu=en
+source $VIMRUNTIME/delmenu.vim
+source $VIMRUNTIME/menu.vim
+
+" Turn on the Wild menu
+set wildmenu
+
+" Ignore compiled files
+set wildignore=*.o,*~,*.pyc
+if has("win16") || has("win32")
+    set wildignore+=.git\*,.hg\*,.svn\*
+else
+    set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store
+endif
+
+"Always show current position
+set ruler
+
+" Height of the command bar
+set cmdheight=1
+
+" A buffer becomes hidden when it is abandoned
+set hid
+
+" Configure backspace so it acts as it should act
+set backspace=eol,start,indent
+set whichwrap+=<,>,h,l
+
+" Ignore case when searching
+set ignorecase
+
+" When searching try to be smart about cases 
+set smartcase
+
+" Highlight search results
+set hlsearch
+
+" Makes search act like search in modern browsers
+set incsearch 
+
+" Don't redraw while executing macros (good performance config)
+set lazyredraw 
+
+" For regular expressions turn magic on
+set magic
+
+" Show matching brackets when text indicator is over them
+set showmatch 
+" How many tenths of a second to blink when matching brackets
+set mat=2
+
+" No annoying sound on errors
+set noerrorbells
+set novisualbell
+set t_vb=
+set tm=500
+
+" Properly disable sound on errors on MacVim
+if has("gui_macvim")
+    autocmd GUIEnter * set vb t_vb=
+endif
+
+
+" Add a bit extra margin to the left
+set foldcolumn=1
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Colors and Fonts
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Enable syntax highlighting
+syntax enable 
+
+" Enable 256 colors palette in Gnome Terminal
+if $COLORTERM == 'gnome-terminal'
+    set t_Co=256
+endif
+
+try
+    colorscheme darkelf
+catch
+endtry
+
+set background=dark
+
+" Set extra options when running in GUI mode
+if has("gui_running")
+    set guioptions-=T
+    set guioptions-=e
+    set t_Co=256
+    set guitablabel=%M\ %t
+endif
+
+" Set utf8 as standard encoding and en_US as the standard language
+set encoding=utf8
+
+" Use Unix as the standard file type
+set ffs=unix,dos,mac
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Files, backups and undo
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Turn backup off, since most stuff is in SVN, git etc. anyway...
+set nobackup
+set nowb
+set noswapfile
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Text, tab and indent related
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Use spaces instead of tabs
+set expandtab
+
+" Be smart when using tabs ;)
+set smarttab
+
+" 1 tab == 4 spaces
+set shiftwidth=4
+set tabstop=4
+
+" Linebreak on 500 characters
+set lbr
+set tw=500
+
+set ai "Auto indent
+set si "Smart indent
+set wrap "Wrap lines
+
+
+""""""""""""""""""""""""""""""
+" => Visual mode related
+""""""""""""""""""""""""""""""
+" Visual mode pressing * or # searches for the current selection
+" Super useful! From an idea by Michael Naumann
+vnoremap <silent> * :<C-u>call VisualSelection('', '')<CR>/<C-R>=@/<CR><CR>
+vnoremap <silent> # :<C-u>call VisualSelection('', '')<CR>?<C-R>=@/<CR><CR>
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Moving around, tabs, windows and buffers
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Map <Space> to / (search) and Ctrl-<Space> to ? (backwards search)
+"map <space> /
+"map <C-space> ?
+
+" Disable highlight when <leader><cr> is pressed
+map <silent> <leader><cr> :noh<cr>
+
+" Smart way to move between windows
+map <C-j> <C-W>j
+map <C-k> <C-W>k
+map <C-h> <C-W>h
+map <C-l> <C-W>l
+
+" Close the current buffer
+map <leader>bd :Bclose<cr>:tabclose<cr>gT
+
+" Close all the buffers
+map <leader>ba :bufdo bd<cr>
+
+map <leader>bl :bnext<cr>
+map <leader>bh :bprevious<cr>
+
+" Useful mappings for managing tabs
+map <leader>tn :tabnew<cr>
+map <leader>to :tabonly<cr>
+map <leader>tc :tabclose<cr>
+map <leader>tm :tabmove 
+map <leader>t<leader> :tabnext 
+
+" Let 'tl' toggle between this and the last accessed tab
+let g:lasttab = 1
+nmap <Leader>tl :exe "tabn ".g:lasttab<CR>
+au TabLeave * let g:lasttab = tabpagenr()
+
+
+" Opens a new tab with the current buffer's path
+" Super useful when editing files in the same directory
+map <leader>te :tabedit <C-r>=expand("%:p:h")<cr>/
+
+" Switch CWD to the directory of the open buffer
+map <leader>cd :cd %:p:h<cr>:pwd<cr>
+
+" Specify the behavior when switching between buffers 
+try
+  set switchbuf=useopen,usetab,newtab
+  set stal=2
+catch
+endtry
+
+" Return to last edit position when opening files (You want this!)
+au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
+
+
+""""""""""""""""""""""""""""""
+" => Status line
+""""""""""""""""""""""""""""""
+" Always show the status line
+set laststatus=2
+
+" Format the status line
+set statusline=\ %{HasPaste()}%F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Editing mappings
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Remap VIM 0 to first non-blank character
+map 0 ^
+
+" Move a line of text using ALT+[jk] or Command+[jk] on mac
+nmap <M-j> mz:m+<cr>`z
+nmap <M-k> mz:m-2<cr>`z
+vmap <M-j> :m'>+<cr>`<my`>mzgv`yo`z
+vmap <M-k> :m'<-2<cr>`>my`<mzgv`yo`z
+
+if has("mac") || has("macunix")
+  nmap <D-j> <M-j>
+  nmap <D-k> <M-k>
+  vmap <D-j> <M-j>
+  vmap <D-k> <M-k>
+endif
+
+" Delete trailing white space on save, useful for some filetypes ;)
+fun! CleanExtraSpaces()
+    let save_cursor = getpos(".")
+    let old_query = getreg('/')
+    silent! %s/\s\+$//e
+    call setpos('.', save_cursor)
+    call setreg('/', old_query)
+endfun
+
+if has("autocmd")
+    autocmd BufWritePre *.txt,*.js,*.py,*.wiki,*.sh,*.coffee :call CleanExtraSpaces()
+endif
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Spell checking
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Pressing ,ss will toggle and untoggle spell checking
+map <leader>ss :setlocal spell!<cr>
+
+" Shortcuts using <leader>
+map <leader>sn ]s
+map <leader>sp [s
+map <leader>sa zg
+map <leader>s? z=
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Misc
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Remove the Windows ^M - when the encodings gets messed up
+noremap <Leader>m mmHmt:%s/<C-V><cr>//ge<cr>'tzt'm
+
+" Quickly open a buffer for scribble
+map <leader>q :e ~/buffer<cr>
+
+" Quickly open a markdown buffer for scribble
+map <leader>x :e ~/buffer.md<cr>
+
+" Toggle paste mode on and off
+map <leader>pp :setlocal paste!<cr>
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Helper functions
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Returns true if paste mode is enabled
+function! HasPaste()
+    if &paste
+        return 'PASTE MODE  '
+    endif
+    return ''
+endfunction
+
+" Don't close window, when deleting a buffer
+command! Bclose call <SID>BufcloseCloseIt()
+function! <SID>BufcloseCloseIt()
+    let l:currentBufNum = bufnr("%")
+    let l:alternateBufNum = bufnr("#")
+
+    if buflisted(l:alternateBufNum)
+        buffer #
+    else
+        bnext
+    endif
+
+    if bufnr("%") == l:currentBufNum
+        new
+    endif
+
+    if buflisted(l:currentBufNum)
+        execute("bdelete! ".l:currentBufNum)
+    endif
+endfunction
+
+function! CmdLine(str)
+    call feedkeys(":" . a:str)
+endfunction 
+
+function! VisualSelection(direction, extra_filter) range
+    let l:saved_reg = @"
+    execute "normal! vgvy"
+
+    let l:pattern = escape(@", "\\/.*'$^~[]")
+    let l:pattern = substitute(l:pattern, "\n$", "", "")
+
+    if a:direction == 'gv'
+        call CmdLine("Ack '" . l:pattern . "' " )
+    elseif a:direction == 'replace'
+        call CmdLine("%s" . '/'. l:pattern . '/')
+    endif
+
+    let @/ = l:pattern
+    let @" = l:saved_reg
+endfunction

nvim/disable/init.vim

@@ -0,0 +1,357 @@
+lua require('config.lazy')
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => General
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+set mouse=a
+" Sets how many lines of history VIM has to remember
+set history=500
+
+" Enable filetype plugins
+filetype plugin on
+filetype indent on
+
+" Set to auto read when a file is changed from the outside
+set autoread
+au FocusGained,BufEnter * checktime
+
+" With a map leader it's possible to do extra key combinations
+" like <leader>w saves the current file
+let mapleader = ","
+
+" Fast saving
+nmap <leader>s :w!<cr>
+
+" :W sudo saves the file 
+" (useful for handling the permission-denied error)
+command! W execute 'w !sudo tee % > /dev/null' <bar> edit!
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => VIM user interface
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Set 7 lines to the cursor - when moving vertically using j/k
+set so=7
+
+" Avoid garbled characters in Chinese language windows OS
+let $LANG='en' 
+set langmenu=en
+source $VIMRUNTIME/delmenu.vim
+source $VIMRUNTIME/menu.vim
+
+" Turn on the Wild menu
+set wildmenu
+
+" Ignore compiled files
+set wildignore=*.o,*~,*.pyc
+if has("win16") || has("win32")
+    set wildignore+=.git\*,.hg\*,.svn\*
+else
+    set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store
+endif
+
+"Always show current position
+set ruler
+
+" Height of the command bar
+set cmdheight=1
+
+" A buffer becomes hidden when it is abandoned
+set hid
+
+" Configure backspace so it acts as it should act
+set backspace=eol,start,indent
+set whichwrap+=<,>,h,l
+
+" Ignore case when searching
+set ignorecase
+
+" When searching try to be smart about cases 
+set smartcase
+
+" Highlight search results
+set hlsearch
+
+" Makes search act like search in modern browsers
+set incsearch 
+
+" Don't redraw while executing macros (good performance config)
+set lazyredraw 
+
+" For regular expressions turn magic on
+set magic
+
+" Show matching brackets when text indicator is over them
+set showmatch 
+" How many tenths of a second to blink when matching brackets
+set mat=2
+
+" No annoying sound on errors
+set noerrorbells
+set novisualbell
+set t_vb=
+set tm=500
+
+" Properly disable sound on errors on MacVim
+if has("gui_macvim")
+    autocmd GUIEnter * set vb t_vb=
+endif
+
+
+" Add a bit extra margin to the left
+set foldcolumn=1
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Colors and Fonts
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Enable syntax highlighting
+syntax enable 
+
+" Enable 256 colors palette in Gnome Terminal
+if $COLORTERM == 'gnome-terminal'
+    set t_Co=256
+endif
+
+try
+    colorscheme darkelf
+catch
+endtry
+
+set background=dark
+
+" Set extra options when running in GUI mode
+if has("gui_running")
+    set guioptions-=T
+    set guioptions-=e
+    set t_Co=256
+    set guitablabel=%M\ %t
+endif
+
+" Set utf8 as standard encoding and en_US as the standard language
+set encoding=utf8
+
+" Use Unix as the standard file type
+set ffs=unix,dos,mac
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Files, backups and undo
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Turn backup off, since most stuff is in SVN, git etc. anyway...
+set nobackup
+set nowb
+set noswapfile
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Text, tab and indent related
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Use spaces instead of tabs
+set expandtab
+
+" Be smart when using tabs ;)
+set smarttab
+
+" 1 tab == 4 spaces
+set shiftwidth=4
+set tabstop=4
+
+" Linebreak on 500 characters
+set lbr
+set tw=500
+
+set ai "Auto indent
+set si "Smart indent
+set wrap "Wrap lines
+
+
+""""""""""""""""""""""""""""""
+" => Visual mode related
+""""""""""""""""""""""""""""""
+" Visual mode pressing * or # searches for the current selection
+" Super useful! From an idea by Michael Naumann
+vnoremap <silent> * :<C-u>call VisualSelection('', '')<CR>/<C-R>=@/<CR><CR>
+vnoremap <silent> # :<C-u>call VisualSelection('', '')<CR>?<C-R>=@/<CR><CR>
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Moving around, tabs, windows and buffers
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Map <Space> to / (search) and Ctrl-<Space> to ? (backwards search)
+map <space> /
+map <C-space> ?
+
+" Disable highlight when <leader><cr> is pressed
+map <silent> <leader><cr> :noh<cr>
+
+" Smart way to move between windows
+map <C-j> <C-W>j
+map <C-k> <C-W>k
+map <C-h> <C-W>h
+map <C-l> <C-W>l
+
+" Close the current buffer
+map <leader>bd :Bclose<cr>:tabclose<cr>gT
+
+" Close all the buffers
+map <leader>ba :bufdo bd<cr>
+
+map <leader>bl :bnext<cr>
+map <leader>bh :bprevious<cr>
+
+" Useful mappings for managing tabs
+map <leader>tn :tabnew<cr>
+map <leader>to :tabonly<cr>
+map <leader>tc :tabclose<cr>
+map <leader>tm :tabmove 
+map <leader>t<leader> :tabnext 
+
+" Let 'tl' toggle between this and the last accessed tab
+let g:lasttab = 1
+nmap <Leader>tl :exe "tabn ".g:lasttab<CR>
+au TabLeave * let g:lasttab = tabpagenr()
+
+
+" Opens a new tab with the current buffer's path
+" Super useful when editing files in the same directory
+map <leader>te :tabedit <C-r>=expand("%:p:h")<cr>/
+
+" Switch CWD to the directory of the open buffer
+map <leader>cd :cd %:p:h<cr>:pwd<cr>
+
+" Specify the behavior when switching between buffers 
+try
+  set switchbuf=useopen,usetab,newtab
+  set stal=2
+catch
+endtry
+
+" Return to last edit position when opening files (You want this!)
+au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
+
+
+""""""""""""""""""""""""""""""
+" => Status line
+""""""""""""""""""""""""""""""
+" Always show the status line
+set laststatus=2
+
+" Format the status line
+set statusline=\ %{HasPaste()}%F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Editing mappings
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Remap VIM 0 to first non-blank character
+map 0 ^
+
+" Move a line of text using ALT+[jk] or Command+[jk] on mac
+nmap <M-j> mz:m+<cr>`z
+nmap <M-k> mz:m-2<cr>`z
+vmap <M-j> :m'>+<cr>`<my`>mzgv`yo`z
+vmap <M-k> :m'<-2<cr>`>my`<mzgv`yo`z
+
+if has("mac") || has("macunix")
+  nmap <D-j> <M-j>
+  nmap <D-k> <M-k>
+  vmap <D-j> <M-j>
+  vmap <D-k> <M-k>
+endif
+
+" Delete trailing white space on save, useful for some filetypes ;)
+fun! CleanExtraSpaces()
+    let save_cursor = getpos(".")
+    let old_query = getreg('/')
+    silent! %s/\s\+$//e
+    call setpos('.', save_cursor)
+    call setreg('/', old_query)
+endfun
+
+if has("autocmd")
+    autocmd BufWritePre *.txt,*.js,*.py,*.wiki,*.sh,*.coffee :call CleanExtraSpaces()
+endif
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Spell checking
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Pressing ,ss will toggle and untoggle spell checking
+map <leader>ss :setlocal spell!<cr>
+
+" Shortcuts using <leader>
+map <leader>sn ]s
+map <leader>sp [s
+map <leader>sa zg
+map <leader>s? z=
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Misc
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Remove the Windows ^M - when the encodings gets messed up
+noremap <Leader>m mmHmt:%s/<C-V><cr>//ge<cr>'tzt'm
+
+" Quickly open a buffer for scribble
+map <leader>q :e ~/buffer<cr>
+
+" Quickly open a markdown buffer for scribble
+map <leader>x :e ~/buffer.md<cr>
+
+" Toggle paste mode on and off
+map <leader>pp :setlocal paste!<cr>
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Helper functions
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Returns true if paste mode is enabled
+function! HasPaste()
+    if &paste
+        return 'PASTE MODE  '
+    endif
+    return ''
+endfunction
+
+" Don't close window, when deleting a buffer
+command! Bclose call <SID>BufcloseCloseIt()
+function! <SID>BufcloseCloseIt()
+    let l:currentBufNum = bufnr("%")
+    let l:alternateBufNum = bufnr("#")
+
+    if buflisted(l:alternateBufNum)
+        buffer #
+    else
+        bnext
+    endif
+
+    if bufnr("%") == l:currentBufNum
+        new
+    endif
+
+    if buflisted(l:currentBufNum)
+        execute("bdelete! ".l:currentBufNum)
+    endif
+endfunction
+
+function! CmdLine(str)
+    call feedkeys(":" . a:str)
+endfunction 
+
+function! VisualSelection(direction, extra_filter) range
+    let l:saved_reg = @"
+    execute "normal! vgvy"
+
+    let l:pattern = escape(@", "\\/.*'$^~[]")
+    let l:pattern = substitute(l:pattern, "\n$", "", "")
+
+    if a:direction == 'gv'
+        call CmdLine("Ack '" . l:pattern . "' " )
+    elseif a:direction == 'replace'
+        call CmdLine("%s" . '/'. l:pattern . '/')
+    endif
+
+    let @/ = l:pattern
+    let @" = l:saved_reg
+endfunction

nvim/disable/rocks.toml

@@ -0,0 +1,21 @@
+# This is your rocks.nvim plugins declaration file.
+# Here is a small yet pretty detailed example on how to use it:
+#
+# [plugins]
+# nvim-treesitter = "semver_version"  # e.g. "1.0.0"
+
+# List of non-Neovim rocks.
+# This includes things like `toml` or other lua packages.
+[rocks]
+
+# List of Neovim plugins to install alongside their versions.
+# If the plugin name contains a dot then you must add quotes to the key name!
+[plugins]
+"rocks.nvim" = "2.43.1" # rocks.nvim can also manage itself :D
+"rocks-config.nvim" = "3.1.0"
+neorg = "9.3.0"
+"rocks-git.nvim" = "2.5.3"
+
+[plugins.nvim-treesitter]
+git = "nvim-treesitter/nvim-treesitter"
+rev = "v0.9.3"

nvim/init.lua

@@ -1,5 +1,20 @@
-require("config.lazy")
+print("advent of neovim")
 
+require("config.lazy")
+--
+-- local o = vim.opt
+-- o.compatible = false
+-- o.number = true
+-- o.cmdheight = 2
+-- o.expandtab = true
+-- o.smarttab = true
+-- o.shiftwidth = 4
+-- o.tabstop = 4
+-- o.ai = true
+-- o.si = true
+--
+-- nvim_create_user_command("InsertTodayHeader", ':pu=strftime("# %a %d %b %Y")', {})
+--
 vim.opt.compatible = false
 vim.opt.foldmethod = "expr"
 vim.opt.foldexpr = "v:lua.MyCustomFoldExpr()"
@@ -8,8 +23,7 @@ vim.diagnostic.config({ virtual_text = true })
 function _G.MyCustomFoldExpr()
   local line = vim.fn.getline(vim.v.lnum)
   if line:match("::$") then
-    return "="
+    return "=" -- keep the same fold level as the previous line
   end
-  local ok, result = pcall(vim.treesitter.foldexpr)
+  return vim.treesitter.foldexpr()
-  return ok and result or "0"
 end

nvim/lazyvim.json

@@ -10,14 +10,21 @@
     "lazyvim.plugins.extras.editor.mini-diff",
     "lazyvim.plugins.extras.editor.mini-files",
     "lazyvim.plugins.extras.editor.mini-move",
+    "lazyvim.plugins.extras.editor.neo-tree",
     "lazyvim.plugins.extras.editor.outline",
+    "lazyvim.plugins.extras.editor.snacks_explorer",
     "lazyvim.plugins.extras.editor.telescope",
     "lazyvim.plugins.extras.lang.ansible",
+    "lazyvim.plugins.extras.lang.clojure",
     "lazyvim.plugins.extras.lang.docker",
     "lazyvim.plugins.extras.lang.git",
     "lazyvim.plugins.extras.lang.helm",
     "lazyvim.plugins.extras.lang.json",
     "lazyvim.plugins.extras.lang.markdown",
+    "lazyvim.plugins.extras.lang.php",
+    "lazyvim.plugins.extras.lang.python",
+    "lazyvim.plugins.extras.lang.sql",
+    "lazyvim.plugins.extras.lang.toml",
     "lazyvim.plugins.extras.lang.yaml",
     "lazyvim.plugins.extras.util.dot",
     "lazyvim.plugins.extras.util.gitui",
@@ -28,4 +35,4 @@
     "NEWS.md": "11866"
   },
   "version": 8
-}
+}

nvim/lua/config/autocmds.lua

@@ -1,21 +1,7 @@
 -- Autocmds are automatically loaded on the VeryLazy event
--- By this point noice.nvim has already replaced vim.notify
+-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
-
+--
--- Log warnings and errors to file for debugging
+-- Add any additional autocmds here
-local log_path = vim.fn.stdpath("log") .. "/nvim_errors.log"
+-- with `vim.api.nvim_create_autocmd`
-local _notify = vim.notify
+--
-vim.notify = function(msg, level, opts)
+-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults)
-  if level and level >= vim.log.levels.WARN then
-    local f = io.open(log_path, "a")
-    if f then
-      f:write(string.format(
-        "[%s] %s: %s\n",
-        os.date("%Y-%m-%d %H:%M:%S"),
-        level == vim.log.levels.ERROR and "ERROR" or "WARN",
-        tostring(msg)
-      ))
-      f:close()
-    end
-  end
-  return _notify(msg, level, opts)
-end

nvim/lua/config/keymaps.lua

@@ -1,2 +1,12 @@
 -- Keymaps are automatically loaded on the VeryLazy event
--- Use legendary.nvim to add named commands to the command palette
+-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
+-- Add any additional keymaps here
+--
+-- vim.api.nvim_set_keymap("i", "jj", "<Esc>", { noremap = false })
+
+local wk = require("which-key")
+
+wk.add({
+  { "<leader>N", group = "Notes" },
+  { "<leader>Nt", ":Journal<CR>", desc = "Today" },
+})

nvim/lua/config/lazy.lua

@@ -18,8 +18,8 @@ vim.opt.rtp:prepend(lazypath)
 -- Make sure to setup `mapleader` and `maplocalleader` before
 -- loading lazy.nvim so that mappings are correct.
 -- This is also a good place to setup other settings (vim.opt)
-vim.g.mapleader = " "
+vim.g.mapleader = ","
-vim.g.maplocalleader = "\\"
+vim.g.maplocalleader = ","
 
 -- Setup lazy.nvim
 require("lazy").setup({

nvim/lua/config/lazy.lua.diff

@@ -0,0 +1,53 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out, "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup({
+  spec = {
+    -- add LazyVim and import its plugins
+    { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+    -- import/override with your plugins
+    { import = "plugins" },
+  },
+  defaults = {
+    -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
+    -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
+    lazy = false,
+    -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
+    -- have outdated releases, which may break your Neovim install.
+    version = false, -- always use the latest git commit
+    -- version = "*", -- try installing the latest stable version for plugins that support semver
+  },
+  install = { colorscheme = { "tokyonight", "habamax" } },
+  checker = {
+    enabled = true, -- check for plugin updates periodically
+    notify = false, -- notify on update
+  }, -- automatically check for plugin updates
+  performance = {
+    rtp = {
+      -- disable some rtp plugins
+      disabled_plugins = {
+        "gzip",
+        -- "matchit",
+        -- "matchparen",
+        -- "netrwPlugin",
+        "tarPlugin",
+        "tohtml",
+        "tutor",
+        "zipPlugin",
+      },
+    },
+  },
+})

nvim/lua/config/options.lua

@@ -1,6 +1,3 @@
 -- Options are automatically loaded before lazy.nvim startup
 -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
-vim.opt.relativenumber = true
+-- Add any additional options here
-vim.opt.scrolloff = 8
-vim.opt.wrap = false
-vim.opt.undofile = true

nvim/lua/plugins.disable/chatgpt.lua

@@ -0,0 +1,17 @@
+return {
+  "jackMort/ChatGPT.nvim",
+    event = "VeryLazy",
+    config = function()
+      require("chatgpt").setup({
+          openai_params = {
+              model = "gpt-4.1"
+          }
+      })
+    end,
+    dependencies = {
+      "MunifTanjim/nui.nvim",
+      "nvim-lua/plenary.nvim",
+      "folke/trouble.nvim", -- optional
+      "nvim-telescope/telescope.nvim"
+    }
+}

nvim/lua/plugins.disable/copilot.lua

@@ -0,0 +1,3 @@
+return {
+  { "zbirenbaum/copilot.lua", opts = { suggestion = { enabled = false } } },
+}

nvim/lua/plugins.disable/example.lua

@@ -0,0 +1,197 @@
+-- since this is just an example spec, don't actually load anything here and return an empty spec
+-- stylua: ignore
+if true then return {} end
+
+-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim
+--
+-- In your plugin files, you can:
+-- * add extra plugins
+-- * disable/enabled LazyVim plugins
+-- * override the configuration of LazyVim plugins
+return {
+  -- add gruvbox
+  { "ellisonleao/gruvbox.nvim" },
+
+  -- Configure LazyVim to load gruvbox
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "gruvbox",
+    },
+  },
+
+  -- change trouble config
+  {
+    "folke/trouble.nvim",
+    -- opts will be merged with the parent spec
+    opts = { use_diagnostic_signs = true },
+  },
+
+  -- disable trouble
+  { "folke/trouble.nvim", enabled = false },
+
+  -- override nvim-cmp and add cmp-emoji
+  {
+    "hrsh7th/nvim-cmp",
+    dependencies = { "hrsh7th/cmp-emoji" },
+    ---@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      table.insert(opts.sources, { name = "emoji" })
+    end,
+  },
+
+  -- change some telescope options and a keymap to browse plugin files
+  {
+    "nvim-telescope/telescope.nvim",
+    keys = {
+      -- add a keymap to browse plugin files
+      -- stylua: ignore
+      {
+        "<leader>fp",
+        function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
+        desc = "Find Plugin File",
+      },
+    },
+    -- change some options
+    opts = {
+      defaults = {
+        layout_strategy = "horizontal",
+        layout_config = { prompt_position = "top" },
+        sorting_strategy = "ascending",
+        winblend = 0,
+      },
+    },
+  },
+
+  -- add pyright to lspconfig
+  {
+    "neovim/nvim-lspconfig",
+    ---@class PluginLspOpts
+    opts = {
+      ---@type lspconfig.options
+      servers = {
+        -- pyright will be automatically installed with mason and loaded with lspconfig
+        pyright = {},
+      },
+    },
+  },
+
+  -- add tsserver and setup with typescript.nvim instead of lspconfig
+  {
+    "neovim/nvim-lspconfig",
+    dependencies = {
+      "jose-elias-alvarez/typescript.nvim",
+      init = function()
+        require("lazyvim.util").lsp.on_attach(function(_, buffer)
+          -- stylua: ignore
+          vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
+          vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
+        end)
+      end,
+    },
+    ---@class PluginLspOpts
+    opts = {
+      ---@type lspconfig.options
+      servers = {
+        -- tsserver will be automatically installed with mason and loaded with lspconfig
+        tsserver = {},
+      },
+      -- you can do any additional lsp server setup here
+      -- return true if you don't want this server to be setup with lspconfig
+      ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
+      setup = {
+        -- example to setup with typescript.nvim
+        tsserver = function(_, opts)
+          require("typescript").setup({ server = opts })
+          return true
+        end,
+        -- Specify * to use this function as a fallback for any server
+        -- ["*"] = function(server, opts) end,
+      },
+    },
+  },
+
+  -- for typescript, LazyVim also includes extra specs to properly setup lspconfig,
+  -- treesitter, mason and typescript.nvim. So instead of the above, you can use:
+  { import = "lazyvim.plugins.extras.lang.typescript" },
+
+  -- add more treesitter parsers
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = {
+      ensure_installed = {
+        "bash",
+        "html",
+        "javascript",
+        "json",
+        "lua",
+        "markdown",
+        "markdown_inline",
+        "python",
+        "query",
+        "regex",
+        "tsx",
+        "typescript",
+        "vim",
+        "yaml",
+      },
+    },
+  },
+
+  -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above
+  -- would overwrite `ensure_installed` with the new value.
+  -- If you'd rather extend the default config, use the code below instead:
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      -- add tsx and treesitter
+      vim.list_extend(opts.ensure_installed, {
+        "tsx",
+        "typescript",
+      })
+    end,
+  },
+
+  -- the opts function can also be used to change the default opts:
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    opts = function(_, opts)
+      table.insert(opts.sections.lualine_x, {
+        function()
+          return "😄"
+        end,
+      })
+    end,
+  },
+
+  -- or you can return new options to override all the defaults
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    opts = function()
+      return {
+        --[[add your custom lualine config here]]
+      }
+    end,
+  },
+
+  -- use mini.starter instead of alpha
+  { import = "lazyvim.plugins.extras.ui.mini-starter" },
+
+  -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc
+  { import = "lazyvim.plugins.extras.lang.json" },
+
+  -- add any tools you want to have installed below
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        "stylua",
+        "shellcheck",
+        "shfmt",
+        "flake8",
+      },
+    },
+  },
+}

nvim/lua/plugins.disable/follow-md-links.lua

@@ -0,0 +1,3 @@
+return {
+  "jghauser/follow-md-links.nvim",
+}

nvim/lua/plugins.disable/lualine.lua

@@ -0,0 +1,4 @@
+return {
+    'nvim-lualine/lualine.nvim',
+    dependencies = { 'nvim-tree/nvim-web-devicons' }
+}

nvim/lua/plugins.disable/neo-tree.lua

@@ -0,0 +1,16 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  branch = "v3.x",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+    "MunifTanjim/nui.nvim",
+    -- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information
+  },
+  lazy = false, -- neo-tree will lazily load itself
+  ---@module "neo-tree"
+  ---@type neotree.Config?
+  opts = {
+    -- fill any relevant options here
+  },
+}

nvim/lua/plugins.disable/neorg.lua

@@ -0,0 +1,66 @@
+return {
+  "nvim-neorg/neorg",
+  lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
+  version = "*", -- Pin Neorg to the latest stable release
+  config = function()
+    require("neorg").setup({
+      load = {
+        ["core.defaults"] = {}, -- Loads default behaviour
+        ["core.concealer"] = {}, -- Adds pretty icons to your documents
+        ["core.ui.calendar"] = {},
+        ["core.completion"] = { config = { engine = { module_name = "external.lsp-completion" }, name = "[Norg]" } },
+        ["core.esupports.metagen"] = { config = { type = "auto", update_date = true } },
+        ["core.qol.toc"] = {},
+        ["core.qol.todo_items"] = {},
+        ["core.looking-glass"] = {},
+        ["core.presenter"] = { config = { zen_mode = "zen-mode" } },
+        ["core.export"] = {},
+        ["core.export.markdown"] = { config = { extensions = "all" } },
+        ["core.summary"] = {},
+        ["core.tangle"] = { config = { report_on_empty = false } },
+        ["core.dirman"] = { -- Manages Neorg workspaces
+          config = {
+            workspaces = {
+              notes = "~/Notes.neorg",
+            },
+            default_workspace = "notes",
+          },
+        },
+        ["external.interim-ls"] = {
+          config = {
+            -- default config shown
+            completion_provider = {
+              -- Enable or disable the completion provider
+              enable = true,
+
+              -- Show file contents as documentation when you complete a file name
+              documentation = true,
+
+              -- Try to complete categories provided by Neorg Query. Requires `benlubas/neorg-query`
+              categories = false,
+
+              -- suggest heading completions from the given file for `{@x|}` where `|` is your cursor
+              -- and `x` is an alphanumeric character. `{@name}` expands to `[name]{:$/people:# name}`
+              people = {
+                enable = false,
+
+                -- path to the file you're like to use with the `{@x` syntax, relative to the
+                -- workspace root, without the `.norg` at the end.
+                -- ie. `folder/people` results in searching `$/folder/people.norg` for headings.
+                -- Note that this will change with your workspace, so it fails silently if the file
+                -- doesn't exist
+                path = "people",
+              },
+            },
+          },
+        },
+        ["core.keybinds"] = {
+          config = {
+            default_keybinds = true,
+            neorg_leader = "<Leader>n", -- Change this to whatever you want
+          },
+        },
+      },
+    })
+  end,
+}

nvim/lua/plugins.disable/toggleterm.nvim

@@ -0,0 +1,7 @@
+return { 
+  "akinsho/toggleterm.nvim",
+  tag = "*",
+  keys = {
+    { "<leader>td", "<cmd>ToggleTerm size=40 dir=~ direction=horizontal<cr>", "Open Horizontal terminal in home directory"}
+  }
+}

nvim/lua/plugins.disable/treesitter.lua

@@ -0,0 +1,3 @@
+return {
+  "nvim-treesitter/nvim-treesitter"
+}

nvim/lua/plugins.disable/twilight.lua

@@ -0,0 +1,8 @@
+return {
+  "folke/twilight.nvim",
+  opts = {
+    -- your configuration comes here
+    -- or leave it empty to use the default settings
+    -- refer to the configuration section below
+  },
+}

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

@@ -0,0 +1,18 @@
+return {
+  "folke/which-key.nvim",
+  event = "VeryLazy",
+  opts = {
+    -- your configuration comes here
+    -- or leave it empty to use the default settings
+    -- refer to the configuration section below
+  },
+  keys = {
+    {
+      { "<leader>N", group = "Neorg" },
+      { "<leader>Nt", ":Neorg journal today<CR>", desc = "Today" },
+    },
+  },
+}
+--{ "<leader>c", group = "ChatGPT" },
+--{ "<leader>cc", ":ChatGPT<CR>", desc = "ChatGPT" },
+--{ "<leader>ce", ":ChatGPTEditWithInstructions<CR>", desc = "ChatGPT Edit Selection with Instructions" },

nvim/lua/plugins/auto-session.lua

@@ -0,0 +1,7 @@
+return {
+  "rmagatti/auto-session",
+  lazy = false,
+  opts = {
+    suppressed_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
+  },
+}

nvim/lua/plugins/claude-code.lua

@@ -1,16 +0,0 @@
-return {
-  "greggh/claude-code.nvim",
-  dependencies = { "nvim-lua/plenary.nvim" },
-  config = function()
-    require("claude-code").setup({
-      window = {
-        position = "vertical",
-        split_ratio = 0.4,
-      },
-    })
-  end,
-  keys = {
-    { "<leader>cc", "<cmd>ClaudeCode<CR>", desc = "Claude Code: Toggle" },
-    { "<leader>cf", "<cmd>ClaudeCodeFocus<CR>", desc = "Claude Code: Focus" },
-  },
-}

nvim/lua/plugins/interim-ls.lua

@@ -0,0 +1,3 @@
+return {
+  "benlubas/neorg-interim-ls",
+}

nvim/lua/plugins/journal.lua

@@ -0,0 +1,28 @@
+return {
+  "jakobkhansen/journal.nvim",
+  config = function()
+    require("journal").setup({
+      filetype = "md", -- Filetype to use for new journal entries
+      root = "~/Notes/Personal/journals", -- Root directory for journal entries
+      date_format = "%Y-%m-%d", -- Date format for `:Journal <date-modifier>`
+      autocomplete_date_modifier = "end", -- "always"|"never"|"end". Enable date modifier autocompletion
+
+      -- Configuration for journal entries
+      journal = {
+        -- Default configuration for `:Journal <date-modifier>`
+        format = "%Y_%m_%d",
+        template = "# %A %B %d %Y\n",
+        frequency = { day = 1 },
+
+        -- Nested configurations for `:Journal <type> <type> ... <date-modifier>`
+        entries = {
+          day = {
+            format = "%Y_%m_%d", -- Format of the journal entry in the filesystem.
+            template = "# %A %B %d %Y\n", -- Optional. Template used when creating a new journal entry
+            frequency = { day = 1 }, -- Optional. The frequency of the journal entry. Used for `:Journal next`, `:Journal -2` etc
+          },
+        },
+      },
+    })
+  end,
+}

nvim/lua/plugins/legendary.lua

@@ -1,17 +0,0 @@
-return {
-  "mrjones2014/legendary.nvim",
-  priority = 10000,
-  lazy = false,
-  dependencies = { "nvim-telescope/telescope.nvim" },
-  opts = {
-    telescope = { auto_register_which_key = false },
-    keymaps = {
-      { "<leader>cc", description = "Claude Code: Toggle terminal" },
-      { "<leader>cf", description = "Claude Code: Focus terminal" },
-    },
-  },
-  keys = {
-    { "<leader><leader>", "<cmd>Legendary<CR>", desc = "Command Palette" },
-    { "<C-p>", "<cmd>Legendary<CR>", desc = "Command Palette", mode = { "n", "i" } },
-  },
-}

nvim/lua/plugins/mkdnflow.lua

@@ -0,0 +1,38 @@
+-- Configuration Documentation https://github.com/jakewvincent/mkdnflow.nvim?tab=readme-ov-file#%EF%B8%8F-configuration
+return {
+  "jakewvincent/mkdnflow.nvim",
+  config = function()
+    require("mkdnflow").setup({
+      -- Config goes here; leave blank for defaults
+      perspective = {
+        priority = "first",
+        root_tell = false,
+      },
+      new_file_template = {
+        use_template = true,
+        placeholders = {
+          before = {
+            title = "link_title",
+            date = "os_date",
+          },
+          after = {},
+        },
+        template = "# {{ title }}",
+      },
+      links = {
+        style = "markdown",
+        name_is_source = false,
+        conceal = false,
+        context = 0,
+        implicit_extension = nil,
+        transform_implicit = false,
+        transform_explicit = function(text)
+          text = text:gsub(" ", "-")
+          text = text:lower()
+          return text
+        end,
+        create_on_follow_failure = true,
+      },
+    })
+  end,
+}

nvim/lua/plugins/oil.lua

@@ -1,15 +0,0 @@
-return {
-  "stevearc/oil.nvim",
-  dependencies = { "nvim-tree/nvim-web-devicons" },
-  lazy = false,
-  opts = {
-    default_file_explorer = true,
-    columns = { "icon" },
-    view_options = {
-      show_hidden = true,
-    },
-  },
-  keys = {
-    { "-", "<cmd>Oil<CR>", desc = "Open parent directory" },
-  },
-}

setup.sh

@@ -14,6 +14,20 @@ link() {
     ln -s "$2" "$1"
   fi
 }
+# Like link(), but backs up existing regular files instead of skipping them
+smartlink() {
+  local target="$1" source="$2"
+  echo "Linking $target to $source"
+  if [ -L "$target" ]; then
+    : # already a symlink, nothing to do
+  elif [ -e "$target" ]; then
+    mv "$target" "${target}.bak"
+    echo "  Backed up existing file to ${target}.bak"
+    ln -s "$source" "$target"
+  else
+    ln -s "$source" "$target"
+  fi
+}
 configlink() {
   link ~/.config/$1 ~/.dotfiles/$1
 }
@@ -29,6 +43,20 @@ configlink polybar
 configlink picom.conf
 configlink niri
 configlink noctalia
+configlink kanshi
 
 checkdir ~/.claude
 link ~/.claude/settings.json ~/.dotfiles/claude/settings.json
+
+# Fish shell config
+checkdir ~/.config/fish
+checkdir ~/.config/fish/conf.d
+smartlink ~/.config/fish/config.fish ~/.dotfiles/fish/config.fish
+link ~/.config/fish/conf.d/ssh-keychain.fish ~/.dotfiles/fish/conf.d/ssh-keychain.fish
+
+# Migrate BW_SESSION and other machine-specific fish vars to local.fish
+if [ -f ~/.config/fish/config.fish.bak ] && [ ! -f ~/.config/fish/local.fish ]; then
+  echo "  Migrating machine-specific config from config.fish.bak to local.fish"
+  grep -v '^#' ~/.config/fish/config.fish.bak | grep -v '^\s*$' > ~/.config/fish/local.fish
+  echo "  Review ~/.config/fish/local.fish and remove anything now handled by dotfiles"
+fi