i be working

This commit is contained in:
2026-03-13 12:21:18 +00:00
parent 442284c92f
commit 24bad1f5c4
7 changed files with 108 additions and 8 deletions
+2 -2
View File
@@ -224,8 +224,8 @@
"networkPreference": "wifi", "networkPreference": "wifi",
"iconTheme": "System Default", "iconTheme": "System Default",
"cursorSettings": { "cursorSettings": {
"theme": "Qogir", "theme": "Adwaita",
"size": 32, "size": 24,
"niri": { "niri": {
"hideWhenTyping": false, "hideWhenTyping": false,
"hideAfterInactiveMs": 0 "hideAfterInactiveMs": 0
+4
View File
@@ -75,6 +75,10 @@ status is-interactive; and begin
if test "$TERM" != dumb if test "$TERM" != dumb
fzf --fish | source fzf --fish | source
bind --erase \ct
bind -M insert --erase \ct
bind \cf fzf-file-widget
bind -M insert \cf fzf-file-widget
end end
# add completions generated by Home Manager to $fish_complete_path # add completions generated by Home Manager to $fish_complete_path
+9
View File
@@ -1,8 +1,17 @@
function y function y
set tmp (mktemp -t "yazi-cwd.XXXXXX") set tmp (mktemp -t "yazi-cwd.XXXXXX")
# In Zellij + Alacritty, force Yazi away from graphical adapters and into Chafa.
# This gives text/blocks previews instead of broken/blank image panes.
if set -q ZELLIJ
env -u DISPLAY -u WAYLAND_DISPLAY -u SWAYSOCK -u HYPRLAND_INSTANCE_SIGNATURE -u WAYFIRE_SOCKET TERM=xterm-256color yazi $argv --cwd-file="$tmp"
else
yazi $argv --cwd-file="$tmp" yazi $argv --cwd-file="$tmp"
end
if set cwd (command cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] if set cwd (command cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
builtin cd -- "$cwd" builtin cd -- "$cwd"
end end
rm -f -- "$tmp" rm -f -- "$tmp"
end end
+15
View File
@@ -0,0 +1,15 @@
function yazi --wraps yazi --description "Yazi wrapper that forces Chafa inside Zellij"
if set -q ZELLIJ
begin
set -e DISPLAY
set -e WAYLAND_DISPLAY
set -e SWAYSOCK
set -e HYPRLAND_INSTANCE_SIGNATURE
set -e WAYFIRE_SOCKET
set -lx TERM xterm-256color
command yazi $argv
end
else
command yazi $argv
end
end
+3 -1
View File
@@ -119,7 +119,9 @@ return {
end, "[T]oggle Inlay [H]ints") end, "[T]oggle Inlay [H]ints")
end end
-- Svelte-specific: notify on TS/JS file changes -- Svelte-specific: keep treesitter highlighting in control
-- (semantic tokens can make svelte buffers look oddly colored)
-- and notify on TS/JS file changes
-- https://github.com/sveltejs/language-tools/issues/2008#issuecomment-2351976230 -- https://github.com/sveltejs/language-tools/issues/2008#issuecomment-2351976230
if client and client.name == "svelte" then if client and client.name == "svelte" then
vim.api.nvim_create_autocmd("BufWritePost", { vim.api.nvim_create_autocmd("BufWritePost", {
+73 -3
View File
@@ -4,12 +4,13 @@ return {
lazy = false, lazy = false,
build = ":TSUpdate", build = ":TSUpdate",
config = function() config = function()
require("nvim-treesitter").setup({ local ts = require("nvim-treesitter")
ts.setup({
install_dir = vim.fn.stdpath("data") .. "/site", install_dir = vim.fn.stdpath("data") .. "/site",
}) })
-- Install parsers (async, no-op if already installed) -- Install parsers (async, no-op if already installed)
require("nvim-treesitter").install({ ts.install({
"vimdoc", "vimdoc",
"javascript", "javascript",
"typescript", "typescript",
@@ -28,6 +29,75 @@ return {
"nix", "nix",
}) })
-- Enable treesitter highlighting - indentexpr set automatically per filetype vim.api.nvim_create_autocmd("FileType", {
pattern = {
"svelte",
"javascript",
"typescript",
"tsx",
"html",
"css",
"lua",
"nix",
},
callback = function()
pcall(vim.treesitter.start)
end,
})
-- Workaround: some svelte parser/query combos don't inject JS for <script>
-- blocks without an explicit lang attribute, which leaves raw_text as @none.
vim.treesitter.query.set("svelte", "injections", [=[
; inherits: html_tags
((style_element
(start_tag
(attribute
(attribute_name) @_attr
(quoted_attribute_value
(attribute_value) @_lang)))
(raw_text) @injection.content)
(#eq? @_attr "lang")
(#any-of? @_lang "scss" "postcss" "less")
(#set! injection.language "scss"))
; fallback for plain <script>...</script>
((script_element
(raw_text) @injection.content)
(#set! injection.language "javascript"))
((script_element
(start_tag
(attribute
(attribute_name) @_attr
(quoted_attribute_value
(attribute_value) @_lang)))
(raw_text) @injection.content)
(#eq? @_attr "lang")
(#any-of? @_lang "ts" "typescript")
(#set! injection.language "typescript"))
((script_element
(start_tag
(attribute
(attribute_name) @_attr
(quoted_attribute_value
(attribute_value) @_lang)))
(raw_text) @injection.content)
(#eq? @_attr "lang")
(#any-of? @_lang "js" "javascript")
(#set! injection.language "javascript"))
((element
(start_tag
(attribute
(attribute_name) @_attr
(quoted_attribute_value
(attribute_value) @injection.language)))
(text) @injection.content)
(#eq? @_attr "lang")
(#eq? @injection.language "pug"))
]=])
end, end,
} }
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"lastChangelogVersion": "0.57.1", "lastChangelogVersion": "0.57.1",
"defaultProvider": "openai-codex", "defaultProvider": "openai-codex",
"defaultModel": "gpt-5.3-codex-spark", "defaultModel": "gpt-5.3-codex",
"defaultThinkingLevel": "medium", "defaultThinkingLevel": "medium",
"theme": "matugen", "theme": "matugen",
"lsp": { "lsp": {