From 2e1ccf0cc233cbd40691f3873c6912faf8a2b9b4 Mon Sep 17 00:00:00 2001 From: liph Date: Thu, 5 Feb 2026 13:46:21 +0100 Subject: [PATCH] added new configs with the dell comp --- .../user/default.target.wants/kanata.service | 1 + kanata/.config/systemd/user/kanata.service | 10 +- niri/.config/niri/config.kdl | 6 +- niri/.config/niri/waybar-niri_2/CLAUDE.md | 36 ---- niri/.config/niri/waybar-niri_2/config.jsonc | 126 ------------- .../.config/niri/waybar-niri_2/config_2.jsonc | 160 ----------------- niri/.config/niri/waybar-niri_2/style.css | 165 ------------------ .../waybar-niri_2/themes/catppuccin-mocha.css | 26 --- .../waybar-niri_2/themes/rose-pine-moon.css | 16 -- nvim/.config/nvim/init.lua | 4 +- nvim/.config/nvim/lazy-lock.json | 24 ++- .../nvim/lua/plugins.inactive/dressing.lua | 46 +++++ .../nvim/lua/plugins.inactive/treesitter.lua | 25 +++ nvim/.config/nvim/lua/plugins/autopairs.lua | 80 ++++----- nvim/.config/nvim/lua/plugins/blink.lua | 23 ++- nvim/.config/nvim/lua/plugins/dressing.lua | 51 +----- nvim/.config/nvim/lua/plugins/treesitter.lua | 2 +- yazi/.config/yazi/init.lua | 2 +- zshrc/.zshrc | 4 +- 19 files changed, 163 insertions(+), 644 deletions(-) create mode 120000 kanata/.config/systemd/user/default.target.wants/kanata.service delete mode 100644 niri/.config/niri/waybar-niri_2/CLAUDE.md delete mode 100644 niri/.config/niri/waybar-niri_2/config.jsonc delete mode 100644 niri/.config/niri/waybar-niri_2/config_2.jsonc delete mode 100644 niri/.config/niri/waybar-niri_2/style.css delete mode 100644 niri/.config/niri/waybar-niri_2/themes/catppuccin-mocha.css delete mode 100644 niri/.config/niri/waybar-niri_2/themes/rose-pine-moon.css create mode 100644 nvim/.config/nvim/lua/plugins.inactive/dressing.lua create mode 100644 nvim/.config/nvim/lua/plugins.inactive/treesitter.lua diff --git a/kanata/.config/systemd/user/default.target.wants/kanata.service b/kanata/.config/systemd/user/default.target.wants/kanata.service new file mode 120000 index 0000000..a8bedd1 --- /dev/null +++ b/kanata/.config/systemd/user/default.target.wants/kanata.service @@ -0,0 +1 @@ +/home/liph/.config/systemd/user/kanata.service \ No newline at end of file diff --git a/kanata/.config/systemd/user/kanata.service b/kanata/.config/systemd/user/kanata.service index 5d62194..c716230 100644 --- a/kanata/.config/systemd/user/kanata.service +++ b/kanata/.config/systemd/user/kanata.service @@ -10,13 +10,13 @@ Environment=DISPLAY=:0 # WARNING: doing so will require the service to run as an elevated user such as root. # Implementing least privilege access is an exercise left to the reader. # -CPUSchedulingPolicy=rr -CPUSchedulingPriority=99 -IOSchedulingClass=realtime +#CPUSchedulingPolicy=rr +#CPUSchedulingClass=realtim Nice=-20 Type=simple -ExecStart=/usr/bin/sh -c "exec $$(which kanata) --cfg $$HOME/.config/kanata/config.kbd" -Restart=no +ExecStart=/usr/bin/sh -c "exec $$(which kanata) --cfg $$HOME/.config/kanata/config.kbd --no-wait" +Restart=on failure +RestartkSec=3 [Install] WantedBy=default.target diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl index 60e4d0f..0123954 100644 --- a/niri/.config/niri/config.kdl +++ b/niri/.config/niri/config.kdl @@ -4,6 +4,7 @@ // https://yalter.github.io/niri/Configuration:-Introduction input { keyboard { + xkb { layout "ch" variant "de_mac" @@ -33,7 +34,7 @@ environment { } output "eDP-1" { mode "2880x1800@59.990" - scale 1.75 + scale 1.2 position x=0 y=0 focus-at-startup } @@ -46,7 +47,6 @@ layout { gaps 2 center-focused-column "never" preset-column-widths { - proportion 0.3333 proportion 0.5 proportion 0.66667 } @@ -92,6 +92,8 @@ workspace "1" workspace "2" workspace "3" workspace "4" + + // Example: block out two password managers from screen capture. // (This example rule is commented out with a "/-" in front.) /-window-rule { diff --git a/niri/.config/niri/waybar-niri_2/CLAUDE.md b/niri/.config/niri/waybar-niri_2/CLAUDE.md deleted file mode 100644 index 88fe5e3..0000000 --- a/niri/.config/niri/waybar-niri_2/CLAUDE.md +++ /dev/null @@ -1,36 +0,0 @@ -# CLAUDE.md - -This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. - -## Overview - -This is a Waybar configuration for the Niri Wayland compositor. Waybar is a status bar that displays system information (CPU, memory, battery, network, etc.) and workspace indicators. - -## Architecture - -### Configuration Files -- `config.jsonc` - Primary Waybar configuration (modules, layout, icons, click actions) -- `config_2.jsonc` - Alternative configuration variant with different module arrangement - -### Theming System -The styling uses a layered CSS approach with theme variable support: - -1. `theme.css` - Symlink pointing to the active theme in `themes/` -2. `themes/*.css` - Theme definitions (catppuccin-mocha, rose-pine-moon) that define `@define-color` variables -3. `colors.css` - Utility classes that map theme variables to CSS classes (`.red`, `.blue`, `.base`, etc.) -4. `style.css` - Main styling that uses `@theme_*` GTK variables and custom theme colors - -**Theme switching**: Change the `theme.css` symlink to point to a different theme file in `themes/`. - -### Module Layout -The bar uses three sections: -- **Left**: Logo/launcher, system monitors (CPU, memory), bluetooth -- **Center**: Workspace indicators (niri/workspaces) -- **Right**: Tray, power profiles, audio, network, battery, clock, power button - -## Key Patterns - -- Icons use Nerd Font glyphs wrapped in `` for sizing -- Click handlers launch external tools: `wofi` (launcher), `wlogout` (power menu), `pavucontrol` (audio), `blueman-manager` (bluetooth) -- CSS uses `alpha()` function for transparency and `@theme_*` GTK theme integration -- Module styling uses consistent `border-radius: 20px` pill shapes with `5px 15px` padding diff --git a/niri/.config/niri/waybar-niri_2/config.jsonc b/niri/.config/niri/waybar-niri_2/config.jsonc deleted file mode 100644 index ce0dd96..0000000 --- a/niri/.config/niri/waybar-niri_2/config.jsonc +++ /dev/null @@ -1,126 +0,0 @@ -// -*- mode: jsonc -*- -{ - "layer": "top", - "position": "top", - "height": 30, - "spacing": 0, - "modules-left": ["custom/logo", "cpu", "memory", "bluetooth"], - "modules-center": ["niri/workspaces"], - "modules-right": [ - "tray", - "power-profiles-daemon", - // "niri/language", - "pulseaudio", - "network", - "battery", - "clock", - "custom/power", - ], - "niri/workspaces": { - "format": "{icon}", - "format-icons": { - // Named workspaces - // (you need to configure them in niri) - // "1", - // "2": "2", - // "3": "3", - // "4": "4", - // "5": "5", - // "6": "6", - // Icons by state - "active": "", - "default": "", - }, - }, - // "mpris": { - // "format": "DEFAULT: {player_icon} {dynamic}", - // "format-paused": "DEFAULT: {status_icon} {dynamic}", - // "player-icons": { - // "default": "▶", - // "mpv": "🎵", - // }, - // "status-icons": { - // "paused": "⏸", - // }, - // }, - "tray": { - "icon-size": 14, - "spacing": 10, - }, - "clock": { - "format": "{:%H:%M:%S}", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}", - "interval": 1, - }, - "cpu": { - "format": " {usage}%", - "tooltip": false, - "interval": 1, - }, - "memory": { - "format": " {}%", - "interval": 1, - }, - "battery": { - "interval": 1, - "states": { - "warning": 30, - "critical": 15, - }, - "format": "{icon} {capacity}%", - "format-full": "{icon} {capacity}%", - "format-charging": "󰂄 {capacity}%", - "format-plugged": "󰂄 {capacity}%", - "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󰂂", "󰁹"], - }, - "power-profiles-daemon": { - "format": "{icon}", - "tooltip-format": "Power profile: {profile}\nDriver: {driver}", - "tooltip": true, - "format-icons": { - "default": " ", - "performance": " ", - "balanced": " ", - "power-saver": "󰌪 ", - }, - }, - "network": { - "format-wifi": "󰖩 ", - "format-ethernet": "󰈀", - "format-disconnected": "󱚵", - "format-alt": "{bandwidthDownBytes}", - "interval": 1, - }, - "pulseaudio": { - "format": "{icon} {volume}%", - "format-muted": "󰝟", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphone": "", - // "hands-free": "", - // "headset": "", - // "phone": "", - // "portable": "", - // "car": "", - "default": ["󰕿", "󰖀", "󰕾"], - }, - "on-click": "pavucontrol", - }, - "custom/power": { - "format": "⏻", - "tooltip": false, - "on-click": "wlogout -l ~/.config/niri/wlogout/layout", - }, - "custom/logo": { - "format": "󰣇", - "on-click": "wofi --show drun", - }, - "bluetooth": { - "format": "󰂯", - "format-disabled": "󰂲", - "format-connected": "󰂱", - "on-click": "blueman-manager", - }, -} diff --git a/niri/.config/niri/waybar-niri_2/config_2.jsonc b/niri/.config/niri/waybar-niri_2/config_2.jsonc deleted file mode 100644 index a46cb05..0000000 --- a/niri/.config/niri/waybar-niri_2/config_2.jsonc +++ /dev/null @@ -1,160 +0,0 @@ -{ - "layer": "top", - "position": "top", - "mod": "dock", - "exclusive": true, - "passthrough": false, - "gtk-layer-shell": true, - "height": 0, - "modules-left": ["clock", "custom/power_btn", "custom/lock_screen", "niri/workspaces"], - "modules-center": ["niri/window"], - "modules-right": [ - "network", - "bluetooth", - "pulseaudio", - "pulseaudio#microphone", - "tray" - ], - "niri/workspaces": { - "all-outputs": true, - "on-click": "activate", - "persistent-workspaces": { - "1": [], - "2": [], - "3": [], - "4": [], - "5": [] - } - }, - "custom/launch_wofi": { - "format": "", - "on-click": "pkill wofi; wofi -n", - "tooltip": false - }, - "custom/lock_screen": { - "format": "", - "on-click": "sh -c '(sleep 0.5s; swaylock)' & disown", - "tooltip": false - }, - "custom/light_dark": { - "format": "󰐾", - "on-click": "~/.config/waybar/scripts/baraction light", - "tooltip": false - }, - "custom/power_btn": { - "format": "", - "on-click": "sh -c '(sleep 0.5s; wlogout --protocol layer-shell)' & disown", - "tooltip": false - }, - "cpu": { - "interval": 10, - "format": " {usage}%", - "max-length": 10, - "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" - }, - "disk": { - "interval": 30, - "format": "󰋊 {percentage_used}%", - "path": "/", - "tooltip": true, - "tooltip-format": "HDD - {used} used out of {total} on {path} ({percentage_used}%)", - "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" - }, - "memory": { - "interval": 30, - "format": " {}%", - "max-length": 10, - "tooltip": true, - "tooltip-format": "Memory - {used:0.1f}GB used", - "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" - }, - "custom/updates": { - "format": " {}", - "tooltip-format": "{}", - "escape": true, - "return-type": "json", - "exec": "~/.config/waybar/scripts/update-sys", - "restart-interval": 60, - "on-click": "kitty -e ~/.config/waybar/scripts/update-sys update", - "tooltip": false - }, - "tray": { - "icon-size": 13, - "tooltip": false, - "spacing": 10 - }, - "clock": { - "format": "{: %R %d/%m}", - "tooltip-format": "{:%Y %B}\n{calendar}" - }, - "backlight": { - "device": "intel_backlight", - "format": "{icon} {percent}%", - "format-icons": ["", "", ""], - "on-scroll-up": "brightnessctl set 1%+", - "on-scroll-down": "brightnessctl set 1%-", - "min-length": 6 - }, - "battery": { - "states": { - "good": 95, - "warning": 30, - "critical": 20 - }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", - "format-alt": "{time} {icon}", - "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"] - }, - "pulseaudio": { - "format": "{icon} {volume}%", - "tooltip": false, - "format-muted": " Muted", - "on-click": "pamixer -t", - "on-scroll-up": "pamixer -i 5", - "on-scroll-down": "pamixer -d 5", - "scroll-step": 5, - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - } - }, - "pulseaudio#microphone": { - "format": "{format_source}", - "tooltip": false, - "format-source": " {volume}%", - "format-source-muted": " Muted", - "on-click": "pamixer --default-source -t", - "on-scroll-up": "pamixer --default-source -i 5", - "on-scroll-down": "pamixer --default-source -d 5", - "scroll-step": 5 - }, - "temperature": { - "thermal-zone": 1, - "format": "{temperatureF}°F ", - "critical-threshold": 80, - "format-critical": "{temperatureC}°C " - }, - "network": { - "format-wifi": " {signalStrength}%", - "format-ethernet": "󰈀 100% ", - "tooltip-format": "Connected to {essid} {ifname} via {gwaddr}", - "format-linked": "{ifname} (No IP)", - "format-disconnected": "󰖪 0% ", - "on-click": "~/.config/rofi/wifi/wifi.sh" - }, - "bluetooth": { - "format": " {status}", - "format-disabled": "", - "format-off": "", - "interval": 30, - "on-click": "blueman-manager", - "format-no-controller": "" - } -} diff --git a/niri/.config/niri/waybar-niri_2/style.css b/niri/.config/niri/waybar-niri_2/style.css deleted file mode 100644 index e5fcf09..0000000 --- a/niri/.config/niri/waybar-niri_2/style.css +++ /dev/null @@ -1,165 +0,0 @@ -@import "theme.css"; -@import "colors.css"; - -* { - font-family: "JetBrainsMono"; - font-size: 12px; -} -window#waybar { - background-color: rgba(43, 48, 59, 0.5); - /* background: color: @rose, @theme_base_color); */ - color: @text; - transition-property { @rose} ; - transition-duration [0.5s]; -} - -window#waybar.hidden { - opacity: 0.2; -} -button { - border: none; - border-radius: 0; -} -button:hover { - background: inherit; -} -#workspaces { - padding: 5px; -} -#workspaces button { - padding: 0 10px; - background-color: transparent; - color: @muted; - border-radius: 10px; -} -#workspaces button:hover { - color: #e5c890; -} -#workspaces button.active, -#workspaces button.default, -#workspaces button.focused { - background: #babbf1; -} -#workspaces button.urgent { - background-color: #eb4d4b; -} -/* #clock, */ -/* #battery, */ -/* #cpu, */ -/* #memory, */ -#disk, -#temperature, -#backlight, -#network, -/* #pulseaudio, */ -#wireplumber, -/* #custom-media, */ -#tray, -#mode, -#idle_inhibitor, -#scratchpad, -#power-profiles-daemon, -#mpd { - padding: 0 10px; - color: @theme_fg_color; -} -#window, -#workspaces { - margin: 0 4px; -} -/* If workspaces is the leftmost module, omit left margin */ -.modules-left > widget:first-child > #workspaces { - margin-left: 0; -} -/* If workspaces is the rightmost module, omit right margin */ -.modules-right > widget:last-child > #workspaces { - margin-right: 0; -} -#clock, -#cpu { - color: @yellow; -} -#memory { - color: @mauve; -} -/* #backlight, */ -/* #network, */ -/* #pulseaudio, */ -/* #custom-media, */ -/* #tray, */ -/* #custom-power, */ -/* #bluetooth, */ -#battery.charging { - color: @rose; -} -#battery.plugged { - color: @yellow; -} -#battery.full { - color: @mauve; -} -#power-profiles-daemon { - padding: 5px 15px; - color: @sky; - background-color: alpha(@theme_unfocused_bg_color, 0.4); - border-radius: 20px; - margin: 0 4px; -} -#power-profiles-daemon.performance { - color: @red; -} -#power-profiles-daemon.power-saver { - color: @yellow; -} - -#battery.charging { - color: @sky; -} -#custom-power { - background-color: @red; - border-radius: 20px 0 0 20px; - transition: all 250ms ease-in-out; -} -#tray { - border-radius: 20px; - margin: 0 5px; -} -#clock { - border-radius: 20px; - margin: 0 5px; -} -#network.wifi { - color: @rose; -} -#network.ethernet { - color: @blue; -} -#network.disconnected { - color: @red; -} -#pulseaudio { - color: @yellow; -} -#pulseaudio.muted { - color: @red; -} -#custom-power { - color: @text; - margin: 0; -} -#custom-logo { - background-color: @blue; - padding: 0 17px; - border-radius: 0 20px 20px 0; -} -#bluetooth { - color: @mauve; - border-radius: 20px; - margin: 0 5px; -} -#bluetooth.connected { - color: @mauve; -} -#bluetooth.disabled { - color: @red; -} diff --git a/niri/.config/niri/waybar-niri_2/themes/catppuccin-mocha.css b/niri/.config/niri/waybar-niri_2/themes/catppuccin-mocha.css deleted file mode 100644 index 0eb6a82..0000000 --- a/niri/.config/niri/waybar-niri_2/themes/catppuccin-mocha.css +++ /dev/null @@ -1,26 +0,0 @@ -@define-color rosewater #f5e0dc; -@define-color flamingo #f2cdcd; -@define-color pink #f5c2e7; -@define-color mauve #cba6f7; -@define-color red #f38ba8; -@define-color maroon #eba0ac; -@define-color peach #fab387; -@define-color yellow #f9e2af; -@define-color green #a6e3a1; -@define-color teal #94e2d5; -@define-color sky #89dceb; -@define-color sapphire #74c7ec; -@define-color blue #89b4fa; -@define-color lavender #b4befe; -@define-color text #cdd6f4; -@define-color subtext1 #bac2de; -@define-color subtext0 #a6adc8; -@define-color overlay2 #9399b2; -@define-color overlay1 #7f849c; -@define-color overlay0 #6c7086; -@define-color surface2 #585b70; -@define-color surface1 #45475a; -@define-color surface0 #313244; -@define-color base #1e1e2e; -@define-color mantle #181825; -@define-color crust #11111b; diff --git a/niri/.config/niri/waybar-niri_2/themes/rose-pine-moon.css b/niri/.config/niri/waybar-niri_2/themes/rose-pine-moon.css deleted file mode 100644 index 53e95cd..0000000 --- a/niri/.config/niri/waybar-niri_2/themes/rose-pine-moon.css +++ /dev/null @@ -1,16 +0,0 @@ -/* -@define-color base #232136; -@define-color surface #2a273f; -@define-color overlay #393552; -@define-color muted #6e6a86; -@define-color subtle #908caa; -@define-color text #e0def4; -@define-color red #eb6f92; -@define-color yellow #f6c177; -@define-color rose #ea9a97; -@define-color blue #3e8fb0; -@define-color sky #9ccfd8; -@define-color mauve #c4a7e7; -@define-color highlightLow #2a283e; -@define-color highlightMed #44415a; -@define-color highlightHigh #56526e; diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 4184f34..a495605 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -38,7 +38,9 @@ vim.filetype.add({ }) require("vim-options") -require("lazy").setup("plugins") +require('lazy').setup('plugins', { + rocks = { enabled = false }, +}) require("lualine").setup({ sections = { lualine_x = { diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 04479ba..04c120b 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,9 +1,9 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, - "R.nvim": { "branch": "main", "commit": "3db1971a81f8ad3d09aca698601abbe4cc909e37" }, + "R.nvim": { "branch": "main", "commit": "80268b5a66ad48e308513cb0ebccc16d5e1e7d5a" }, "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" }, - "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, + "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, @@ -19,8 +19,8 @@ "everforest": { "branch": "master", "commit": "b03a03148c8b34c24c96960b93da9c8883d11f54" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, - "fzf-lua": { "branch": "main", "commit": "e5804f4924cf74ad03834c25988998a273ae0d7b" }, - "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" }, + "fzf-lua": { "branch": "main", "commit": "c86b72c62b01d2242cafa45fb0d1fc3bf66e6a2b" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ce96a464fdbc24208e24c117e2021794259005d" }, "grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" }, "gruvbox-mat": { "branch": "master", "commit": "790afe9dd085aa04eccd1da3626c5fa05c620e53" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, @@ -29,7 +29,7 @@ "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "luvit-meta": { "branch": "main", "commit": "0ea4ff636c5bb559ffa78108561d0976f4de9682" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "c953789db7fd28eafe5eb5659846d34b5024b3cc" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, "neogit": { "branch": "master", "commit": "73870229977fdd8747025820e15e98cfde787b9c" }, @@ -40,22 +40,22 @@ "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-lint": { "branch": "master", "commit": "bcd1a44edbea8cd473af7e7582d3f7ffc60d8e81" }, - "nvim-lspconfig": { "branch": "master", "commit": "3f58aeca0c6ece8a9fb8782ea3fcb6024f285be3" }, + "nvim-lspconfig": { "branch": "master", "commit": "0480b120318ec8bab27b530ffab6ee76a8c4d806" }, "nvim-navic": { "branch": "master", "commit": "f5eba192f39b453675d115351808bd51276d9de5" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, + "nvim-treesitter": { "branch": "main", "commit": "70a9fecaf5aeae70c765d4c51a8038165a91aa06" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" }, + "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "onedark-warm": { "branch": "master", "commit": "213c23ae45a04797572242568d5d51937181792d" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "portal.nvim": { "branch": "main", "commit": "77d9d53fec945bfa407d5fd7120f1b4f117450ed" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "d6b802552cbe7d643a3b6b31f419c248d1f1e220" }, - "render-markdown.nvim": { "branch": "main", "commit": "b3efd6408e4e4d66d6caaee0579e72b579bc0884" }, + "render-markdown.nvim": { "branch": "main", "commit": "48b4175dbca8439d30c1f52231cbe5a712c8f9d9" }, "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "sonokai": { "branch": "master", "commit": "b023c5280b16fe2366f5e779d8d2756b3e5ee9c3" }, @@ -63,9 +63,7 @@ "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" }, "tokyonight": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, - "vim-test": { "branch": "master", "commit": "c569b3620d0e53572efc95159f66ace5e7b06b48" }, "vimtex": { "branch": "master", "commit": "f707368022cdb851716be0d2970b90599c84a6a6" }, - "vimux": { "branch": "master", "commit": "614f0bb1fb598f97accdcea71d5f7b18d7d62436" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, - "yazi.nvim": { "branch": "main", "commit": "46fd318814b13cdb27750c045973df3f80425e68" } + "yazi.nvim": { "branch": "main", "commit": "02d5086bee04e0c861afeed8ce48988c89b19f9d" } } diff --git a/nvim/.config/nvim/lua/plugins.inactive/dressing.lua b/nvim/.config/nvim/lua/plugins.inactive/dressing.lua new file mode 100644 index 0000000..b924b9c --- /dev/null +++ b/nvim/.config/nvim/lua/plugins.inactive/dressing.lua @@ -0,0 +1,46 @@ +-- dressing.lua: Enhances UI elements like input boxes and select menus for consistency. + +return { + { + "stevearc/dressing.nvim", + event = "VeryLazy", + opts = { + input = { + enabled = true, + default_prompt = "Input:", + trim_prompt = true, + title_pos = "left", + start_in_insert = true, + border = "rounded", + relative = "cursor", + prefer_width = 40, + win_options = { + winblend = 0, + }, + mappings = { + n = { + [""] = "Close", + [""] = "Confirm", + }, + i = { + [""] = "Close", + [""] = "Confirm", + [""] = "HistoryPrev", + [""] = "HistoryNext", + }, + }, + }, + select = { + enabled = true, + backend = { "telescope", "builtin" }, + trim_prompt = true, + telescope = require("telescope.themes").get_dropdown({ + layout_config = { + width = 0.8, + height = 0.8, + }, + }), + }, + }, + }, +} diff --git a/nvim/.config/nvim/lua/plugins.inactive/treesitter.lua b/nvim/.config/nvim/lua/plugins.inactive/treesitter.lua new file mode 100644 index 0000000..3e9942c --- /dev/null +++ b/nvim/.config/nvim/lua/plugins.inactive/treesitter.lua @@ -0,0 +1,25 @@ +-- treesitter.lua: Enables syntax highlighting, code folding, and structural analysis. + +return { + 'nvim-treesitter/nvim-treesitter', + version = false, -- always pull latest + build = ':TSUpdate', + ---@type TSConfig + opts = { + modules = { + highlight = { enable = true }, + indent = { enable = true }, + }, + -- Parsers that should always be present + ensure_installed = { + 'bash', 'html', 'java', 'latex', 'lua', 'markdown', 'markdown_inline', + 'python', 'r', 'sql', 'vim', 'yaml', + }, + sync_install = false, -- install in background + auto_install = true, -- fetch parser when you open a file + ignore_install = {}, -- none + }, + config = function(_, opts) + require('nvim-treesitter.configs').setup(opts) + end, +} diff --git a/nvim/.config/nvim/lua/plugins/autopairs.lua b/nvim/.config/nvim/lua/plugins/autopairs.lua index d271243..23a3981 100644 --- a/nvim/.config/nvim/lua/plugins/autopairs.lua +++ b/nvim/.config/nvim/lua/plugins/autopairs.lua @@ -13,26 +13,26 @@ return { local cmp = require("cmp") autopairs.setup({ - check_ts = true, -- Enable treesitter + check_ts = true, -- Enable treesitter ts_config = { - lua = { "string" }, -- Don't add pairs in lua string treesitter nodes + lua = { "string" }, -- Don't add pairs in lua string treesitter nodes javascript = { "template_string" }, -- Don't add pairs in JS template strings - java = false, -- Don't check treesitter on java + java = false, -- Don't check treesitter on java }, disable_filetype = { "TelescopePrompt", "vim" }, - disable_in_macro = true, -- Disable when recording or executing a macro + disable_in_macro = true, -- Disable when recording or executing a macro disable_in_visualblock = false, -- Disable when in visual block mode disable_in_replace_mode = true, ignored_next_char = [=[[%w%%%'%[%"%.%`%$]]=], enable_moveright = true, - enable_afterquote = true, -- Add bracket pairs after quote + enable_afterquote = true, -- Add bracket pairs after quote enable_check_bracket_line = true, -- Check bracket in same line enable_bracket_in_quote = true, - enable_abbr = false, -- Trigger abbreviation - break_undo = true, -- Switch for basic rule break undo sequence + enable_abbr = false, -- Trigger abbreviation + break_undo = true, -- Switch for basic rule break undo sequence check_comma = true, map_cr = true, - map_bs = true, -- Map the key + map_bs = true, -- Map the key map_c_h = false, -- Map the key to delete a pair map_c_w = false, -- Map to delete a pair if possible }) @@ -55,41 +55,41 @@ return { autopairs.add_rules({ Rule(" ", " ") - :with_pair(function(opts) - local pair = opts.line:sub(opts.col - 1, opts.col) - return vim.tbl_contains({ "()", "[]", "{}" }, pair) - end) - :with_move(cond.none()) - :with_cr(cond.none()) - :with_del(function(opts) - local col = vim.api.nvim_win_get_cursor(0)[2] - local context = opts.line:sub(col - 1, col + 2) - return vim.tbl_contains({ "( )", "[ ]", "{ }" }, context) - end), + :with_pair(function(opts) + local pair = opts.line:sub(opts.col - 1, opts.col) + return vim.tbl_contains({ "()", "[]", "{}" }, pair) + end) + :with_move(cond.none()) + :with_cr(cond.none()) + :with_del(function(opts) + local col = vim.api.nvim_win_get_cursor(0)[2] + local context = opts.line:sub(col - 1, col + 2) + return vim.tbl_contains({ "( )", "[ ]", "{ }" }, context) + end), Rule("", " )") - :with_pair(cond.none()) - :with_move(function(opts) - return opts.char == ")" - end) - :with_cr(cond.none()) - :with_del(cond.none()) - :use_key(")"), + :with_pair(cond.none()) + :with_move(function(opts) + return opts.char == ")" + end) + :with_cr(cond.none()) + :with_del(cond.none()) + :use_key(")"), Rule("", " }") - :with_pair(cond.none()) - :with_move(function(opts) - return opts.char == "}" - end) - :with_cr(cond.none()) - :with_del(cond.none()) - :use_key("}"), + :with_pair(cond.none()) + :with_move(function(opts) + return opts.char == "}" + end) + :with_cr(cond.none()) + :with_del(cond.none()) + :use_key("}"), Rule("", " ]") - :with_pair(cond.none()) - :with_move(function(opts) - return opts.char == "]" - end) - :with_cr(cond.none()) - :with_del(cond.none()) - :use_key("]"), + :with_pair(cond.none()) + :with_move(function(opts) + return opts.char == "]" + end) + :with_cr(cond.none()) + :with_del(cond.none()) + :use_key("]"), }) end, }, diff --git a/nvim/.config/nvim/lua/plugins/blink.lua b/nvim/.config/nvim/lua/plugins/blink.lua index 84e3d45..7d59707 100644 --- a/nvim/.config/nvim/lua/plugins/blink.lua +++ b/nvim/.config/nvim/lua/plugins/blink.lua @@ -2,17 +2,22 @@ return { "saghen/blink.cmp", - version = "v1.*", -- stay on stable branch - build = "cargo build --release", -- compile matcher locally - lazy = false, -- must load before first lsp attach + version = "v1.*", -- stay on stable branch + build = "cargo build --release", -- compile matcher locally (or download pre-built) + lazy = false, -- must load before first LSP attach dependencies = { "L3MON4D3/LuaSnip", "rafamadriz/friendly-snippets", }, opts = { - -- completion sources ---------------------------------------------------- + -- silence "incomplete build" message and prefer pre-built binary + fuzzy = { implementation = "prefer_rust" }, + + --------------------------------------------------------------------------- + -- completion sources + --------------------------------------------------------------------------- sources = { - min_keyword_length = 2, -- <-- Move it here from trigger section + min_keyword_length = 2, -- <-- moved here (global default) default = { "nvim_lsp", "luasnip", "buffer", "path", "cmp_tabnine" }, providers = { nvim_lsp = { name = "LSP", module = "blink.cmp.sources.lsp" }, @@ -30,11 +35,13 @@ return { }, }, - -- completion behaviour -------------------------------------------------- + --------------------------------------------------------------------------- + -- completion behaviour + --------------------------------------------------------------------------- completion = { accept = { auto_brackets = { enabled = true } }, trigger = { - show_on_trigger_character = true, -- <-- Remove min_keyword_length from here + show_on_trigger_character = true, -- min_keyword_length removed }, list = { selection = { @@ -54,7 +61,7 @@ return { window = { border = "rounded" }, }, - cmdline = { enabled = true }, + cmdline = { enabled = false }, }, config = function(_, opts) diff --git a/nvim/.config/nvim/lua/plugins/dressing.lua b/nvim/.config/nvim/lua/plugins/dressing.lua index b924b9c..409f259 100644 --- a/nvim/.config/nvim/lua/plugins/dressing.lua +++ b/nvim/.config/nvim/lua/plugins/dressing.lua @@ -1,46 +1,13 @@ -- dressing.lua: Enhances UI elements like input boxes and select menus for consistency. return { - { - "stevearc/dressing.nvim", - event = "VeryLazy", - opts = { - input = { - enabled = true, - default_prompt = "Input:", - trim_prompt = true, - title_pos = "left", - start_in_insert = true, - border = "rounded", - relative = "cursor", - prefer_width = 40, - win_options = { - winblend = 0, - }, - mappings = { - n = { - [""] = "Close", - [""] = "Confirm", - }, - i = { - [""] = "Close", - [""] = "Confirm", - [""] = "HistoryPrev", - [""] = "HistoryNext", - }, - }, - }, - select = { - enabled = true, - backend = { "telescope", "builtin" }, - trim_prompt = true, - telescope = require("telescope.themes").get_dropdown({ - layout_config = { - width = 0.8, - height = 0.8, - }, - }), - }, - }, - }, + 'stevearc/dressing.nvim', + dependencies = { 'nvim-telescope/telescope.nvim' }, -- load order guarantee + lazy = true, -- optional + config = function() + local themes = require('telescope.themes') -- now safe + require('dressing').setup { + select = { telescope = themes.get_dropdown() }, + } + end, } diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua index b728646..c913775 100644 --- a/nvim/.config/nvim/lua/plugins/treesitter.lua +++ b/nvim/.config/nvim/lua/plugins/treesitter.lua @@ -22,7 +22,7 @@ return { "latex", "r", "rnoweb", -- for Sweave files - "yaml", -- for YAML headers in Rmdkk + "yaml", -- for YAML headers in Rmdkk }, -- Auto install missing parsers diff --git a/yazi/.config/yazi/init.lua b/yazi/.config/yazi/init.lua index 64398eb..6b5b94f 100644 --- a/yazi/.config/yazi/init.lua +++ b/yazi/.config/yazi/init.lua @@ -93,7 +93,7 @@ require("recycle-bin"):setup({ trash_dir = "~/.local/share/Trash/", }) -require("omp"):setup({ config = "/home/liph/.config/yazi/omp/omp.toml" }) +-- require("omp"):setup({ config = "/home/liph/.config/yazi/omp/omp.toml" }) require("mime-ext"):setup({ -- with_files = { diff --git a/zshrc/.zshrc b/zshrc/.zshrc index 5e1992d..ed947a4 100644 --- a/zshrc/.zshrc +++ b/zshrc/.zshrc @@ -19,7 +19,7 @@ source ~/.aliases.zsh source ~/.plugins.zsh source ~/.export.zsh # https://github.com/jungunn/fzf-git.sh -source ~/scripts/fzf-git.sh +# source ~/scripts/fzf-git.sh # you should unse # source /usr/share/zsh/plugins/zsh-you-should-use/you-should-use.plugin.zsh # Set up fzf key bindings and fuzzy completion @@ -85,7 +85,7 @@ eval "$(navi widget zsh)" # pyenv https://github.com/pyenv/pyenv-virtualenv # eval "$(pyenv init --path)" eval "$(pyenv init -)" -eval "$(pyenv virtualenv-init -)" +# eval "$(pyenv virtualenv-init -)" # starship # eval "$(starship init zsh)"