.bashrc updated

.bashrc

@@ -126,6 +126,31 @@ m3u8-download() {
   yt-dlp -f $format_code --hls-prefer-native "$1"
 }
 
+md2pdf() {
+    if [[ -z "$1" ]]; then
+        echo "Usage: md2pdf input.md [output.pdf]"
+        return 1
+    fi
+
+    local input="$1"
+    local output="${2:-${input%.*}.pdf}"
+
+    # Adding -V mainfont resolves the empty font fallback error
+    pandoc "$input" -o "$output" --pdf-engine=typst -V mainfont="DejaVu Sans"
+}
+
+typstwatch() {
+    if [[ -z "$1" ]]; then
+        echo "Usage: tw <filename>"
+        return 1
+    fi
+
+    # Strip extension if provided and use the base name
+    local base="${1%.*}"
+
+    (zathura "${base}.pdf" &) && typst watch "${base}.typ"
+}
+
 ## GPG functions
 gpg_encrypt () {
 	output=~/"${1}".$(date +%s).enc

.config/Simple-Signer/settings.ini

@@ -0,0 +1,9 @@
+[settings]
+cert-path = /home/fr/docs/icz/certs/ICZUser_251118.pfx
+stamp-path = 
+draw-stamp = 1
+ask-dest-path = 0
+stamp-background = 255,255,255
+stamp-outline = 0,0,0
+stamp-border = 2
+

.config/kanshi/config

@@ -0,0 +1,15 @@
+profile Laptop {
+	output eDP-1 enable
+}
+
+profile Work {
+	output eDP-1 disable
+	output DP-3 enable mode 2560x1440@59.951Hz position 0,0
+	output DP-5 enable mode 2560x1440@143.967Hz position 2560,0
+}
+
+profile Work2 {
+	output eDP-1 disable
+	output DP-4 enable mode 2560x1440@59.951Hz position 0,0
+	output DP-7 enable mode 2560x1440@143.967Hz position 2560,0
+}

.config/mango/config.conf

@@ -1,433 +0,0 @@
-# mango (0.12.9) configuration
-# Keybindings mirror the user's river (~/.config/river/init) and dwm
-# (~/git/dwm/config.h) setups: MOD1 (Alt) as primary modifier, dwm-style
-# tag handling, river-style window movement.
-#
-# Reference: https://github.com/mangowm/mango/wiki
-
-# ============================================================================
-# Window effects (scenefx)
-# ============================================================================
-blur=0
-blur_layer=0
-blur_optimized=1
-blur_params_num_passes=2
-blur_params_radius=5
-blur_params_noise=0.02
-blur_params_brightness=0.9
-blur_params_contrast=0.9
-blur_params_saturation=1.2
-
-shadows=0
-layer_shadows=0
-shadow_only_floating=1
-shadows_size=10
-shadows_blur=15
-shadows_position_x=0
-shadows_position_y=0
-shadowscolor=0x000000ff
-
-border_radius=0
-no_radius_when_single=0
-focused_opacity=1.0
-unfocused_opacity=1.0
-
-# ============================================================================
-# Animations
-# ============================================================================
-animations=1
-layer_animations=0
-# I hate animations, this will disable them
-layer_animations=0
-animations=0
-# Theyre gone
-animation_type_open=zoom
-animation_type_close=slide
-layer_animation_type_open=slide
-layer_animation_type_close=slide
-animation_fade_in=1
-animation_fade_out=1
-tag_animation_direction=1
-zoom_initial_ratio=0.3
-zoom_end_ratio=0.8
-fadein_begin_opacity=0.5
-fadeout_begin_opacity=0.8
-animation_duration_move=200
-animation_duration_open=100
-animation_duration_tag=0
-animation_duration_close=200
-animation_duration_focus=0
-animation_curve_open=0.46,1.0,0.29,1
-animation_curve_move=0.46,1.0,0.29,1
-animation_curve_tag=0.46,1.0,0.29,1
-animation_curve_close=0.08,0.92,0,1
-animation_curve_focus=0.46,1.0,0.29,1
-animation_curve_opafadeout=0.5,0.5,0.5,0.5
-animation_curve_opafadein=0.46,1.0,0.29,1
-
-# ============================================================================
-# Layouts
-# ============================================================================
-# Scroller
-scroller_structs=20
-scroller_default_proportion=0.8
-scroller_focus_center=0
-scroller_prefer_center=0
-edge_scroller_pointer_focus=1
-scroller_default_proportion_single=1.0
-scroller_proportion_preset=0.5,0.8,1.0
-
-# Master-Stack (matches river filtile main-ratio 55, main-location left)
-new_is_master=1
-default_mfact=0.55
-default_nmaster=1
-smartgaps=1
-
-# ============================================================================
-# Overview
-# ============================================================================
-hotarea_size=10
-enable_hotarea=0
-hotarea_corner=0
-ov_tab_mode=0
-overviewgappi=5
-overviewgappo=30
-
-# ============================================================================
-# Misc behaviour
-# ============================================================================
-no_border_when_single=1
-axis_bind_apply_timeout=100
-focus_on_activate=1
-idleinhibit_ignore_visible=0
-sloppyfocus=1
-warpcursor=0
-focus_cross_monitor=0
-focus_cross_tag=0
-enable_floating_snap=0
-snap_distance=30
-cursor_size=24
-drag_tile_to_tile=1
-
-# ============================================================================
-# Keyboard (matches river: set-repeat 30 200, layout us,cz(qwerty))
-# ============================================================================
-repeat_rate=30
-repeat_delay=200
-numlockon=0
-xkb_rules_layout=us,cz(qwerty)
-xkb_rules_options=grp:win_space_toggle
-
-# ============================================================================
-# Trackpad
-# ============================================================================
-disable_trackpad=1
-tap_to_click=1
-tap_and_drag=1
-drag_lock=1
-trackpad_natural_scrolling=0
-disable_while_typing=1
-left_handed=0
-middle_button_emulation=0
-swipe_min_threshold=1
-
-# ============================================================================
-# Mouse
-# ============================================================================
-mouse_natural_scrolling=0
-
-# ============================================================================
-# Appearance / colors (mostly preserved from previous config)
-# ============================================================================
-gappih=5
-gappiv=5
-gappoh=10
-gappov=10
-scratchpad_width_ratio=0.8
-scratchpad_height_ratio=0.9
-borderpx=1
-rootcolor=0x1D1F21ff
-bordercolor=0x586e75ff
-focuscolor=0x93a1a1ff
-maximizescreencolor=0x89aa61ff
-urgentcolor=0xad401fff
-scratchpadcolor=0x516c93ff
-globalcolor=0xb153a7ff
-overlaycolor=0x14a57cff
-
-# ============================================================================
-# Per-tag layout (default tile, matches dwm and river filtile)
-# Layouts available: tile, scroller, grid, deck, monocle, center_tile,
-# vertical_tile, vertical_scroller, dwindle
-# ============================================================================
-tagrule=id:1,layout_name:tile
-tagrule=id:2,layout_name:tile
-tagrule=id:3,layout_name:tile
-tagrule=id:4,layout_name:tile
-tagrule=id:5,layout_name:tile
-tagrule=id:6,layout_name:tile
-tagrule=id:7,layout_name:tile
-tagrule=id:8,layout_name:tile
-tagrule=id:9,layout_name:tile
-
-# ============================================================================
-# Window rules (mirrors river rule-add and dwm rules)
-# ============================================================================
-# Floating apps (from dwm config)
-windowrule=isfloating:1,appid:Arandr
-windowrule=isfloating:1,appid:Pavucontrol
-windowrule=isfloating:1,appid:mpv
-
-# River rules
-windowrule=isfloating:1,appid:float.*
-windowrule=isfloating:1,title:yazi
-windowrule=isfloating:1,title:river
-
-# ============================================================================
-# Key Bindings
-#
-# Modifier convention follows river/dwm: MOD = ALT (Mod1)
-# Format: bind=MODIFIERS,KEY,COMMAND,PARAMETERS
-# Flags: bindl = works while screen locked
-# ============================================================================
-
-# --- Compositor control --------------------------------------------------
-bind=SUPER,r,reload_config
-# river: Mod1+Shift E exit
-bind=ALT+SHIFT,e,quit
-# river/dwm: Mod1+Shift C close
-bind=ALT+SHIFT,c,killclient
-
-# --- Launchers -----------------------------------------------------------
-# river/dwm: Mod1 p (menu)
-#bind=ALT,p,spawn,fuzzel
-bind=ALT,p,spawn,wmenu-run -F -il 16 -f 'LiterationMono Nerd Font 12' -n bbbbbbff -N 222222ff -s eeeeeeff -S 444444ff -m eeeeeeff -M 444444ff
-
-# river/dwm: Mod1+Shift Return
-bind=ALT+SHIFT,Return,spawn,foot
-
-# Yazi file manager in floating foot (river: Mod1 r)
-#bind=ALT,r,spawn,foot -T yazi -W 150x50 -e yazi
-bind=ALT,r,spawn,foot -T yazi -W 150x50 -e ranger
-
-# --- Focus ---------------------------------------------------------------
-# river: Mod1 J/K focus-view next/previous (dwm: focusstack +1/-1)
-bind=ALT,k,focusstack,next
-bind=ALT,j,focusstack,prev
-
-# Direction-based focus (mango bonus, useful complement)
-bind=ALT,Left,focusdir,left
-bind=ALT,Right,focusdir,right
-bind=ALT,Up,focusdir,up
-bind=ALT,Down,focusdir,down
-
-# --- Swap / move in stack ------------------------------------------------
-# river: Mod1+Shift J/K swap next/previous (dwm: movestack)
-bind=ALT+SHIFT,j,exchange_stack_client,next
-bind=ALT+SHIFT,k,exchange_stack_client,prev
-
-# Direction-based swap
-bind=ALT+SHIFT,Left,exchange_client,left
-bind=ALT+SHIFT,Right,exchange_client,right
-bind=ALT+SHIFT,Up,exchange_client,up
-bind=ALT+SHIFT,Down,exchange_client,down
-
-# --- Master / layout tweaks (river filtile ↔ dwm) ------------------------
-# river: Mod1 H/L send-layout-cmd filtile main-ratio -/+5
-# dwm:   MOD1 H/L setmfact -/+0.05
-bind=ALT,h,setmfact,-0.05
-bind=ALT,l,setmfact,+0.05
-
-# river: Mod1 I/D main-count +/-1   dwm: incnmaster +/-1
-bind=ALT,i,incnmaster,+1
-bind=ALT,d,incnmaster,-1
-
-# river: Mod1 Return zoom (bump to top of stack)
-bind=ALT,Return,zoom
-
-# river: Mod1 Tab focus-previous-tags  dwm: MOD1 Tab view (last tags)
-bind=ALT,Tab,view,-1
-
-# --- Layout switching (dwm: t=tile, m=monocle; river: M=monocle) ---------
-bind=ALT,t,setlayout,tile
-bind=ALT,m,setlayout,monocle
-# dwm: MOD1 Space cycles layout
-bind=ALT,space,switch_layout
-
-# --- Float / fullscreen --------------------------------------------------
-# river: Mod1+Shift Space toggle-float   dwm: MOD1+Shift Space togglefloating
-bind=ALT+SHIFT,space,togglefloating
-# river: Mod1 F toggle-fullscreen  dwm: MOD1 F (was floating layout)
-bind=ALT,f,togglefullscreen
-bind=ALT+SHIFT,f,togglefakefullscreen
-
-# --- Tags 1-9 (river/dwm identical scheme) -------------------------------
-# Mod1+N         : view tag N
-# Mod1+Shift+N   : send window to tag N
-# Mod1+Ctrl+N    : toggle view of tag N
-# Mod1+Ctrl+Shift+N : toggle tag N on focused window
-bind=ALT,1,view,1
-bind=ALT,2,view,2
-bind=ALT,3,view,3
-bind=ALT,4,view,4
-bind=ALT,5,view,5
-bind=ALT,6,view,6
-bind=ALT,7,view,7
-bind=ALT,8,view,8
-bind=ALT,9,view,9
-
-bind=ALT+SHIFT,1,tag,1
-bind=ALT+SHIFT,2,tag,2
-bind=ALT+SHIFT,3,tag,3
-bind=ALT+SHIFT,4,tag,4
-bind=ALT+SHIFT,5,tag,5
-bind=ALT+SHIFT,6,tag,6
-bind=ALT+SHIFT,7,tag,7
-bind=ALT+SHIFT,8,tag,8
-bind=ALT+SHIFT,9,tag,9
-
-bind=ALT+CTRL,1,toggleview,1
-bind=ALT+CTRL,2,toggleview,2
-bind=ALT+CTRL,3,toggleview,3
-bind=ALT+CTRL,4,toggleview,4
-bind=ALT+CTRL,5,toggleview,5
-bind=ALT+CTRL,6,toggleview,6
-bind=ALT+CTRL,7,toggleview,7
-bind=ALT+CTRL,8,toggleview,8
-bind=ALT+CTRL,9,toggleview,9
-
-bind=ALT+CTRL+SHIFT,1,toggletag,1
-bind=ALT+CTRL+SHIFT,2,toggletag,2
-bind=ALT+CTRL+SHIFT,3,toggletag,3
-bind=ALT+CTRL+SHIFT,4,toggletag,4
-bind=ALT+CTRL+SHIFT,5,toggletag,5
-bind=ALT+CTRL+SHIFT,6,toggletag,6
-bind=ALT+CTRL+SHIFT,7,toggletag,7
-bind=ALT+CTRL+SHIFT,8,toggletag,8
-bind=ALT+CTRL+SHIFT,9,toggletag,9
-
-# All tags (river/dwm: 0)
-bind=ALT,0,view,0
-bind=ALT+SHIFT,0,toggletag,0
-
-# --- Monitor focus / move (river: Period/Comma; dwm: same) ---------------
-bind=ALT,period,focusmon,right
-bind=ALT,comma,focusmon,left
-bind=ALT+SHIFT,period,tagmon,right
-bind=ALT+SHIFT,comma,tagmon,left
-
-# --- Overview (mango bonus) ----------------------------------------------
-bind=SUPER,Tab,toggleoverview
-
-# --- Scratchpad ----------------------------------------------------------
-bind=ALT,z,toggle_scratchpad
-bind=SUPER,i,minimized
-bind=SUPER+SHIFT,i,restore_minimized
-
-# --- Window state extras -------------------------------------------------
-bind=SUPER,g,toggleglobal
-bind=SUPER,o,toggleoverlay
-bind=ALT,a,togglemaximizescreen
-
-# --- Gaps ----------------------------------------------------------------
-bind=ALT+SHIFT,x,incgaps,1
-bind=ALT+SHIFT,z,incgaps,-1
-bind=ALT+SHIFT,r,togglegaps
-
-# --- Move / resize floating windows (river-style snap & arrow nudge) -----
-# river: Mod1+Super H/J/K/L move 100   here: ctrl+shift arrows nudge 50
-bind=CTRL+SHIFT,Up,movewin,+0,-50
-bind=CTRL+SHIFT,Down,movewin,+0,+50
-bind=CTRL+SHIFT,Left,movewin,-50,+0
-bind=CTRL+SHIFT,Right,movewin,+50,+0
-
-# river: Mod1+Super+Shift H/J/K/L resize
-bind=CTRL+ALT,Up,resizewin,+0,-50
-bind=CTRL+ALT,Down,resizewin,+0,+50
-bind=CTRL+ALT,Left,resizewin,-50,+0
-bind=CTRL+ALT,Right,resizewin,+50,+0
-
-# --- Lock screen (river: Mod1+Shift L spawn waylock) ---------------------
-# Wrapper script: locks immediately, then runs a 10 s idle blanker while
-# locked (kanshi paused during blank to avoid Lenovo dock profile flip).
-bindl=ALT+SHIFT,l,spawn,~/.config/mango/scripts/lock.sh
-
-# --- Media keys (work in any mode) ---------------------------------------
-bindl=NONE,XF86AudioRaiseVolume,spawn,pamixer -i 5
-bindl=NONE,XF86AudioLowerVolume,spawn,pamixer -d 5
-bindl=NONE,XF86AudioMute,spawn,pamixer --toggle-mute
-bindl=NONE,XF86AudioPlay,spawn,playerctl play-pause
-bindl=NONE,XF86AudioPrev,spawn,playerctl previous
-bindl=NONE,XF86AudioNext,spawn,playerctl next
-bindl=NONE,XF86AudioMedia,spawn,playerctl play-pause
-
-# --- Screenshots (grim/slurp, mirrors river) -----------------------------
-#bind=NONE,Print,spawn_shell,grim - | tee /home/$USER/scrot/$(date +"%F_%T").png | wl-copy
-#bind=ALT,Print,spawn_shell,grim -g "$(slurp -d)" - | tee /home/$USER/scrot/$(date +"%F_%T").png | wl-copy
-#bind=ALT+SHIFT,Print,spawn,hyprpicker -anl
-
-bind=None,Print,spawn_shell, file="/home/$USER/Pictures/Screenshots/$(date +%F_%T).png"; grim -g "$(slurp -d)" "$file" && wl-copy -t image/png < "$file"
-bind=Alt,Print,spawn_shell, grim - | tee /home/$USER/Pictures/Screenshots/$(date +"%F_%T").png | wl-copy -t image/png
-bind=Alt+SHIFT,Print,spawn_shell, grim -g "$(slurp -p)" -t ppm - | convert - -format '%[pixel:p{0,0}]' txt:- | grep -o '#[0-9A-F]\{6\}' | tr -d '\n' | wl-copy -t text/plain
-
-# ============================================================================
-# Mouse bindings (river: Mod1 left=move, right=resize, middle=toggle float)
-# ============================================================================
-mousebind=ALT,btn_left,moveresize,curmove
-mousebind=ALT,btn_right,moveresize,curresize
-mousebind=ALT,btn_middle,togglefloating
-
-# Maximize/restore on plain middle-click anywhere (overview/title contexts)
-mousebind=SUPER,btn_middle,togglemaximizescreen,0
-
-# ============================================================================
-# Axis (scroll) bindings — wheel over root cycles tags
-# ============================================================================
-axisbind=SUPER,UP,viewtoleft_have_client
-axisbind=SUPER,DOWN,viewtoright_have_client
-
-# ============================================================================
-# Layer rules
-# ============================================================================
-layerrule=animation_type_open:zoom,layer_name:fuzzel
-layerrule=animation_type_close:zoom,layer_name:fuzzel
-
-# ============================================================================
-# Autostart (mirrors river spawn ... block)
-# ============================================================================
-env=XDG_CURRENT_DESKTOP,mango
-env=XDG_SESSION_TYPE,wayland
-
-exec-once=dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once=/usr/lib/xdg-desktop-portal-wlr
-exec-once=/usr/lib/xdg-desktop-portal
-
-# Audio
-exec-once=pipewire
-#exec-once=pipewire-pulse
-exec-once=pkill waybar_audio_event_bridge
-exec-once=/home/fr/.local/bin/waybar_audio_event_bridge
-
-# Services
-exec-once=dunst
-exec-once=udiskie -ANt
-
-# Color temperature
-exec-once=wlsunset -l 50.08 -L 14.42 -t 5000 -T 6500
-
-# Wallpaper
-exec-once=swaybg -c 1D1F21
-
-# Status bar (mango-specific waybar config; river bar config is left intact)
-exec-once=waybar -c ~/.config/waybar/config-mango.jsonc
-
-# Idle: blank after 20 min when unlocked (no auto-lock). Manual lock
-# (Alt+Shift+L) and suspend route through ~/.config/mango/scripts/lock.sh
-# which adds a 10 s idle blanker for the locked session. Kanshi is
-# STOP/CONT-bracketed around every wlopm cycle to keep the Lenovo
-# USB-C dock from re-triggering monitor profile switches when DPMS
-# drops the DP-MST link.
-exec-once=swayidle -w timeout 1200 'pkill -STOP kanshi 2>/dev/null; wlopm --off "*"' resume 'wlopm --on "*"; sleep 0.5; pkill -CONT kanshi 2>/dev/null' before-sleep '~/.config/mango/scripts/lock.sh &'
-
-# Multi-monitor configuration
-exec-once=kanshi

.config/mango/scripts/lock.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Manual screen-lock for mango.
-# - Locks via waylock (immediate lockscreen).
-# - While locked, runs an aggressive 10 s idle blanker.
-# - Pauses kanshi during blank to prevent profile flip-flop on the
-#   Lenovo USB-C dock (DP-MST drops link on DPMS off).
-# - Cleans up on unlock.
-
-set -e
-
-# Don't stack lockers if one is already running (re-press, or
-# before-sleep firing while already locked).
-pgrep -x waylock >/dev/null && exit 0
-
-# Short-timeout idle blanker, only alive while we're locked.
-swayidle -w \
-    timeout 10 'pkill -STOP kanshi 2>/dev/null; wlopm --off "*"' \
-    resume     'wlopm --on  "*"; sleep 0.5; pkill -CONT kanshi 2>/dev/null' \
-    >/dev/null 2>&1 &
-LOCK_IDLE_PID=$!
-
-# Cleanup on unlock: stop the idle watcher, ensure outputs are on,
-# and resume kanshi in case the trap fires mid-blank.
-trap '
-    kill "$LOCK_IDLE_PID" 2>/dev/null || true
-    wlopm --on "*"        2>/dev/null || true
-    pkill -CONT kanshi    2>/dev/null || true
-' EXIT
-
-# Block here until waylock exits on successful auth.
-waylock

.config/nvim/.luarc.json

@@ -0,0 +1,3 @@
+{
+  "format.enable": false
+}

.config/nvim/README.md

@@ -1,16 +1,9 @@
 # AstroNvim Template
 
-**NOTE:** This is for AstroNvim v4+
+**NOTE:** This is for AstroNvim v6+
 
 A template for getting started with [AstroNvim](https://github.com/AstroNvim/AstroNvim)
 
-## System dependencies
-- `lazygit` for lazygit integration
-- `typescript-language-server` and `typescript` installed globally from npm
-```bash
-npm install -g typescript-language-server typescript
-```
-
 ## 🛠️ Installation
 
 #### Make a backup of your current nvim and shared folder

.config/nvim/init.lua

@@ -1,10 +1,18 @@
 -- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution
 -- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk.
 local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
+
 if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
   -- stylua: ignore
-  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
+  local result = vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
+  if vim.v.shell_error ~= 0 then
+    -- stylua: ignore
+    vim.api.nvim_echo({ { ("Error cloning lazy.nvim:\n%s\n"):format(result), "ErrorMsg" }, { "Press any key to exit...", "MoreMsg" } }, true, {})
+    vim.fn.getchar()
+    vim.cmd.quit()
   end
+end
+
 vim.opt.rtp:prepend(lazypath)
 
 -- validate that lazy is available
@@ -17,4 +25,3 @@ end
 
 require "lazy_setup"
 require "polish"
-require "autocmds"

.config/nvim/lazy-lock.json

@@ -1,68 +1,45 @@
 {
-  "AstroNvim": { "branch": "main", "commit": "c5e610f614e74c9dd9bf11760c4d0ad2c98c0abe" },
+  "AstroNvim": { "branch": "main", "commit": "bf37390b310fc2e3a1c57b21362b525bbfe6eed4" },
-  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+  "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
-  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
+  "aerial.nvim": { "branch": "master", "commit": "645d108a5242ec7b378cbe643eb6d04d4223f034" },
-  "aerial.nvim": { "branch": "master", "commit": "6ab1a0ce4874d21610fc5a67a6c82c7b943c635b" },
+  "astrocore": { "branch": "main", "commit": "b061e0c185cd5fecbac7489151a98117ce799a47" },
-  "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
+  "astrolsp": { "branch": "main", "commit": "ebc1676127b3bfbd46e3e26589b104853cac3730" },
-  "astrocommunity": { "branch": "main", "commit": "d451f1d8e90e21c0cad730add858d8f952c66f01" },
+  "astrotheme": { "branch": "main", "commit": "cf0e65a7b3ce2f830b052f4da937729eee1e7a7d" },
-  "astrocore": { "branch": "main", "commit": "44a3dc0bf1591022b2a6bc89dccdfac1be17bec9" },
+  "astroui": { "branch": "main", "commit": "920dd5df6629a9076a11ea10f0d21f4225203585" },
-  "astrolsp": { "branch": "main", "commit": "909fbe64f3f87d089ff3777751261544557117cc" },
+  "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
-  "astrotheme": { "branch": "main", "commit": "4a2af93815e4e6adfe69c836e46047a9451de858" },
+  "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
-  "astroui": { "branch": "main", "commit": "e923a84c488d879a260fc9cfb2dc27dd870fb6ac" },
+  "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "gitsigns.nvim": { "branch": "main", "commit": "a462f416e2ce4744531c6256252dee99a7d34a83" },
-  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
-  "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
-  "flutter-tools.nvim": { "branch": "main", "commit": "6faf2c70bd56f1fe78620591a2bb73f4dc6f4870" },
-  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
-  "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" },
   "heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" },
-  "hover.nvim": { "branch": "main", "commit": "3b49066e09e03e63be6d6f43ae2b8bcd58301f63" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b" },
-  "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "a793d02b6a5e639fa9d3f2a89a839fa688ab2d0a" },
-  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "e51f9b259f066c4347f9a79ffde54c29a0619384" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
-  "mini.animate": { "branch": "main", "commit": "8ce6df739aa9d14c876bace722af28c3d09e9971" },
+  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
-  "mini.bufremove": { "branch": "main", "commit": "285bdac9596ee7375db50c0f76ed04336dcd2685" },
+  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
-  "neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" },
+  "neo-tree.nvim": { "branch": "main", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" },
-  "neoconf.nvim": { "branch": "main", "commit": "f630568a4d04154803886f21ca60923f12709f0f" },
+  "none-ls.nvim": { "branch": "main", "commit": "c9317c2a8629d4e39e7cf47be74cb67f3ab37cda" },
-  "none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
-  "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
+  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
-  "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" },
+  "nvim-dap": { "branch": "master", "commit": "4f5deb110d9ff8994d96c21df95e2271d11214f9" },
-  "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
+  "nvim-dap-ui": { "branch": "master", "commit": "f5b6673f374626515401c5bc51b005f784a4f252" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "e2cb22089cc2358b2b995c09578224f142de6039" },
-  "nvim-dap": { "branch": "master", "commit": "6a5bba0ddea5d419a783e170c20988046376090d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0203a9608d63eda57679b01e69f33a7b4c34b0d1" },
-  "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
-  "nvim-lspconfig": { "branch": "master", "commit": "185b2af444b27d6541c02d662b5b68190e5cf0c4" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" },
+  "nvim-treesitter": { "branch": "main", "commit": "c82bf96f0a773d85304feeb695e1e23b2207ac35" },
-  "nvim-treesitter": { "branch": "master", "commit": "f8aaf5ce4e27cd20de917946b2ae5c968a2c2858" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "93d60a475f0b08a8eceb99255863977d3a25f310" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
-  "nvim-ufo": { "branch": "main", "commit": "61463090a4f55f5d080236ea62f09d1cd8976ff3" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
   "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
   "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
-  "schemastore.nvim": { "branch": "main", "commit": "960a5cf992c033170499ccc7003df59734ed40a8" },
+  "smart-splits.nvim": { "branch": "master", "commit": "12426763591f06b865c20990d8423345ea96d44f" },
-  "smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" },
+  "snacks.nvim": { "branch": "main", "commit": "e6fd58c82f2f3fcddd3fe81703d47d6d48fc7b9f" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
-  "telescope.nvim": { "branch": "master", "commit": "a17d611a0e111836a1db5295f04945df407c5135" },
-  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
+  "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }
-  "vim-illuminate": { "branch": "master", "commit": "19cb21f513fc2b02f0c66be70107741e837516a1" },
-  "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" },
-  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
 }

.config/nvim/lua/autocmds.lua

@@ -1,21 +0,0 @@
--- Autocommand: trigger Flutter hot reload on save
---
--- This runs whenever you save a *.dart file (BufWritePost).
--- It checks if a tmux session named "flutter" exists.
--- If it does, it sends the keys "r<Enter>" to the "app" window
--- of that session, which tells `flutter run` to hot-reload.
---
--- Workflow:
---   1. Start tmux:   tmux new -s flutter -n app
---   2. Inside tmux "app" window, run: flutter run
---   3. Open another window/pane for nvim.
---   4. Whenever you :w a Dart file in nvim, hot reload will fire.
---
-
-vim.api.nvim_create_autocmd("BufWritePost", {
-  pattern = "*.dart",
-  callback = function()
-    local result = vim.fn.system({ "tmux", "send-keys", "-t", "flutter:app", "r", "Enter" })
-    vim.notify("Flutter hot reload triggered", vim.log.levels.INFO)
-  end,
-})

.config/nvim/lua/community.lua

@@ -1,3 +1,5 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
 -- AstroCommunity: import any community modules here
 -- We import this file in `lazy_setup.lua` before the `plugins/` folder.
 -- This guarantees that the specs are processed before any user plugins.
@@ -7,7 +9,4 @@ return {
   "AstroNvim/astrocommunity",
   { import = "astrocommunity.pack.lua" },
   -- import/override with your plugins folder
-  { import = "astrocommunity.utility.hover-nvim" },
-  { import = "astrocommunity.diagnostics.trouble-nvim" },
-  { import = "astrocommunity.scrolling.mini-animate" },
 }

.config/nvim/lua/lazy_setup.lua

@@ -1,7 +1,7 @@
 require("lazy").setup({
   {
     "AstroNvim/AstroNvim",
-    version = "^4", -- Remove version tracking to elect for nightly AstroNvim
+    version = "^6", -- Remove version tracking to elect for nightly AstroNvim
     import = "astronvim.plugins",
     opts = { -- AstroNvim options must be set here with the `import` key
       mapleader = " ", -- This ensures the leader key must be configured before Lazy is set up

.config/nvim/lua/plugins/astrocore.lua

@@ -1,3 +1,5 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
 -- AstroCore provides a central place to modify mappings, vim options, autocommands, and more!
 -- Configuration documentation can be found with `:h astrocore`
 -- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
@@ -13,7 +15,7 @@ return {
       large_buf = { size = 1024 * 256, lines = 10000 }, -- set global limits for large files for disabling features like treesitter
       autopairs = true, -- enable autopairs at start
       cmp = true, -- enable completion at start
-      diagnostics_mode = 3, -- diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = on)
+      diagnostics = { virtual_text = true, virtual_lines = false }, -- diagnostic settings on startup
       highlighturl = true, -- highlight URLs at start
       notifications = true, -- enable notifications at start
     },
@@ -22,6 +24,19 @@ return {
       virtual_text = true,
       underline = true,
     },
+    -- passed to `vim.filetype.add`
+    filetypes = {
+      -- see `:h vim.filetype.add` for usage
+      extension = {
+        foo = "fooscript",
+      },
+      filename = {
+        [".foorc"] = "fooscript",
+      },
+      pattern = {
+        [".*/etc/foo/.*"] = "fooscript",
+      },
+    },
     -- vim options can be configured here
     options = {
       opt = { -- vim.opt.<key>
@@ -30,7 +45,6 @@ return {
         spell = false, -- sets vim.opt.spell
         signcolumn = "yes", -- sets vim.opt.signcolumn to yes
         wrap = false, -- sets vim.opt.wrap
-        scrolloff = 8,
       },
       g = { -- vim.g.<key>
         -- configure global vim variables (vim.g)

.config/nvim/lua/plugins/astrolsp.lua

@@ -1,3 +1,5 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
 -- AstroLSP allows you to customize the features in AstroNvim's LSP configuration engine
 -- Configuration documentation can be found with `:h astrolsp`
 -- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
@@ -39,20 +41,18 @@ return {
     servers = {
       -- "pyright"
     },
-    -- customize language server configuration options passed to `lspconfig`
+    -- customize language server configuration passed to `vim.lsp.config`
-    ---@diagnostic disable: missing-fields
+    -- client specific configuration can also go in `lsp/` in your configuration root (see `:h lsp-config`)
     config = {
-      ts_ls = {},
+      -- ["*"] = { capabilities = {} }, -- modify default LSP client settings such as capabilities
-      -- clangd = { capabilities = { offsetEncoding = "utf-8" } },
     },
     -- customize how language servers are attached
     handlers = {
-      -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
+      -- a function with the key `*` modifies the default handler, functions takes the server name as the parameter
-      -- function(server, opts) require("lspconfig")[server].setup(opts) end
+      -- ["*"] = function(server) vim.lsp.enable(server) end
 
-      -- the key is the server that is being setup with `lspconfig`
+      -- the key is the server that is being setup with `vim.lsp.config`
       -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
-      -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
     },
     -- Configure buffer local auto commands to add when attaching a language server
     autocmds = {
@@ -95,7 +95,7 @@ return {
       },
     },
     -- A custom `on_attach` function to be run after the default `on_attach` function
-    -- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
+    -- takes two parameters `client` and `bufnr`  (`:h lsp-attach`)
     on_attach = function(client, bufnr)
       -- this would disable semanticTokensProvider for all clients
       -- client.server_capabilities.semanticTokensProvider = nil

.config/nvim/lua/plugins/flutter.lua

@@ -1,11 +0,0 @@
-return {
-  -- Add the community repository of plugin specifications
-  "AstroNvim/astrocommunity",
-  { import = "astrocommunity.pack.dart" },
-  -- Configure flutter-tools
-  { "akinsho/flutter-tools.nvim", 
-    opts = {
-      ...
-    }
-  }
-}

.config/nvim/lua/plugins/mason.lua

@@ -1,36 +1,27 @@
--- Customize Mason plugins
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
+-- Customize Mason
 
 ---@type LazySpec
 return {
-  -- use mason-lspconfig to configure LSP installations
+  -- use mason-tool-installer for automatically installing Mason packages
   {
-    "williamboman/mason-lspconfig.nvim",
+    "WhoIsSethDaniel/mason-tool-installer.nvim",
-    -- overrides `require("mason-lspconfig").setup(...)`
+    -- overrides `require("mason-tool-installer").setup(...)`
-    opts = {
-      ensure_installed = {
-        "lua_ls",
-        -- add more arguments for adding more language servers
-      },
-    },
-  },
-  -- use mason-null-ls to configure Formatters/Linter installation for null-ls sources
-  {
-    "jay-babu/mason-null-ls.nvim",
-    -- overrides `require("mason-null-ls").setup(...)`
     opts = {
+      -- Make sure to use the names found in `:Mason`
       ensure_installed = {
+        -- install language servers
+        "lua-language-server",
+
+        -- install formatters
         "stylua",
-        -- add more arguments for adding more null-ls sources
+
-      },
+        -- install debuggers
-    },
+        "debugpy",
-  },
+
-  {
+        -- install any other package
-    "jay-babu/mason-nvim-dap.nvim",
+        "tree-sitter-cli",
-    -- overrides `require("mason-nvim-dap").setup(...)`
-    opts = {
-      ensure_installed = {
-        "python",
-        -- add more arguments for adding more debuggers
       },
     },
   },

.config/nvim/lua/plugins/none-ls.lua

@@ -0,0 +1,24 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
+-- Customize None-ls sources
+
+---@type LazySpec
+return {
+  "nvimtools/none-ls.nvim",
+  opts = function(_, opts)
+    -- opts variable is the default configuration table for the setup function call
+    -- local null_ls = require "null-ls"
+
+    -- Check supported formatters and linters
+    -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting
+    -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
+
+    -- Only insert new sources, do not replace the existing ones
+    -- (If you wish to replace, use `opts.sources = {}` instead of the `list_insert_unique` function)
+    opts.sources = require("astrocore").list_insert_unique(opts.sources, {
+      -- Set a formatter
+      -- null_ls.builtins.formatting.stylua,
+      -- null_ls.builtins.formatting.prettier,
+    })
+  end,
+}

.config/nvim/lua/plugins/treesitter.lua

@@ -1,15 +1,24 @@
 if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
 
 -- Customize Treesitter
+-- --------------------
+-- Treesitter customizations are handled with AstroCore
+-- as nvim-treesitter simply provides a download utility for parsers
 
 ---@type LazySpec
 return {
-  "nvim-treesitter/nvim-treesitter",
+  "AstroNvim/astrocore",
+  ---@type AstroCoreOpts
   opts = {
+    treesitter = {
+      highlight = true, -- enable/disable treesitter based highlighting
+      indent = true, -- enable/disable treesitter based indentation
+      auto_install = true, -- enable/disable automatic installation of detected languages
       ensure_installed = {
         "lua",
         "vim",
         -- add more arguments for adding more treesitter parsers
       },
     },
+  },
 }

.config/nvim/lua/plugins/user.lua

@@ -1,4 +1,7 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
 -- You can also add or configure plugins by creating files in this `plugins/` folder
+-- PLEASE REMOVE THE EXAMPLES YOU HAVE NO INTEREST IN BEFORE ENABLING THIS FILE
 -- Here are some examples:
 
 ---@type LazySpec
@@ -15,12 +18,13 @@ return {
 
   -- == Examples of Overriding Plugins ==
 
-  -- customize alpha options
+  -- customize dashboard options
   {
-    "goolord/alpha-nvim",
+    "folke/snacks.nvim",
-    opts = function(_, opts)
+    opts = {
-      -- customize the dashboard header
+      dashboard = {
-      opts.section.header.val = {
+        preset = {
+          header = table.concat({
             " █████  ███████ ████████ ██████   ██████ ",
             "██   ██ ██         ██    ██   ██ ██    ██",
             "███████ ███████    ██    ██████  ██    ██",
@@ -32,9 +36,10 @@ return {
             "██ ██  ██ ██    ██ ██ ██ ████ ██",
             "██  ██ ██  ██  ██  ██ ██  ██  ██",
             "██   ████   ████   ██ ██      ██",
-      }
+          }, "\n"),
-      return opts
+        },
-    end,
+      },
+    },
   },
 
   -- You can disable default plugins as follows:
@@ -44,10 +49,12 @@ return {
   {
     "L3MON4D3/LuaSnip",
     config = function(plugin, opts)
-      require "astronvim.plugins.configs.luasnip"(plugin, opts) -- include the default astronvim config that calls the setup call
       -- add more custom luasnip configuration such as filetype extend or custom snippets
       local luasnip = require "luasnip"
       luasnip.filetype_extend("javascript", { "javascriptreact" })
+
+      -- include the default astronvim config that calls the setup call
+      require "astronvim.plugins.configs.luasnip"(plugin, opts)
     end,
   },
 

.config/nvim/lua/plugins/zen-mode.lua

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

.config/nvim/lua/polish.lua

@@ -1,18 +1,5 @@
 if true then return end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
 
--- This will run last in the setup process and is a good place to configure
+-- This will run last in the setup process.
--- things like custom filetypes. This is just pure lua so anything that doesn't
+-- This is just pure lua so anything that doesn't
 -- fit in the normal config locations above can go here
-
--- Set up custom filetypes
-vim.filetype.add {
-  extension = {
-    foo = "fooscript",
-  },
-  filename = {
-    ["Foofile"] = "fooscript",
-  },
-  pattern = {
-    ["~/%.config/foo/.*"] = "fooscript",
-  },
-}

.config/river/init

@@ -7,13 +7,17 @@
 export XDG_CURRENT_DESKTOP=river
 export XDG_SESSION_TYPE=wayland
 
+export MOZ_ENABLE_WAYLAND=1
+
+export XCURSOR_SIZE=36
+
 ## Start portals
 dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-xdg-desktop-portal-wlr &
+/usr/libexec/xdg-desktop-portal-wlr &
-xdg-desktop-portal &
+/usr/libexec/xdg-desktop-portal &
 
 ## Start easyeffects
-flatpak run com.github.wwmm.easyeffects --gapplication-service &
+#flatpak run com.github.wwmm.easyeffects --gapplication-service &
 
 # Mod1+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
 riverctl map normal Mod1+Shift Return spawn foot
@@ -124,36 +128,8 @@ riverctl map passthrough Mod1 F11 enter-mode normal
 
 # Lock screen
 #riverctl map normal Mod1+Shift L spawn waylock
-riverctl map normal Mod1+Shift L spawn 'swaylock \
+riverctl map normal Mod1+Shift L spawn lockscreen
-	--clock \
+swayidle timeout 300 lockscreen &
-	--indicator-idle-visible \
-	--indicator-radius 100 \
-	--indicator-thickness 7 \
-	--ring-color 2D464D \
-	--key-hl-color be5046 \
-	--text-color ffffff \
-	--line-color 00000000 \
-	--inside-color 00000088 \
-	--separator-color 00000000 \
-	--fade-in 0.2 \
-	--effect-blur 7x1 \
-	--image ~/Pictures/bg-astronaut.jpg'
-
-swayidle \
-  timeout 300 'swaylock \
-	--clock \
-	--indicator-idle-visible \
-	--indicator-radius 100 \
-	--indicator-thickness 7 \
-	--ring-color 2D464D \
-	--key-hl-color be5046 \
-	--text-color ffffff \
-	--line-color 00000000 \
-	--inside-color 00000088 \
-	--separator-color 00000000 \
-	--fade-in 0.2 \
-	--effect-blur 7x1 \
-	--image ~/Pictures/bg-astronaut.jpg' &
 
 # Various media key mapping examples for both normal and locked mode which do
 # not have a modifier
@@ -183,7 +159,7 @@ riverctl map normal Mod1+Shift Print spawn "grim -g \"\$(slurp -p)\" -t ppm - |
 riverctl focus-follows-cursor normal
 
 # Borders & Colors
-riverctl background-color 0x002b36
+riverctl background-color 0x202223
 riverctl border-color-focused 0x93a1a1
 riverctl border-color-unfocused 0x586e75
 riverctl border-width 1
@@ -192,8 +168,9 @@ riverctl border-width 1
 riverctl set-repeat 30 200
 
 # Keyboard layouts
-riverctl keyboard-layout -options "grp:win_space_toggle" "us,cz(qwerty)"
+riverctl map normal Mod1 c spawn 'riverctl keyboard-layout "cz(qwerty)"'
-#riverctl keyboard-layout CShack
+riverctl map normal Mod1 u spawn 'riverctl keyboard-layout "us"'
+riverctl keyboard-layout "us" # default layout
 
 # Make all views with an app-id that starts with "float" and title "foo" start floating.
 riverctl rule-add -app-id 'float*' -title 'foo' float
@@ -218,6 +195,9 @@ riverctl spawn "udiskie -ANt"
 # Color temp
  riverctl spawn "wlsunset -l 50.08 -L 14.42 -t 5000 -T 6500"
 
+# Cursor size
+riverctl xcursor-theme Adwaita 22
+
 # Wallpaper
 riverctl spawn "swaybg -c 1D1F21"
 #[[ -e ~/.config/wallpaper.png ]] &&
@@ -257,3 +237,5 @@ filtile \
 	smart-padding 0, \
 	main-ratio 55, \
 	main-location left
+
+riverctl spawn ssh-agent

.config/waybar/config-mango.jsonc

@@ -1,119 +0,0 @@
-{
-	"position": "bottom",
-	"modules-left": ["dwl/tags", "custom/dwm-window"],
-	"modules-center": [],
-	//"modules-right": ["custom/spotify", "tray", "network", "bluetooth", "wireplumber", "battery", "clock", "custom/power"],
-	"modules-right": ["tray", "network", "custom/audio", "clock"],
-
-
-
-
-	"dwl/tags": {
-		"num-tags": 9,
-		"tag-labels": ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
-	},
-
-	"dwl/window": {
-		"format": "[{layout}] {title}",
-		"max-length": 80
-	},
-
-	"custom/dwm-window": {
-		"exec": "~/.local/bin/tag_windows.sh",
-		"max-length": 80
-	},
-
-	"clock": {
-		//"format": "{:%d.%m. %b, %a %H:%M}",
-		"format": "{:%b %d (%a) %I:%M:%S %p}",
-		"timezone": "Europe/Prague",
-		"locale": "en_US.UTF-8",
-		"interval": 1,
-		"tooltip-format": "<tt><small>{calendar}</small></tt>",
-		"calendar": {
-			"mode" : "year",
-			"mode-mon-col" : 3,
-			"weeks-pos" : "right",
-			"on-scroll" : 1,
-			"format": {
-					"months":   "<span color='#ffead3'><b>{}</b></span>",
-					"days":     "<span color='#ecc6d9'><b>{}</b></span>",
-					"weeks":    "<span color='#99ffdd'><b>W{}</b></span>",
-					"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
-					"today":    "<span color='#ff6699'><b><u>{}</u></b></span>"
-					}
-			},
-			"actions":  {
-			"on-click-right": "mode",
-			"on-click-forward": "tz_up",
-			"on-click-backward": "tz_down",
-			"on-scroll-up": "shift_up",
-			"on-scroll-down": "shift_down"
-		}
-	},
-
-	"network": {
-		"interface": "eth0",
-		"format-ethernet": "󰈀 {ifname}: {ipaddr}",
-		"format-disconnected": "󰖪 ",
-		"tooltip-format-ethernet": "{ifname}: {ipaddr}",
-		"tooltip-format-disconnected": "Disconnected",
-		//"on-click": "foot -e nmtui",
-		//"on-click-right": "~/.scripts/restart_network.sh"
-	},
-
-	//"bluetooth": {
-	//	"on-click": "foot bluetuith",
-	//	"on-click-right": "~/.scripts/toggle_bluetooth.sh",
-	//	"format-on": "󰂯",
-	//	"format-off": "󰂲",
-	//	"format-disabled": "󰂲",
-	//	"format-connected": "󰂱"
-	//},
-
-	//"wireplumber": {
-	//	"format": "{icon} {volume}%",
-	//	"format-muted": "󰖁 muted",
-	//	"on-click": "pavucontrol -t 3",
-	//	"on-click-right": "pamixer --toggle-mute",
-	//	"max-volume": 125,
-	//	"format-icons": ["", "", ""]
-	//},
-
-	"custom/audio": {
-		"exec": "~/.local/bin/waybar_audio",
-		"signal": 8,
-		"return-type": "json",
-		"format": "{icon} {text}",
-		"format-icons": {
-			"speaker": ["", "", " "],
-			"speaker-muted": "󰖁",
-			"headphones": "󰋋",
-			"headphones-muted": "󰟎"
-		},
-		//"interval": 2,
-		"interval": "once",
-		"on-click": "pamixer --toggle-mute",
-		"on-click-right": "~/.local/bin/toggle_audio",
-		"on-scroll-up": "pamixer --increase 5",
-		"on-scroll-down": "pamixer --decrease 5"
-	},
-
-	//"battery": {
-	//	"states": {
-	//			"good": 95,
-	//			"warning": 30,
-	//			"critical": 15
-	//	},
-	//	"format":"{icon} {capacity}%",
-	//	"format-charging": "󰂄 {capacity}%",
-	//	"format-plugged": "󱐋",
-	//	"format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
-	//	"interval": 30,
-	//	"tooltip-format": "{time}",
-	//},
-
-	"tray": {
-		"spacing": 10
-	}
-}

.config/waybar/config.jsonc

@@ -1,8 +1,8 @@
 {
 	"position": "bottom",
-	"modules-left": ["river/tags", "river/layout", "river/window"],
+	"modules-left": ["river/tags", "river/window"],
 	"modules-center": [],
-	"modules-right": ["tray", "network", "custom/audio", "clock"],
+	"modules-right": ["tray", "bluetooth", "network", "custom/audio", "battery", "clock"],
 
 	"river/tags": {
 		"num-tags": 9
@@ -12,12 +12,6 @@
 		"max-length": 80
 	},
 
-	"river/layout": {
-  	"format": "{}",
-  	"min-length": 4,
-  	"on-click": "riverctl send-layout-cmd next"
-	},
-
 	"clock": {
 		//"format": "{:%d.%m. %b, %a %H:%M}",
 		"format": "{:%b %d (%a) %I:%M:%S %p}",
@@ -57,14 +51,14 @@
 		//"on-click-right": "~/.scripts/restart_network.sh"
 	},
 
-	//"bluetooth": {
+	"bluetooth": {
-	//	"on-click": "foot bluetuith",
+		"on-click": "foot bluetuith",
-	//	"on-click-right": "~/.scripts/toggle_bluetooth.sh",
+		"on-click-right": "~/.scripts/toggle_bluetooth.sh",
-	//	"format-on": "󰂯",
+		"format-on": "󰂯",
-	//	"format-off": "󰂲",
+		"format-off": "󰂲",
-	//	"format-disabled": "󰂲",
+		"format-disabled": "󰂲",
-	//	"format-connected": "󰂱"
+		"format-connected": "󰂱"
-	//},
+	},
 
 	//"wireplumber": {
 	//	"format": "{icon} {volume}%",
@@ -86,27 +80,26 @@
 			"headphones": "󰋋",
 			"headphones-muted": "󰟎"
 		},
-		//"interval": 2,
+		"interval": 2,
-		"interval": "once",
 		"on-click": "pamixer --toggle-mute",
 		"on-click-right": "~/.local/bin/toggle_audio",
 		"on-scroll-up": "pamixer --increase 5",
 		"on-scroll-down": "pamixer --decrease 5"
 	},
 
-	//"battery": {
+	"battery": {
-	//	"states": {
+		"states": {
-	//			"good": 95,
+				"good": 95,
-	//			"warning": 30,
+				"warning": 30,
-	//			"critical": 15
+				"critical": 15
-	//	},
+		},
-	//	"format":"{icon} {capacity}%",
+		"format":"{icon} {capacity}%",
-	//	"format-charging": "󰂄 {capacity}%",
+		"format-charging": "󰂄 {capacity}%",
-	//	"format-plugged": "󱐋",
+		"format-plugged": "󱐋",
-	//	"format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
+		"format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
-	//	"interval": 30,
+		"interval": 30,
-	//	"tooltip-format": "{time}",
+		"tooltip-format": "{time}",
-	//},
+	},
 
 	"tray": {
 		"spacing": 10

.config/waybar/style.css

@@ -9,7 +9,6 @@
 
 window#waybar {
 	background-color: @bg;
-	padding: 10em;
 }
 
 #tags {

.local/bin/lockscreen

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+riverctl keyboard-layout us
+
+exec swaylock \
+	--clock \
+	--show-keyboard-layout \
+	--indicator-idle-visible \
+	--indicator-radius 100 \
+	--indicator-thickness 7 \
+	--ring-color 2D464D \
+	--key-hl-color be5046 \
+	--text-color ffffff \
+	--line-color 00000000 \
+	--inside-color 00000088 \
+	--separator-color 00000000 \
+	--fade-in 0.2 \
+	--effect-blur 7x1 \
+	--color 202223

.local/bin/toggle_audio

@@ -1,28 +1,26 @@
 #!/usr/bin/env bash
-# Toggle default PipeWire sink between Steinberg UR22mkII and Starship/Matisse
+# Toggle default PipeWire sink between Built-in Audio and Cisco 700 USB Adapter
 
-# sinks
+# Get sinks section
-#STEINBERG_ID=60
-#STARSHIP_ID=59
 SINKS=$(wpctl status | sed -n '/Sinks:/,/Sources:/p')
 
-# Extract IDs (ignore default *) and match specific names
+# Extract IDs (ignore default * and Easy Effects virtual sinks)
-STARSHIP_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Starship" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
+BUILTIN_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Built-in Audio" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
-STEINBERG_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Steinberg" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
+CISCO_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Cisco HS 730-0TG" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
 
 # Get current default sink name (not just the ID)
 CURRENT_SINK=$(wpctl status | awk '/Audio\/Sink/ {print $3}')
 
 # Detect which sink is active and toggle
-if [[ "$CURRENT_SINK" == *"Steinberg"* ]]; then
+if [[ "$CURRENT_SINK" == *"alsa_output.pci-0000_00_1f.3.analog-stereo"* ]]; then
-    echo "Switching to Starship/Matisse output..."
+    echo "Switching to Cisco HS 730-0TG..."
-    wpctl set-default "$STARSHIP_ID"
+    wpctl set-default "$CISCO_ID"
 else
-    echo "Switching to Steinberg UR22mkII output..."
+    echo "Switching to Built-in Audio..."
-    wpctl set-default "$STEINBERG_ID"
+    wpctl set-default "$BUILTIN_ID"
 fi
 
-# Optionally move active streams
+# Move active streams to new default sink
 echo "Moving active streams to new sink..."
 for stream in $(wpctl status | awk '/\. Stream/ {print $1}'); do
     wpctl move-stream "$stream" @DEFAULT_AUDIO_SINK@ 2>/dev/null
@@ -31,3 +29,4 @@ done
 # Confirm new default
 echo "New default sink:"
 wpctl status | grep "Audio/Sink"
+

.local/bin/waybar_audio.sh

@@ -9,12 +9,12 @@ muted=$(pamixer --get-mute)
 # Determine alt value for Waybar
 if [ "$muted" = "true" ]; then
   case "$sink_name" in
-    *Steinberg*) alt="headphones-muted" ;;
+    *Cisco*) alt="headphones-muted" ;;
     *)       alt="speaker-muted" ;;
   esac
 else
   case "$sink_name" in
-    *Steinberg*) alt="headphones" ;;
+    *Cisco*) alt="headphones" ;;
     *)       alt="speaker" ;;
   esac
 fi

.xinitrc

@@ -19,18 +19,24 @@ feh --bg-scale "$HOME/Pictures/bg.png" &
 xautolock -locker lock-us -secure -time 1 &
 
 #pipewire &
+
 dbus-run-session pipewire &
 pipewire-pulse &
-wireplumber &
+#wireplumber &
 
 dwmblocks &
 
-clipmenud &
+#clipmenud &
 
-mpd --no-daemon &
+#mpd --no-daemon &
 
-pw-metadata -n settings 0 clock.force-rate 44100
+#pw-metadata -n settings 0 clock.force-rate 44100
-pw-metadata -n settings 0 clock.force-quantum 1024
+#pw-metadata -n settings 0 clock.force-quantum 1024
+
+if [ -x /usr/bin/ssh-agent ]; then
+    eval $(ssh-agent -s)
+fi
 
 dbus-launch --sh-syntax --exit-with-session dwm
+#exec dwm
 

.xprofile

@@ -1,12 +1,13 @@
 #gentoo-pipewire-launcher &
 ssh-agent &
 TPADID=$(xinput | grep "Synaptics" | awk '{print $5}' | awk -F "=" '{print $2}')
-xinput disable $TPADID
+#xinput disable $TPADID
-xinput set-prop "TPPS/2 IBM TrackPoint" "libinput Accel Speed" 0.9
+$xinput set-prop "TPPS/2 IBM TrackPoint" "libinput Accel Speed" 0.9
 
 xdg-settings set default-web-browser firefox.desktop
 xdg-mime default mupdf.desktop application/pdf
 xdg-mime default thunar.desktop inode/directory
+xdg-mime default feh.desktop image/jpeg image/png image/gif image/bmp image/webp image/tiff
 
 #xrandr --output HDMI-0 --mode 2560x1440 --rate 143.91
 #xrandr --output DP-3 --mode 1920x1080 --pos 0x180 --rotate normal --output HDMI-0 --mode 2560x1440 --rate 143.91 --pos 1920x0 --rotate normal
@@ -14,8 +15,9 @@ xdg-mime default thunar.desktop inode/directory
 ##nvidia-settings --assign 'CurrentMetaMode=DPY-4: 2560x1440_144 @2560x1440 +1920+0 {ViewPortIn=2560x1440, ViewPortOut=2560x1440+0+0, ForceCompositionPipeline=On}, DPY-3: nvidia-auto-select @1920x1080 +0+180 {ViewPortIn=1920x1080, ViewPortOut=1920x1080+0+0, ForceCompositionPipeline=On}'
 #nvidia-settings --assign 'CurrentMetaMode=DPY-5: 2560x1440_170 @2560x1440 +1920+0 {ViewPortIn=2560x1440, ViewPortOut=2560x1440+0+0, ForceCompositionPipeline=On}, DPY-1: nvidia-auto-select @1920x1080 +0+138 {ViewPortIn=1920x1080, ViewPortOut=1920x1080+0+0, ForceCompositionPipeline=On}'
 
-xrandr --output DisplayPort-0 --off --output DisplayPort-1 --off --output DisplayPort-2 --primary --mode 2560x1440 --pos 1920x0 --rotate normal --output HDMI-A-0 --mode 1920x1080 --pos 0x180 --rotate normal
+#xrandr --output DisplayPort-0 --off --output DisplayPort-1 --off --output DisplayPort-2 --primary --mode 2560x1440 --pos 1920x0 --rotate normal --output HDMI-A-0 --mode 1920x1080 --pos 0x180 --rotate normal
-xrandr --output DisplayPort-2 --set "scaling mode" Full
+#xrandr --output DisplayPort-2 --set "scaling mode" Full
+xrandr --output DP-1-3 --mode 2560x1440 -r 143.97 --output eDP-1 --off --output DP-1-1 --mode 2560x1440 --left-of DP-1-3