mal0/dotfiles
1
0
Fork 0
Code Pull Requests Actions Releases Activity

zig

Browse Source
This commit is contained in:
Acid
2026-06-12 03:12:41 -04:00
parent 314b091ce7
commit 2e367003d0
11 changed files with 431 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/hypr/hyprpaper.conf
+1 -1
View File
@@ -8,7 +8,7 @@ wallpaper {
wallpaper { wallpaper {
monitor = DP-2 monitor = DP-2
path = /home/mahalo/photos/wallhaven-8ggqqj.jpg path = /home/mahalo/photos/wallhaven-gw2gyq.png
fit_mode = cover fit_mode = cover
} }
desktop/hypr/mods/windows.lua
+1 -1
View File
@@ -8,7 +8,7 @@ hl.window_rule({ name = "ws-firefox", match = { class = "^(org.mozilla.firefox)$
hl.window_rule({ name = "ws-waterfox", match = { class = "^(waterfox)$" }, workspace = 2 }) hl.window_rule({ name = "ws-waterfox", match = { class = "^(waterfox)$" }, workspace = 2 })
hl.window_rule({ name = "ws-nemo", match = { class = "^(nemo)$" }, workspace = 3 }) hl.window_rule({ name = "ws-nemo", match = { class = "^(nemo)$" }, workspace = 3 })
hl.window_rule({ name = "ws-vscodium", match = { title = "^(VSCodium)$" }, workspace = 4 }) hl.window_rule({ name = "ws-vscodium", match = { title = "^(VSCodium)$" }, workspace = 4 })
hl.window_rule({ name = "ws-jetbrains", match = { title = "^(jetbrains-idea)$" }, workspace = 4 }) hl.window_rule({ name = "ws-jetbrains-idea", match = { class = "^(jetbrains-idea)$" }, workspace = 4 })
hl.window_rule({ name = "ws-postman", match = { title = "^(Postman)$" }, workspace = 4 }) hl.window_rule({ name = "ws-postman", match = { title = "^(Postman)$" }, workspace = 4 })
hl.window_rule({ name = "ws-rstudio", match = { title = "^(RStudio)$" }, workspace = 4 }) hl.window_rule({ name = "ws-rstudio", match = { title = "^(RStudio)$" }, workspace = 4 })
hl.window_rule({ name = "ws-obsidian", match = { class = "^(obsidian)$" }, workspace = 5 }) hl.window_rule({ name = "ws-obsidian", match = { class = "^(obsidian)$" }, workspace = 5 })
desktop/nvim/init.lua
+130 -127
View File
@@ -21,38 +21,38 @@ require("cmpConf")
-- remove_trailing_whitespace on save -- remove_trailing_whitespace on save
vim.api.nvim_create_autocmd("BufWritePre", { vim.api.nvim_create_autocmd("BufWritePre", {
pattern = "*", pattern = "*",
callback = function() callback = function()
require("functions").remove_trailing_whitespace() require("functions").remove_trailing_whitespace()
end, end,
}) })
-- treat qss as css -- treat qss as css
vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, { vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, {
pattern = "*.qss", pattern = "*.qss",
command = "set filetype=css", command = "set filetype=css",
}) })
-- set spelling on these files -- set spelling on these files
vim.api.nvim_create_autocmd("FileType", { vim.api.nvim_create_autocmd("FileType", {
pattern = { "markdown", "text" }, pattern = { "markdown", "text" },
callback = function() callback = function()
vim.opt_local.spell = true vim.opt_local.spell = true
end, end,
}) })
vim.api.nvim_create_autocmd("TextYankPost", { vim.api.nvim_create_autocmd("TextYankPost", {
callback = function() callback = function()
vim.highlight.on_yank() vim.highlight.on_yank()
end, end,
}) })
-- Auto-open the preview window whenever Oil finishes rendering -- Auto-open the preview window whenever Oil finishes rendering
vim.api.nvim_create_autocmd("User", { vim.api.nvim_create_autocmd("User", {
pattern = "OilEnter", pattern = "OilEnter",
callback = function() callback = function()
require("oil").open_preview() require("oil").open_preview()
end, end,
}) })
--############ --############
@@ -61,11 +61,11 @@ vim.api.nvim_create_autocmd("User", {
-- telescope -- telescope
require("telescope").setup({ require("telescope").setup({
extensions = { extensions = {
["ui-select"] = { ["ui-select"] = {
require("telescope.themes").get_dropdown({}), require("telescope.themes").get_dropdown({}),
}, },
}, },
}) })
require("telescope").load_extension("ui-select") require("telescope").load_extension("ui-select")
@@ -80,96 +80,99 @@ require("lsnip")
require("colorizer").setup() require("colorizer").setup()
-- this is an autocomand to force colorizer to attach to some files -- this is an autocomand to force colorizer to attach to some files
vim.api.nvim_exec( vim.api.nvim_exec(
[[ [[
augroup ColorizerAttach augroup ColorizerAttach
autocmd! autocmd!
autocmd BufRead,BufNewFile *.config,*.rasi,*.conf,*.qss,*.css :ColorizerAttachToBuffer autocmd BufRead,BufNewFile *.config,*.rasi,*.conf,*.qss,*.css :ColorizerAttachToBuffer
augroup END augroup END
]], ]],
false false
) )
--'''''''''''''' Theme '''''''''''''''''''''''''''''''''''''''''''''''' --'''''''''''''' Theme ''''''''''''''''''''''''''''''''''''''''''''''''
local function force_backgraund(color) require("catppuccin").setup({
color = color or "catppuccin-mocha" integrations = {
vim.cmd.colorscheme(color) rainbow_delimiters = true,
},
})
vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) local function force_backgraund(color)
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) color = color or "catppuccin-mocha"
vim.cmd.colorscheme(color)
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
end end
force_backgraund() force_backgraund()
--"''''''''Neotree'''''''''''''''''''''''''''''''''''''''''''''''''''''''' --"''''''''Neotree''''''''''''''''''''''''''''''''''''''''''''''''''''''''
require("neo-tree").setup({ require("neo-tree").setup({
close_if_last_window = true, close_if_last_window = true,
filesystem = { filesystem = {
hijack_netrw_behavior = "disabled", hijack_netrw_behavior = "disabled",
}, filtered_items = { hide_gitignored = false },
window = { },
width = 25, window = {
}, width = 25,
},
}) })
--'''''''''''''nvim-ts-autotag''''''''''''''''''''''''''''''''''''''''' --'''''''''''''nvim-ts-autotag'''''''''''''''''''''''''''''''''''''''''
require("nvim-ts-autotag").setup({ require("nvim-ts-autotag").setup({
opts = { opts = {
enable_close = true, -- Auto close tags enable_close = true, -- Auto close tags
enable_rename = true, -- Auto rename pairs of tags enable_rename = true, -- Auto rename pairs of tags
enable_close_on_slash = false, -- Auto close on trailing </ enable_close_on_slash = false, -- Auto close on trailing </
}, },
}) })
--''''''''''''''''''''''''rainbow''''''''''''''''''''''''''''''''''''''' --''''''''''''''''''''''''rainbow'''''''''''''''''''''''''''''''''''''''
require("rainbow-delimiters.setup").setup({ require("rainbow-delimiters.setup").setup()
strategy = {},
query = {},
highlight = {},
})
--''''''''''Lualine'''''''''''''''''''''''''''''''''''''''''''''''''''' --''''''''''Lualine''''''''''''''''''''''''''''''''''''''''''''''''''''
require("lualine").setup({ require("lualine").setup({
options = { options = {
theme = "catppuccin-mocha", theme = "catppuccin-mocha",
icons_enabled = true, icons_enabled = true,
component_separators = { left = " ", right = " " }, component_separators = { left = " ", right = " " },
section_separators = { left = "|", right = "|" }, section_separators = { left = "|", right = "|" },
globalstatus = true, globalstatus = true,
}, },
sections = { sections = {
lualine_z = { lualine_z = {
function() function()
local line = vim.fn.line(".") local line = vim.fn.line(".")
local total = vim.fn.line("$") local total = vim.fn.line("$")
local percent = math.floor((line / total) * 100) local percent = math.floor((line / total) * 100)
return string.format("%3d%%%% %d☰", percent, total) return string.format("%3d%%%% %d☰", percent, total)
end, end,
}, },
}, },
}) })
--'''''''''Barbar''''''''''''''''''''''''''''''''''''''''''''''''''' --'''''''''Barbar'''''''''''''''''''''''''''''''''''''''''''''''''''
require("barbar").setup({ require("barbar").setup({
animation = false, animation = false,
auto_hide = 1, auto_hide = 1,
tabpages = false, tabpages = false,
clickable = true, clickable = true,
icons = { icons = {
buffer_index = true, buffer_index = true,
buffer_number = false, buffer_number = false,
diagnostics = { diagnostics = {
[vim.diagnostic.severity.ERROR] = { enabled = true, icon = "" }, [vim.diagnostic.severity.ERROR] = { enabled = true, icon = "" },
[vim.diagnostic.severity.WARN] = { enabled = true, icon = "" }, [vim.diagnostic.severity.WARN] = { enabled = true, icon = "" },
[vim.diagnostic.severity.INFO] = { enabled = false }, [vim.diagnostic.severity.INFO] = { enabled = false },
[vim.diagnostic.severity.HINT] = { enabled = false }, [vim.diagnostic.severity.HINT] = { enabled = false },
}, },
filetype = { filetype = {
enabled = true, enabled = true,
}, },
separator = { left = "▎", right = "" }, separator = { left = "▎", right = "" },
modified = { button = "●" }, modified = { button = "●" },
pinned = { button = "車", filename = true }, pinned = { button = "車", filename = true },
}, },
}) })
-- '''''''''''' highlight '''''''''''''''''''''''''''''''''''''''' -- '''''''''''' highlight ''''''''''''''''''''''''''''''''''''''''
@@ -177,55 +180,55 @@ require("local-highlight").setup({ animate = { enabled = false } })
--'''''''''''''''OIL''''''''''''''''''''''''''''''''''''''''''''''' --'''''''''''''''OIL'''''''''''''''''''''''''''''''''''''''''''''''
require("oil").setup({ require("oil").setup({
default_file_explorer = true, default_file_explorer = true,
keymaps = { keymaps = {
["?"] = { "actions.show_help", mode = "n" }, ["?"] = { "actions.show_help", mode = "n" },
["<CR>"] = "actions.select", ["<CR>"] = "actions.select",
["<C-s>"] = { "actions.select", opts = { vertical = true } }, ["<C-s>"] = { "actions.select", opts = { vertical = true } },
["<C-h>"] = { "actions.select", opts = { horizontal = true } }, ["<C-h>"] = { "actions.select", opts = { horizontal = true } },
["<C-t>"] = { "actions.select", opts = { tab = true } }, ["<C-t>"] = { "actions.select", opts = { tab = true } },
["-"] = { "actions.parent", mode = "n" }, ["-"] = { "actions.parent", mode = "n" },
["_"] = { "actions.open_cwd", mode = "n" }, ["_"] = { "actions.open_cwd", mode = "n" },
["gs"] = { "actions.change_sort", mode = "n" }, ["gs"] = { "actions.change_sort", mode = "n" },
["gx"] = "actions.open_external", ["gx"] = "actions.open_external",
["H"] = { "actions.toggle_hidden", mode = "n" }, ["H"] = { "actions.toggle_hidden", mode = "n" },
}, },
lsp_file_methods = { lsp_file_methods = {
enabled = true, enabled = true,
timeout_ms = 1000, timeout_ms = 1000,
autosave_changes = false, autosave_changes = false,
}, },
float = { float = {
preview_split = "right", preview_split = "right",
}, },
preview_win = { preview_win = {
update_on_cursor_moved = true, update_on_cursor_moved = true,
preview_method = "fast_scratch", preview_method = "fast_scratch",
}, },
}) })
-- ''''''''''''''autopairs''''''''''''''''''''''''''''''''''''''' -- ''''''''''''''autopairs'''''''''''''''''''''''''''''''''''''''
local npairs = require("nvim-autopairs") local npairs = require("nvim-autopairs")
npairs.setup({ npairs.setup({
check_ts = true, check_ts = true,
ts_config = { ts_config = {
lua = { "string" }, -- it will not add a pair on that treesitter node lua = { "string" }, -- it will not add a pair on that treesitter node
javascript = { "template_string" }, javascript = { "template_string" },
java = false, -- don't check treesitter on java java = false, -- don't check treesitter on java
}, },
fast_wrap = { fast_wrap = {
map = "<M-e>", map = "<M-e>",
chars = { "{", "[", "(", '"', "'" }, chars = { "{", "[", "(", '"', "'" },
pattern = [=[[%'%"%>%]%)%}%,]]=], pattern = [=[[%'%"%>%]%)%}%,]]=],
end_key = "$", end_key = "$",
before_key = "h", before_key = "h",
after_key = "l", after_key = "l",
cursor_pos_before = true, cursor_pos_before = true,
keys = "qwertyuiopzxcvbnmasdfghjkl", keys = "qwertyuiopzxcvbnmasdfghjkl",
manual_position = true, manual_position = true,
highlight = "Search", highlight = "Search",
highlight_grey = "Comment", highlight_grey = "Comment",
}, },
}) })
local cmp = require("cmp") local cmp = require("cmp")
desktop/nvim/lazy-lock.json
+10 -10
View File
@@ -1,6 +1,6 @@
{ {
"LuaSnip": { "branch": "master", "commit": "0abc8f390b278c3b4aabc4c004ac8a088b65cf24" }, "LuaSnip": { "branch": "master", "commit": "0abc8f390b278c3b4aabc4c004ac8a088b65cf24" },
"barbar.nvim": { "branch": "master", "commit": "a4bef5b4fc1f064f2f673172252028eae18191c9" }, "barbar.nvim": { "branch": "master", "commit": "337ecfadb8bf005050990bf2f624dc4fc828dabd" },
"buffer-vacuum": { "branch": "main", "commit": "917986d31cce6501c929ab6088c0887beff56b69" }, "buffer-vacuum": { "branch": "main", "commit": "917986d31cce6501c929ab6088c0887beff56b69" },
"catppuccin": { "branch": "main", "commit": "0303a7208dba448c459767486a38a6ec05c4216b" }, "catppuccin": { "branch": "main", "commit": "0303a7208dba448c459767486a38a6ec05c4216b" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
@@ -8,29 +8,29 @@
"cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
"go-tagger.nvim": { "branch": "master", "commit": "8fb11cdda459d2336c6312d9dfb2108f250b95e2" }, "go-tagger.nvim": { "branch": "master", "commit": "8fb11cdda459d2336c6312d9dfb2108f250b95e2" },
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"local-highlight.nvim": { "branch": "master", "commit": "dd8ae2ca26a5cfa17fb598864eacbe2df63938f3" }, "local-highlight.nvim": { "branch": "master", "commit": "dd8ae2ca26a5cfa17fb598864eacbe2df63938f3" },
"lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" }, "lsp_signature.nvim": { "branch": "master", "commit": "b7ace9ddb1640ce266012a45a672dfdaedfa5ec6" },
"lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7b01e2974a47d489bb92f47a41e4c0088ea8f86e" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "906c32c8a034dd3d51353d63226bf91aeacd927c" },
"mason.nvim": { "branch": "main", "commit": "bb639d4bf385a4d89f478b83af4d770be05ab7eb" }, "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" },
"none-ls-extras.nvim": { "branch": "main", "commit": "167f29529ff1438e673b1792a71aaf79ddd6c74f" }, "none-ls-extras.nvim": { "branch": "main", "commit": "27681d797a26f1b4d6119296df42f5204c88a2dc" },
"none-ls.nvim": { "branch": "main", "commit": "f9d557ac7cd28a3a993b5ea49716498bd540b01f" }, "none-ls.nvim": { "branch": "main", "commit": "01f8e62ea11603e59ad9ff7afcfa94fd183f76d6" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
"nvim-colorizer.lua": { "branch": "master", "commit": "5cfe7fffbd01e17b3c1e14af85d5febdef88bd8c" }, "nvim-colorizer.lua": { "branch": "master", "commit": "664c0b7cea1de71f8b65dfe951b7996fc3e6ccde" },
"nvim-lspconfig": { "branch": "master", "commit": "9573948c38bfabeec353ae7dd7d3ffec4c506a6b" }, "nvim-lspconfig": { "branch": "master", "commit": "ed19590a3a9792901553c388d1aadafce012f80d" },
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" }, "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" },
"nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },
"nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" }, "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" },
"oil.nvim": { "branch": "master", "commit": "b91ee5a77a6a9605d9c1aaf4fda74b66082c8297" }, "oil.nvim": { "branch": "master", "commit": "b73018b75affd13fa38e2fc94ef753b465f770d7" },
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "a798325b7f36acc62741d1029930a7b96d4dd4bf" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "a798325b7f36acc62741d1029930a7b96d4dd4bf" },
"ruffer": { "branch": "plugin", "commit": "5248604605bf1039147f3f29dcd46aa296557e9c" }, "ruffer": { "branch": "plugin", "commit": "5248604605bf1039147f3f29dcd46aa296557e9c" },
desktop/nvim/lua/coderun.lua
+48 -59
View File
@@ -2,78 +2,67 @@
-- Helper to easily set autocmds in Lua -- Helper to easily set autocmds in Lua
local function buf_map(mode, lhs, rhs, opts) local function buf_map(mode, lhs, rhs, opts)
opts = vim.tbl_extend('force', { noremap = true, silent = true, buffer = true }, opts or {}) opts = vim.tbl_extend("force", { noremap = true, silent = true, buffer = true }, opts or {})
vim.keymap.set(mode, lhs, rhs, opts) vim.keymap.set(mode, lhs, rhs, opts)
end end
-- Create all autocmds -- Create all autocmds
vim.api.nvim_create_autocmd('FileType', { vim.api.nvim_create_autocmd("FileType", {
pattern = 'python', pattern = "python",
callback = function() callback = function()
buf_map('n', '<F10>', ':w<CR>:!python3 %<CR>') buf_map("n", "<F10>", ":w<CR>:!python3 %<CR>")
buf_map('i', '<F10>', '<Esc>:w<CR>:!python3 %<CR>') buf_map("i", "<F10>", "<Esc>:w<CR>:!python3 %<CR>")
buf_map('n', '<F11>', ':w<CR>:FloatermNew --disposable --autoclose=0 python3 %<CR>') buf_map("n", "<F11>", ":w<CR>:FloatermNew --disposable --autoclose=0 python3 %<CR>")
end, end,
}) })
vim.api.nvim_create_autocmd('FileType', { vim.api.nvim_create_autocmd("FileType", {
pattern = 'javascript', pattern = "sh",
callback = function() callback = function()
buf_map('n', '<F10>', ':w<CR>:!node %<CR>') buf_map("n", "<F10>", ":w<CR>:!/bin/bash %<CR>")
buf_map('i', '<F10>', '<Esc>:w<CR>:!node %<CR>') buf_map("i", "<F10>", "<Esc>:w<CR>:!/bin/bash %<CR>")
buf_map('n', '<F11>', ':w<CR>:FloatermNew --disposable --autoclose=0 node %<CR>') end,
end,
}) })
vim.api.nvim_create_autocmd('FileType', { vim.api.nvim_create_autocmd("FileType", {
pattern = 'sh', pattern = "cpp",
callback = function() callback = function()
buf_map('n', '<F10>', ':w<CR>:!/bin/bash %<CR>') buf_map("n", "<F10>", ":!g++ -o %:p:r %<CR>:!%:p:r<CR>")
buf_map('i', '<F10>', '<Esc>:w<CR>:!/bin/bash %<CR>') buf_map("n", "<F9>", ":w<bar>:FloatermNew --autoclose=0 g++ -g -Wall % && ./a.out<CR>")
end, buf_map("n", "<F11>", ":w<bar>:FloatermNew --disposable --autoclose=0 g++ -o %:p:r %<bar>/%:p:r<CR>")
end,
}) })
vim.api.nvim_create_autocmd('FileType', { vim.api.nvim_create_autocmd("FileType", {
pattern = 'cpp', pattern = "lua",
callback = function() callback = function()
buf_map('n', '<F10>', ':!g++ -o %:p:r %<CR>:!%:p:r<CR>') buf_map("n", "<F10>", ":w<CR>:!lua %<CR>")
buf_map('n', '<F9>', ':w<bar>:FloatermNew --autoclose=0 g++ -g -Wall % && ./a.out<CR>') buf_map("n", "<F11>", ":w<bar>:FloatermNew --disposable --autoclose=0 lua %<CR>")
buf_map('n', '<F11>', ':w<bar>:FloatermNew --disposable --autoclose=0 g++ -o %:p:r %<bar>/%:p:r<CR>') end,
end,
}) })
vim.api.nvim_create_autocmd("FileType", {
vim.api.nvim_create_autocmd('FileType', { pattern = "typescript",
pattern = 'lua', callback = function()
callback = function() buf_map("n", "<F10>", ":w<CR>:!npx tsx %<CR>")
buf_map('n', '<F10>', ':w<CR>:!lua %<CR>') buf_map("n", "<F11>", ":w<CR>:FloatermNew --disposable --autoclose=0 npx tsx %<CR>")
buf_map('n', '<F11>', ':w<bar>:FloatermNew --disposable --autoclose=0 lua %<CR>') end,
end,
}) })
vim.api.nvim_create_autocmd("FileType", {
vim.api.nvim_create_autocmd('FileType', { pattern = "go",
pattern = 'typescript', callback = function()
callback = function() buf_map("n", "<F10>", ":w<CR>:!go run %<CR>")
buf_map('n', '<F10>', ':w<CR>:!npx tsx %<CR>') buf_map("i", "<F10>", "<Esc>:w<CR>:!go run %<CR>")
buf_map('n', '<F11>', ':w<CR>:FloatermNew --disposable --autoclose=0 npx tsx %<CR>') buf_map("n", "<F11>", ":w<CR>:FloatermNew --disposable --autoclose=0 go run %<CR>")
end, end,
}) })
vim.api.nvim_create_autocmd('FileType', { vim.api.nvim_create_autocmd("FileType", {
pattern = 'r', pattern = "zig",
callback = function() callback = function()
buf_map('n', '<F10>', ':w<CR>:!Rscript %<CR>') buf_map("n", "<F10>", ":w<CR>:!zig run %<CR>")
buf_map('i', '<F10>', '<Esc>:w<CR>:!Rscript %<CR>') buf_map("i", "<F10>", "<Esc>:w<CR>:!zig run %<CR>")
buf_map('n', '<F11>', ':w<CR>:FloatermNew --disposable --autoclose=0 Rscript %<CR>') buf_map("n", "<F11>", ":w<CR>:FloatermNew --disposable --autoclose=0 zig run %<CR>")
end, end,
})
vim.api.nvim_create_autocmd('FileType', {
pattern = 'go',
callback = function()
buf_map('n', '<F10>', ':w<CR>:!go run %<CR>')
buf_map('i', '<F10>', '<Esc>:w<CR>:!go run %<CR>')
buf_map('n', '<F11>', ':w<CR>:FloatermNew --disposable --autoclose=0 go run %<CR>')
end,
}) })
desktop/nvim/lua/lsnip.lua
+2 -2
View File
@@ -82,8 +82,8 @@ end
ls.add_snippets("go", { ls.add_snippets("go", {
s("iferr", { s("iferr", {
t("if err != nil {"), t("if err != nil {"),
t({ "", "\treturn " }), t({ "", "\tlog.Fatal(" }),
i(1, "err"), i(1, "err)"),
t({ "", "}" }), t({ "", "}" }),
}), }),
}) })
desktop/nvim/lua/lspConfig.lua
+29 -1
View File
@@ -46,6 +46,12 @@ local lsp_attach = function(client, bufnr)
bufmap("n", "<F1>", function() bufmap("n", "<F1>", function()
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr })) vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }))
end, "Toggle inlay hints") end, "Toggle inlay hints")
-- Turn inlay hints on automatically, but only for these filetypes
local inlay_hint_filetypes = { go = true, cpp = true }
if client:supports_method("textDocument/inlayHint") and inlay_hint_filetypes[vim.bo[bufnr].filetype] then
vim.lsp.inlay_hint.enable(true, { bufnr = bufnr })
end
end end
-- Mason-LSPconfig setup -- Mason-LSPconfig setup
@@ -58,8 +64,8 @@ local servers = {
"html", "html",
"stimulus_ls", "stimulus_ls",
"cssls", "cssls",
"gopls",
"yamlls", "yamlls",
"zls",
} }
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
@@ -75,6 +81,28 @@ for _, server in ipairs(servers) do
vim.lsp.enable(server) vim.lsp.enable(server)
end end
-- GOPLS
vim.lsp.config("gopls", {
capabilities = capabilities,
on_attach = lsp_attach,
settings = {
gopls = {
hints = {
parameterNames = true,
assignVariableTypes = true,
compositeLiteralFields = true, -- {/* in: */ "hello", /* want: */ "world"}
compositeLiteralTypes = true,
constantValues = true,
functionTypeParameters = true,
rangeVariableTypes = true,
},
},
},
})
vim.lsp.enable("gopls")
--- pyright
vim.lsp.config("pyright", { vim.lsp.config("pyright", {
capabilities = capabilities, capabilities = capabilities,
on_attach = lsp_attach, on_attach = lsp_attach,
desktop/nvim/lua/plugins.lua
+208 -192
View File
@@ -1,234 +1,250 @@
-- Bootstrap lazy.nvim -- Bootstrap lazy.nvim
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then if not (vim.uv or vim.loop).fs_stat(lazypath) then
local lazyrepo = "https://github.com/folke/lazy.nvim.git" local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({ vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" }, { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" }, { out, "WarningMsg" },
{ "\nPress any key to exit..." }, { "\nPress any key to exit..." },
}, true, {}) }, true, {})
vim.fn.getchar() vim.fn.getchar()
os.exit(1) os.exit(1)
end end
end end
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
local plugins = { local plugins = {
{ "neovim/nvim-lspconfig" }, { "neovim/nvim-lspconfig" },
-- mine -- mine
{ {
"acidburnmonkey/ruffer", "acidburnmonkey/ruffer",
config = function() config = function()
require("ruffer").setup() require("ruffer").setup()
end, end,
}, },
-- Terminal floating window -- Terminal floating window
{ "voldikss/vim-floaterm" }, { "voldikss/vim-floaterm" },
-- Indent guides -- Indent guides
{ {
"lukas-reineke/indent-blankline.nvim", "lukas-reineke/indent-blankline.nvim",
main = "ibl", main = "ibl",
event = "BufReadPre", event = "BufReadPre",
opts = {}, opts = {},
}, },
-- Color highlighting -- Color highlighting
{ "catgoose/nvim-colorizer.lua", event = "BufReadPre" }, { "catgoose/nvim-colorizer.lua", event = "BufReadPre" },
-- Undo tree viewer -- Undo tree viewer
{ "mbbill/undotree", cmd = "UndotreeToggle" }, { "mbbill/undotree", cmd = "UndotreeToggle" },
-- Devicons -- Devicons
{ "nvim-tree/nvim-web-devicons", opts = {} }, { "nvim-tree/nvim-web-devicons", opts = {} },
-- Neo-tree file explorer -- Neo-tree file explorer
{ {
"nvim-neo-tree/neo-tree.nvim", "nvim-neo-tree/neo-tree.nvim",
branch = "v3.x", branch = "v3.x",
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", "nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
}, },
lazy = true, lazy = true,
}, },
-- Telescope fuzzy finder -- Telescope fuzzy finder
{ {
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
dependencies = { "nvim-lua/plenary.nvim" }, dependencies = { "nvim-lua/plenary.nvim" },
}, },
-- Treesitter -- Treesitter
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
branch = "main", branch = "main",
lazy = false, lazy = false,
build = ":TSUpdate", build = ":TSUpdate",
}, },
{ "nvim-treesitter/nvim-treesitter-textobjects", branch = "main" }, { "nvim-treesitter/nvim-treesitter-textobjects", branch = "main" },
-- Mason package manager -- Mason package manager
{ {
"mason-org/mason.nvim", "mason-org/mason.nvim",
cmd = { "Mason", "MasonInstall", "MasonUpdate" }, cmd = { "Mason", "MasonInstall", "MasonUpdate" },
opts = {}, opts = {},
}, },
-- mason-lspconfig -- mason-lspconfig
{ {
"mason-org/mason-lspconfig.nvim", "mason-org/mason-lspconfig.nvim",
opts = {}, opts = {},
dependencies = { dependencies = {
{ "mason-org/mason.nvim", opts = {} }, { "mason-org/mason.nvim", opts = {} },
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
}, },
}, },
-- LuaSnip engine -- LuaSnip engine
{ {
"L3MON4D3/LuaSnip", "L3MON4D3/LuaSnip",
build = "make install_jsregexp", build = "make install_jsregexp",
}, },
-- LuaSnip snippets
{ "rafamadriz/friendly-snippets" },
-- Autopairs -- Autopairs
{ {
"windwp/nvim-autopairs", "windwp/nvim-autopairs",
event = "InsertEnter", event = "InsertEnter",
}, },
-- Commenting utility -- Commenting utility
{ "tpope/vim-commentary" }, { "tpope/vim-commentary" },
-- Catppuccin theme -- Catppuccin theme
{ "catppuccin/nvim", name = "catppuccin", priority = 1000 }, { "catppuccin/nvim", name = "catppuccin", priority = 1000 },
-- Surround plugin -- Surround plugin
{ "tpope/vim-surround" }, { "tpope/vim-surround" },
-- Formatter/Linter integration -- Formatter/Linter integration
{ {
"nvimtools/none-ls.nvim", "nvimtools/none-ls.nvim",
dependencies = { dependencies = {
"nvimtools/none-ls-extras.nvim", "nvimtools/none-ls-extras.nvim",
}, },
}, },
-- Treesitter auto-closing tags -- Treesitter auto-closing tags
{ "windwp/nvim-ts-autotag", ft = { "html", "jsx", "tsx", "svelte", "vue", "xml" } }, { "windwp/nvim-ts-autotag", ft = { "html", "jsx", "tsx", "svelte", "vue", "xml" } },
-- Signature marks -- Signature marks
{ "kshenoy/vim-signature" }, { "kshenoy/vim-signature" },
-- Oil file explorer -- Oil file explorer
{ {
"stevearc/oil.nvim", "stevearc/oil.nvim",
lazy = false, lazy = false,
}, },
-- Rainbow delimiters -- Rainbow delimiters
{ "HiPhish/rainbow-delimiters.nvim", event = "BufReadPost" }, { "HiPhish/rainbow-delimiters.nvim" },
-- Completion engine -- Completion engine
{ "hrsh7th/nvim-cmp" }, { "hrsh7th/nvim-cmp" },
{ "hrsh7th/cmp-buffer" }, { "hrsh7th/cmp-buffer" },
{ "hrsh7th/cmp-path" }, { "hrsh7th/cmp-path" },
{ "saadparwaiz1/cmp_luasnip" }, { "saadparwaiz1/cmp_luasnip" },
{ "hrsh7th/cmp-nvim-lsp" }, { "hrsh7th/cmp-nvim-lsp" },
{ "hrsh7th/cmp-nvim-lua" }, { "hrsh7th/cmp-nvim-lua" },
-- Lualine -- Lualine
{ "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" } }, { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" } },
-- barbar -- barbar
{ {
"romgrk/barbar.nvim", "romgrk/barbar.nvim",
dependencies = { dependencies = {
"nvim-tree/nvim-web-devicons", "nvim-tree/nvim-web-devicons",
}, },
init = function() init = function()
vim.g.barbar_auto_setup = false -- disable auto-setup vim.g.barbar_auto_setup = false -- disable auto-setup
end, end,
}, },
-- highlight -- highlight
{ {
"tzachar/local-highlight.nvim", "tzachar/local-highlight.nvim",
event = "BufReadPost", event = "BufReadPost",
}, },
-- buffer vacuum -- buffer vacuum
{ {
"ChuufMaster/buffer-vacuum", "ChuufMaster/buffer-vacuum",
opts = { opts = {
max_buffers = 2, max_buffers = 2,
count_pinned_buffers = false, count_pinned_buffers = false,
enable_messages = false, enable_messages = false,
}, },
}, },
-- telescope plugin -- telescope plugin
{ "nvim-telescope/telescope-ui-select.nvim" }, { "nvim-telescope/telescope-ui-select.nvim" },
-- harpoon -- harpoon
{ "ThePrimeagen/harpoon", lazy = false }, { "ThePrimeagen/harpoon", lazy = false },
--MarkdownPreview --MarkdownPreview
{ {
"iamcco/markdown-preview.nvim", "iamcco/markdown-preview.nvim",
cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
build = "cd app && npm install", build = "cd app && npm install",
init = function() init = function()
vim.g.mkdp_filetypes = { "markdown" } vim.g.mkdp_filetypes = { "markdown" }
end, end,
ft = { "markdown" }, ft = { "markdown" },
}, },
-- Dadbod -- Dadbod
{ {
"kristijanhusak/vim-dadbod-ui", "kristijanhusak/vim-dadbod-ui",
dependencies = { dependencies = {
{ "tpope/vim-dadbod", lazy = true }, { "tpope/vim-dadbod", lazy = true },
{ "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true },
}, },
cmd = { cmd = {
"DBUI", "DBUI",
"DBUIToggle", "DBUIToggle",
"DBUIAddConnection", "DBUIAddConnection",
"DBUIFindBuffer", "DBUIFindBuffer",
}, },
init = function() init = function()
vim.g.db_ui_use_nerd_fonts = 1 vim.g.db_ui_use_nerd_fonts = 1
end, end,
}, },
-- go-tagger -- go-tagger
{ {
"romus204/go-tagger.nvim", "romus204/go-tagger.nvim",
ft = { "go" }, ft = { "go" },
config = function() config = function()
require("go-tagger").setup({ require("go-tagger").setup({
skip_private = true, skip_private = true,
casing = "camelCase", casing = "camelCase",
tags = { tags = {
json = { json = {
casing = "camelCase", casing = "camelCase",
}, },
xml = { xml = {
casing = "snake_case", casing = "snake_case",
}, },
}, },
}) })
end, end,
}, },
-- lazy.nvim
{
"ray-x/lsp_signature.nvim",
event = "InsertEnter",
opts = {
bind = true,
handler_opts = { border = "rounded" },
doc_lines = 0, -- show only the signature, no documentation
hint_enable = false,
hint_prefix = "🐾 ",
floating_window = true,
auto_close_after = nil,
},
config = function(_, opts)
require("lsp_signature").setup(opts)
end,
},
} }
local opts = {} local opts = {}
desktop/systemd/user/default.target.wants/polkit-kde-authentication-agent.service
-1
View File
@@ -1 +0,0 @@
/home/mahalo/.config/systemd/user/polkit-kde-authentication-agent.service
desktop/systemd/user/polkit-kde-authentication-agent.service
-10
View File
@@ -1,10 +0,0 @@
[Unit]
Description=Polkit KDE Authentication Agent
[Service]
ExecStart=/usr/libexec/kf6/polkit-kde-authentication-agent-1
Restart=always
[Install]
WantedBy=default.target
mimeapps.list
+2
View File
@@ -40,6 +40,7 @@ x-scheme-handler/claude-cli=claude-code-url-handler.desktop
text/javascript=org.gnome.TextEditor.desktop text/javascript=org.gnome.TextEditor.desktop
text/css=org.gnome.TextEditor.desktop text/css=org.gnome.TextEditor.desktop
x-scheme-handler/jetbrains=jetbrainsd.desktop x-scheme-handler/jetbrains=jetbrainsd.desktop
audio/x-mod=org.gnome.TextEditor.desktop
[Added Associations] [Added Associations]
x-scheme-handler/terminal=org.wezfurlong.wezterm.desktop; x-scheme-handler/terminal=org.wezfurlong.wezterm.desktop;
@@ -70,3 +71,4 @@ text/x-c++src=org.gnome.TextEditor.desktop;
application/x-bat=org.gnome.TextEditor.desktop; application/x-bat=org.gnome.TextEditor.desktop;
text/javascript=org.gnome.TextEditor.desktop; text/javascript=org.gnome.TextEditor.desktop;
text/css=org.gnome.TextEditor.desktop; text/css=org.gnome.TextEditor.desktop;
audio/x-mod=org.gnome.TextEditor.desktop;