Compare commits

...

4 Commits

16 changed files with 41 additions and 75 deletions

7
.gitmodules vendored
View File

@ -39,10 +39,6 @@
[submodule "src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-treesitter"] [submodule "src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-treesitter"]
path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-treesitter path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-treesitter
url = https://github.com/nvim-treesitter/nvim-treesitter.git url = https://github.com/nvim-treesitter/nvim-treesitter.git
# intelligent motions based on treesitter
[submodule "src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-treesitter-textobjects"]
path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-treesitter-textobjects
url = https://github.com/nvim-treesitter/nvim-treesitter-textobjects
# plain-text-accounting ledger ftplugin # plain-text-accounting ledger ftplugin
# ftplugin/ledger.vim # ftplugin/ledger.vim
@ -107,9 +103,6 @@
[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-treesitter.path"] [submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-treesitter.path"]
path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-treesitter path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-treesitter
url = https://github.com/nvim-treesitter/nvim-treesitter.git url = https://github.com/nvim-treesitter/nvim-treesitter.git
[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-treesitter-textobjects.path"]
path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-treesitter-textobjects
url = https://github.com/nvim-treesitter/nvim-treesitter-textobjects
[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_vim-ledger.path"] [submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_vim-ledger.path"]
path = src/dot_local/share/nvim/site/pack/3pp/start/external_vim-ledger path = src/dot_local/share/nvim/site/pack/3pp/start/external_vim-ledger
url = https://github.com/ledger/vim-ledger.git url = https://github.com/ledger/vim-ledger.git

Binary file not shown.

Before

Width:  |  Height:  |  Size: 856 KiB

After

Width:  |  Height:  |  Size: 845 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 MiB

After

Width:  |  Height:  |  Size: 907 KiB

View File

@ -28,6 +28,7 @@ xkblayout-state
xss-lock xss-lock
qutebrowser qutebrowser
neovim neovim
tree-sitter-grammars
tmux tmux
fish fish
ffmpeg ffmpeg

View File

@ -1,15 +1,10 @@
{{if eq .chezmoi.os "windows" }} {{- if eq .chezmoi.os "windows" }}
shell = "nu" shell = "nu"
{{end}} {{end -}}
[window] [window]
padding = { x = 8, y = 8 } padding = { x = 8, y = 8 }
dimensions = { columns = 120, lines = 70 } dimensions = { columns = 120, lines = 70 }
{{if eq .chezmoi.os "linux" -}} opacity = 0.6
opacity = 0.0
{{- else -}}
opacity = 1.0
{{- end}}
[font] [font]
normal = { family = "JetBrainsMono" } normal = { family = "JetBrainsMono" }
@ -47,8 +42,8 @@ bindings = [
[bell] [bell]
animation = "EaseOutQuint" animation = "EaseOutQuint"
duration = 150 duration = 250
color = "#000000" color = "#666666"
# uRls # uRls
[[hints.enabled]] [[hints.enabled]]

View File

@ -27,6 +27,7 @@
gap_size = 5 gap_size = 5
frame_width = 2 frame_width = 2
corner_radius = 10
origin = bottom-right origin = bottom-right
offset = 60x70 offset = 60x70

View File

@ -15,7 +15,7 @@ alias cp='cp -n'
abbr -a -- ds swal; abbr -a -- ds swal;
# zathura # zathura
alias thur='zathura' alias thur='swal -c Zathura; zathura'
# stricter sandbox zathura # stricter sandbox zathura
alias zathsec='/usr/bin/zathura-sandbox -c ~/.config/zathura-sec' alias zathsec='/usr/bin/zathura-sandbox -c ~/.config/zathura-sec'
@ -39,10 +39,6 @@ end
# Neomutt configs # Neomutt configs
function neomutt.local; neomutt -F .config/neomutt/neomuttrc.local; end function neomutt.local; neomutt -F .config/neomutt/neomuttrc.local; end
# Specific to my Gentoo system
function genlop; doas -u portage /usr/bin/genlop; end
function loginctl; doas /bin/loginctl; end
# bootleg meme feed # bootleg meme feed
function arf; mpv --shuffle --no-resume-playback ~/med/memes/arf; end function arf; mpv --shuffle --no-resume-playback ~/med/memes/arf; end

View File

@ -42,21 +42,6 @@ vim.cmd.packadd("vim-gitgutter")
vim.cmd.packadd("nvim-treesitter") vim.cmd.packadd("nvim-treesitter")
require 'nvim-treesitter.configs'.setup { require 'nvim-treesitter.configs'.setup {
ensure_installed = {
"c",
"cpp",
"javascript",
"typescript",
"python",
"vim",
"fish",
"bash",
"lua",
"rust",
"query",
"typst",
"toml",
},
sync_install = false, sync_install = false,
auto_install = false, auto_install = false,
highlight = { highlight = {
@ -70,6 +55,18 @@ require 'nvim-treesitter.configs'.setup {
end end
end, end,
}, },
indent = {
enable = true
},
incremental_selection = {
enable = true,
keymaps = {
init_selection = "<CR>", -- set to `false` to disable one of the mappings
scope_incremental = "<CR>",
node_incremental = "<TAB>",
node_decremental = "<S-TAB>",
},
},
} }
-- code folding -- code folding
@ -77,30 +74,10 @@ vim.wo.foldmethod = 'expr'
vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
vim.wo.foldlevel = 99 -- unfold by default vim.wo.foldlevel = 99 -- unfold by default
------
-- treesitter (language intelligent) motions
------
vim.cmd.packadd("nvim-treesitter-textobjects")
require("nvim-treesitter.configs").setup {
textobjects = {
select = {
enable = true,
keymaps = {
["af"] = "@function.outer",
["if"] = "@function.inner",
["ac"] = "@class.outer",
["ic"] = "@class.inner",
},
}
}
}
------ ------
-- diagnostics box -- diagnostics box
------ ------
keymap('<leader>dx', vim.diagnostic.open_float, { noremap=true, silent=true }) keymap('<leader>dx', vim.diagnostic.open_float, { noremap = true, silent = true })
-------------------------------- --------------------------------

View File

@ -13,11 +13,13 @@ if vim.g.neovide then
vim.g.neovide_padding_top = 8 vim.g.neovide_padding_top = 8
vim.g.neovide_padding_bottom = 8 vim.g.neovide_padding_bottom = 8
vim.g.neovide_padding_left = 8 vim.g.neovide_padding_left = 8
vim.g.neovide_transparency = 1.0 vim.g.neovide_transparency = 0.6
vim.g.neovide_background_color = "#000000" .. 0 vim.g.neovide_background_color = "#000000" .. 0
vim.g.neovide_cursor_trail_size = 0.1 vim.g.neovide_cursor_trail_size = 0.1
vim.g.neovide_cursor_animate_in_insert_mode = true vim.g.neovide_cursor_animate_in_insert_mode = true
vim.g.pumblend = 60
vim.g.winblend = 60
-- hack to unscrew the scaling issues -- hack to unscrew the scaling issues
-- sometimes opening neovide on a tiling wm makes it not occupy the entire window until resized -- sometimes opening neovide on a tiling wm makes it not occupy the entire window until resized

View File

@ -10,8 +10,8 @@ M = {}
---Hacky debug print utility (do not use outside testing) ---Hacky debug print utility (do not use outside testing)
---@param s any Thing to print ---@param s any Thing to print
---@param pre string? Message that goes before thing ---@param pre string? Message that goes before thing
---@diagnostic disable-next-line: unused-function, unused-local
---@deprecated ---@deprecated
---@diagnostic disable-next-line: unused-function, unused-local
local function dbg_print(s, pre) local function dbg_print(s, pre)
vim.system({ "sh", "-c", string.format("echo '%s' >> /tmp/nvim_scope_log", (pre or "") .. vim.inspect(s)) }) vim.system({ "sh", "-c", string.format("echo '%s' >> /tmp/nvim_scope_log", (pre or "") .. vim.inspect(s)) })
end end

View File

@ -30,7 +30,6 @@ local styles = colorbuddy.styles
Group.new("Normal", colors.noir_4, colors.none, nil) Group.new("Normal", colors.noir_4, colors.none, nil)
Group.new("StatusLine", colors.noir_4, colors.none, styles.bold) Group.new("StatusLine", colors.noir_4, colors.none, styles.bold)
Group.link("MsgArea", groups.Normal) Group.link("MsgArea", groups.Normal)
-- not selected statusline
Group.new("StatusLineNC", colors.noir_7, colors.none) Group.new("StatusLineNC", colors.noir_7, colors.none)
Group.link("Gutter", groups.normal) Group.link("Gutter", groups.normal)
Group.new("LineNr", colors.noir_8, colors.none, nil) Group.new("LineNr", colors.noir_8, colors.none, nil)
@ -59,6 +58,8 @@ Group.new("NormalFloat", colors.noir_1, colors.none, nil)
Group.new("NonText", colors.noir_9, nil, nil) Group.new("NonText", colors.noir_9, nil, nil)
Group.new("LineNr", colors.noir_7, colors.none, nil)
-- swap undercurls and underlines -- swap undercurls and underlines
for _, v in ipairs({ "Error", "Info", "Hint", "Warn" }) do for _, v in ipairs({ "Error", "Info", "Hint", "Warn" }) do
local col_name = "diagnostic_" .. string.lower(v) local col_name = "diagnostic_" .. string.lower(v)

View File

@ -13,6 +13,7 @@ return {
s({ trig = "plus", name = "plus exponent", wordTrig = false }, t("^+")), s({ trig = "plus", name = "plus exponent", wordTrig = false }, t("^+")),
s({ trig = "min", name = "minus exponent", wordTrig = false }, t("^-")), s({ trig = "min", name = "minus exponent", wordTrig = false }, t("^-")),
s({ trig = "lim", name = "limit", wordTrig = false }, fmt("lim_({}) ", { i(1) })), s({ trig = "lim", name = "limit", wordTrig = false }, fmt("lim_({}) ", { i(1) })),
s({ trig = "inf", name = "infinity", wordTrig = false }, t("infinity")),
s({ s({
trig = "numb", trig = "numb",

View File

@ -29,15 +29,15 @@ shadow-offset-x = -7;
shadow-offset-y = -7; shadow-offset-y = -7;
# fading # fading
fading = false; fading = true;
fade-in-step = 0.05; fade-in-step = 1;
fade-out-step = 0.05; fade-out-step = 0.05;
fade-delta = 5; fade-delta = 5;
# corner # corner
corner-radius = 5; corner-radius = 10;
# blur: { blur: {
# method = "dual_kawase", method = "dual_kawase",
# strength = 5, strength = 8,
# }; };

View File

@ -8,7 +8,7 @@ uniform vec3 max_derivation = vec3(0.01);
// e.g. (1,0,0)±(0.2,0.2,0.2) -> gradient from #c00 to #f00 to #f33 with #f00 being the least opaque // e.g. (1,0,0)±(0.2,0.2,0.2) -> gradient from #c00 to #f00 to #f33 with #f00 being the least opaque
// (0,0,0)±(0.25,0.25,0,25) -> gradient from #000 to #444 with #000 being at min_opacity // (0,0,0)±(0.25,0.25,0,25) -> gradient from #000 to #444 with #000 being at min_opacity
// opacity for the median_color // opacity for the median_color
uniform float min_opacity = 0.1; uniform float min_opacity = 0.6;
// exponent for the gradient (e.g. 1 for linear, 2 for quadratic, etc) // exponent for the gradient (e.g. 1 for linear, 2 for quadratic, etc)
uniform int power = 2; uniform int power = 2;
// use mean for a different effect // use mean for a different effect

View File

@ -7,18 +7,18 @@ set adjust-open width
set font "Liberation Sans 13" set font "Liberation Sans 13"
set recolor-darkcolor "#dddddd" set recolor-darkcolor "#dddddd"
set recolor-lightcolor rgba(0,0,0,0) set recolor-lightcolor rgba(0,0,0,0.6)
set recolor false set recolor true
set recolor-keephue true set recolor-keephue true
set recolor-reverse-video true set recolor-reverse-video true
set default-bg "#000000ff" set default-bg "#00000099"
set index-bg "#000000" set index-bg "#000000"
set index-active-bg "#111111" set index-active-bg "#111111"
set index-active-fg "#FFFFFF" set index-active-fg "#FFFFFF"
set inputbar-bg rgba(0,0,0,0.5) set inputbar-bg rgba(0,0,0,0.6)
set inputbar-fg "#CCCCCC" set inputbar-fg "#CCCCCC"
set statusbar-bg rgba(0,0,0,0.5) set statusbar-bg rgba(0,0,0,0.6)
set render-loading false set render-loading false

@ -1 +0,0 @@
Subproject commit ca93cb2c34b67ab22d01976fc90bc95627a3317f