diff --git a/desktop/hypr/hyprpaper.conf b/desktop/hypr/hyprpaper.conf index b3ae809..2e3cf7f 100644 --- a/desktop/hypr/hyprpaper.conf +++ b/desktop/hypr/hyprpaper.conf @@ -8,7 +8,7 @@ wallpaper { wallpaper { monitor = DP-2 - path = /home/mahalo/photos/wallhaven-8ggqqj.jpg + path = /home/mahalo/photos/wallhaven-gw2gyq.png fit_mode = cover } diff --git a/desktop/hypr/mods/windows.lua b/desktop/hypr/mods/windows.lua index 63d5f75..6d2c5f5 100644 --- a/desktop/hypr/mods/windows.lua +++ b/desktop/hypr/mods/windows.lua @@ -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-nemo", match = { class = "^(nemo)$" }, workspace = 3 }) 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-rstudio", match = { title = "^(RStudio)$" }, workspace = 4 }) hl.window_rule({ name = "ws-obsidian", match = { class = "^(obsidian)$" }, workspace = 5 }) diff --git a/desktop/nvim/init.lua b/desktop/nvim/init.lua index 031e209..e9acbd2 100644 --- a/desktop/nvim/init.lua +++ b/desktop/nvim/init.lua @@ -21,38 +21,38 @@ require("cmpConf") -- remove_trailing_whitespace on save vim.api.nvim_create_autocmd("BufWritePre", { - pattern = "*", - callback = function() - require("functions").remove_trailing_whitespace() - end, + pattern = "*", + callback = function() + require("functions").remove_trailing_whitespace() + end, }) -- treat qss as css vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, { - pattern = "*.qss", - command = "set filetype=css", + pattern = "*.qss", + command = "set filetype=css", }) -- set spelling on these files vim.api.nvim_create_autocmd("FileType", { - pattern = { "markdown", "text" }, - callback = function() - vim.opt_local.spell = true - end, + pattern = { "markdown", "text" }, + callback = function() + vim.opt_local.spell = true + end, }) vim.api.nvim_create_autocmd("TextYankPost", { - callback = function() - vim.highlight.on_yank() - end, + callback = function() + vim.highlight.on_yank() + end, }) -- Auto-open the preview window whenever Oil finishes rendering vim.api.nvim_create_autocmd("User", { - pattern = "OilEnter", - callback = function() - require("oil").open_preview() - end, + pattern = "OilEnter", + callback = function() + require("oil").open_preview() + end, }) --############ @@ -61,11 +61,11 @@ vim.api.nvim_create_autocmd("User", { -- telescope require("telescope").setup({ - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown({}), - }, - }, + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, }) require("telescope").load_extension("ui-select") @@ -80,96 +80,99 @@ require("lsnip") require("colorizer").setup() -- this is an autocomand to force colorizer to attach to some files vim.api.nvim_exec( - [[ + [[ augroup ColorizerAttach autocmd! autocmd BufRead,BufNewFile *.config,*.rasi,*.conf,*.qss,*.css :ColorizerAttachToBuffer augroup END ]], - false + false ) --'''''''''''''' Theme '''''''''''''''''''''''''''''''''''''''''''''''' -local function force_backgraund(color) - color = color or "catppuccin-mocha" - vim.cmd.colorscheme(color) +require("catppuccin").setup({ + integrations = { + rainbow_delimiters = true, + }, +}) - vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) +local function force_backgraund(color) + 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 force_backgraund() --"''''''''Neotree'''''''''''''''''''''''''''''''''''''''''''''''''''''''' require("neo-tree").setup({ - close_if_last_window = true, - filesystem = { - hijack_netrw_behavior = "disabled", - }, - window = { - width = 25, - }, + close_if_last_window = true, + filesystem = { + hijack_netrw_behavior = "disabled", + filtered_items = { hide_gitignored = false }, + }, + window = { + width = 25, + }, }) --'''''''''''''nvim-ts-autotag''''''''''''''''''''''''''''''''''''''''' require("nvim-ts-autotag").setup({ - opts = { - enable_close = true, -- Auto close tags - enable_rename = true, -- Auto rename pairs of tags - enable_close_on_slash = false, -- Auto close on trailing "] = "actions.select", - [""] = { "actions.select", opts = { vertical = true } }, - [""] = { "actions.select", opts = { horizontal = true } }, - [""] = { "actions.select", opts = { tab = true } }, - ["-"] = { "actions.parent", mode = "n" }, - ["_"] = { "actions.open_cwd", mode = "n" }, - ["gs"] = { "actions.change_sort", mode = "n" }, - ["gx"] = "actions.open_external", - ["H"] = { "actions.toggle_hidden", mode = "n" }, - }, - lsp_file_methods = { - enabled = true, - timeout_ms = 1000, - autosave_changes = false, - }, - float = { - preview_split = "right", - }, - preview_win = { - update_on_cursor_moved = true, - preview_method = "fast_scratch", - }, + default_file_explorer = true, + keymaps = { + ["?"] = { "actions.show_help", mode = "n" }, + [""] = "actions.select", + [""] = { "actions.select", opts = { vertical = true } }, + [""] = { "actions.select", opts = { horizontal = true } }, + [""] = { "actions.select", opts = { tab = true } }, + ["-"] = { "actions.parent", mode = "n" }, + ["_"] = { "actions.open_cwd", mode = "n" }, + ["gs"] = { "actions.change_sort", mode = "n" }, + ["gx"] = "actions.open_external", + ["H"] = { "actions.toggle_hidden", mode = "n" }, + }, + lsp_file_methods = { + enabled = true, + timeout_ms = 1000, + autosave_changes = false, + }, + float = { + preview_split = "right", + }, + preview_win = { + update_on_cursor_moved = true, + preview_method = "fast_scratch", + }, }) -- ''''''''''''''autopairs''''''''''''''''''''''''''''''''''''''' local npairs = require("nvim-autopairs") npairs.setup({ - check_ts = true, - ts_config = { - lua = { "string" }, -- it will not add a pair on that treesitter node - javascript = { "template_string" }, - java = false, -- don't check treesitter on java - }, - fast_wrap = { - map = "", - chars = { "{", "[", "(", '"', "'" }, - pattern = [=[[%'%"%>%]%)%}%,]]=], - end_key = "$", - before_key = "h", - after_key = "l", - cursor_pos_before = true, - keys = "qwertyuiopzxcvbnmasdfghjkl", - manual_position = true, - highlight = "Search", - highlight_grey = "Comment", - }, + check_ts = true, + ts_config = { + lua = { "string" }, -- it will not add a pair on that treesitter node + javascript = { "template_string" }, + java = false, -- don't check treesitter on java + }, + fast_wrap = { + map = "", + chars = { "{", "[", "(", '"', "'" }, + pattern = [=[[%'%"%>%]%)%}%,]]=], + end_key = "$", + before_key = "h", + after_key = "l", + cursor_pos_before = true, + keys = "qwertyuiopzxcvbnmasdfghjkl", + manual_position = true, + highlight = "Search", + highlight_grey = "Comment", + }, }) local cmp = require("cmp") diff --git a/desktop/nvim/lazy-lock.json b/desktop/nvim/lazy-lock.json index 063e656..94f9dc8 100644 --- a/desktop/nvim/lazy-lock.json +++ b/desktop/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "0abc8f390b278c3b4aabc4c004ac8a088b65cf24" }, - "barbar.nvim": { "branch": "master", "commit": "a4bef5b4fc1f064f2f673172252028eae18191c9" }, + "barbar.nvim": { "branch": "master", "commit": "337ecfadb8bf005050990bf2f624dc4fc828dabd" }, "buffer-vacuum": { "branch": "main", "commit": "917986d31cce6501c929ab6088c0887beff56b69" }, "catppuccin": { "branch": "main", "commit": "0303a7208dba448c459767486a38a6ec05c4216b" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, @@ -8,29 +8,29 @@ "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "go-tagger.nvim": { "branch": "master", "commit": "8fb11cdda459d2336c6312d9dfb2108f250b95e2" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "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" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7b01e2974a47d489bb92f47a41e4c0088ea8f86e" }, - "mason.nvim": { "branch": "main", "commit": "bb639d4bf385a4d89f478b83af4d770be05ab7eb" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "906c32c8a034dd3d51353d63226bf91aeacd927c" }, + "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" }, - "none-ls-extras.nvim": { "branch": "main", "commit": "167f29529ff1438e673b1792a71aaf79ddd6c74f" }, - "none-ls.nvim": { "branch": "main", "commit": "f9d557ac7cd28a3a993b5ea49716498bd540b01f" }, + "none-ls-extras.nvim": { "branch": "main", "commit": "27681d797a26f1b4d6119296df42f5204c88a2dc" }, + "none-ls.nvim": { "branch": "main", "commit": "01f8e62ea11603e59ad9ff7afcfa94fd183f76d6" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "5cfe7fffbd01e17b3c1e14af85d5febdef88bd8c" }, - "nvim-lspconfig": { "branch": "master", "commit": "9573948c38bfabeec353ae7dd7d3ffec4c506a6b" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "664c0b7cea1de71f8b65dfe951b7996fc3e6ccde" }, + "nvim-lspconfig": { "branch": "master", "commit": "ed19590a3a9792901553c388d1aadafce012f80d" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" }, "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, "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" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "a798325b7f36acc62741d1029930a7b96d4dd4bf" }, "ruffer": { "branch": "plugin", "commit": "5248604605bf1039147f3f29dcd46aa296557e9c" }, diff --git a/desktop/nvim/lua/coderun.lua b/desktop/nvim/lua/coderun.lua index e58f7d7..14a5fbd 100644 --- a/desktop/nvim/lua/coderun.lua +++ b/desktop/nvim/lua/coderun.lua @@ -2,78 +2,67 @@ -- Helper to easily set autocmds in Lua local function buf_map(mode, lhs, rhs, opts) - opts = vim.tbl_extend('force', { noremap = true, silent = true, buffer = true }, opts or {}) - vim.keymap.set(mode, lhs, rhs, opts) + opts = vim.tbl_extend("force", { noremap = true, silent = true, buffer = true }, opts or {}) + vim.keymap.set(mode, lhs, rhs, opts) end -- Create all autocmds -vim.api.nvim_create_autocmd('FileType', { - pattern = 'python', - callback = function() - buf_map('n', '', ':w:!python3 %') - buf_map('i', '', ':w:!python3 %') - buf_map('n', '', ':w:FloatermNew --disposable --autoclose=0 python3 %') - end, +vim.api.nvim_create_autocmd("FileType", { + pattern = "python", + callback = function() + buf_map("n", "", ":w:!python3 %") + buf_map("i", "", ":w:!python3 %") + buf_map("n", "", ":w:FloatermNew --disposable --autoclose=0 python3 %") + end, }) -vim.api.nvim_create_autocmd('FileType', { - pattern = 'javascript', - callback = function() - buf_map('n', '', ':w:!node %') - buf_map('i', '', ':w:!node %') - buf_map('n', '', ':w:FloatermNew --disposable --autoclose=0 node %') - end, +vim.api.nvim_create_autocmd("FileType", { + pattern = "sh", + callback = function() + buf_map("n", "", ":w:!/bin/bash %") + buf_map("i", "", ":w:!/bin/bash %") + end, }) -vim.api.nvim_create_autocmd('FileType', { - pattern = 'sh', - callback = function() - buf_map('n', '', ':w:!/bin/bash %') - buf_map('i', '', ':w:!/bin/bash %') - end, +vim.api.nvim_create_autocmd("FileType", { + pattern = "cpp", + callback = function() + buf_map("n", "", ":!g++ -o %:p:r %:!%:p:r") + buf_map("n", "", ":w:FloatermNew --autoclose=0 g++ -g -Wall % && ./a.out") + buf_map("n", "", ":w:FloatermNew --disposable --autoclose=0 g++ -o %:p:r %/%:p:r") + end, }) -vim.api.nvim_create_autocmd('FileType', { - pattern = 'cpp', - callback = function() - buf_map('n', '', ':!g++ -o %:p:r %:!%:p:r') - buf_map('n', '', ':w:FloatermNew --autoclose=0 g++ -g -Wall % && ./a.out') - buf_map('n', '', ':w:FloatermNew --disposable --autoclose=0 g++ -o %:p:r %/%:p:r') - end, +vim.api.nvim_create_autocmd("FileType", { + pattern = "lua", + callback = function() + buf_map("n", "", ":w:!lua %") + buf_map("n", "", ":w:FloatermNew --disposable --autoclose=0 lua %") + end, }) - -vim.api.nvim_create_autocmd('FileType', { - pattern = 'lua', - callback = function() - buf_map('n', '', ':w:!lua %') - buf_map('n', '', ':w:FloatermNew --disposable --autoclose=0 lua %') - end, +vim.api.nvim_create_autocmd("FileType", { + pattern = "typescript", + callback = function() + buf_map("n", "", ":w:!npx tsx %") + buf_map("n", "", ":w:FloatermNew --disposable --autoclose=0 npx tsx %") + end, }) - -vim.api.nvim_create_autocmd('FileType', { - pattern = 'typescript', - callback = function() - buf_map('n', '', ':w:!npx tsx %') - buf_map('n', '', ':w:FloatermNew --disposable --autoclose=0 npx tsx %') - end, +vim.api.nvim_create_autocmd("FileType", { + pattern = "go", + callback = function() + buf_map("n", "", ":w:!go run %") + buf_map("i", "", ":w:!go run %") + buf_map("n", "", ":w:FloatermNew --disposable --autoclose=0 go run %") + end, }) -vim.api.nvim_create_autocmd('FileType', { - pattern = 'r', - callback = function() - buf_map('n', '', ':w:!Rscript %') - buf_map('i', '', ':w:!Rscript %') - buf_map('n', '', ':w:FloatermNew --disposable --autoclose=0 Rscript %') - end, -}) - -vim.api.nvim_create_autocmd('FileType', { - pattern = 'go', - callback = function() - buf_map('n', '', ':w:!go run %') - buf_map('i', '', ':w:!go run %') - buf_map('n', '', ':w:FloatermNew --disposable --autoclose=0 go run %') - end, +vim.api.nvim_create_autocmd("FileType", { + pattern = "zig", + callback = function() + buf_map("n", "", ":w:!zig run %") + buf_map("i", "", ":w:!zig run %") + buf_map("n", "", ":w:FloatermNew --disposable --autoclose=0 zig run %") + end, }) diff --git a/desktop/nvim/lua/lsnip.lua b/desktop/nvim/lua/lsnip.lua index 9e5bf72..33cce0c 100644 --- a/desktop/nvim/lua/lsnip.lua +++ b/desktop/nvim/lua/lsnip.lua @@ -82,8 +82,8 @@ end ls.add_snippets("go", { s("iferr", { t("if err != nil {"), - t({ "", "\treturn " }), - i(1, "err"), + t({ "", "\tlog.Fatal(" }), + i(1, "err)"), t({ "", "}" }), }), }) diff --git a/desktop/nvim/lua/lspConfig.lua b/desktop/nvim/lua/lspConfig.lua index 698e6cd..b7e06da 100644 --- a/desktop/nvim/lua/lspConfig.lua +++ b/desktop/nvim/lua/lspConfig.lua @@ -46,6 +46,12 @@ local lsp_attach = function(client, bufnr) bufmap("n", "", function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr })) 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 -- Mason-LSPconfig setup @@ -58,8 +64,8 @@ local servers = { "html", "stimulus_ls", "cssls", - "gopls", "yamlls", + "zls", } require("mason-lspconfig").setup({ @@ -75,6 +81,28 @@ for _, server in ipairs(servers) do vim.lsp.enable(server) 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", { capabilities = capabilities, on_attach = lsp_attach, diff --git a/desktop/nvim/lua/plugins.lua b/desktop/nvim/lua/plugins.lua index 86b42dc..9dd4f2a 100644 --- a/desktop/nvim/lua/plugins.lua +++ b/desktop/nvim/lua/plugins.lua @@ -1,234 +1,250 @@ -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end end vim.opt.rtp:prepend(lazypath) local plugins = { - { "neovim/nvim-lspconfig" }, + { "neovim/nvim-lspconfig" }, - -- mine - { - "acidburnmonkey/ruffer", - config = function() - require("ruffer").setup() - end, - }, + -- mine + { + "acidburnmonkey/ruffer", + config = function() + require("ruffer").setup() + end, + }, - -- Terminal floating window - { "voldikss/vim-floaterm" }, + -- Terminal floating window + { "voldikss/vim-floaterm" }, - -- Indent guides - { - "lukas-reineke/indent-blankline.nvim", - main = "ibl", - event = "BufReadPre", - opts = {}, - }, + -- Indent guides + { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + event = "BufReadPre", + opts = {}, + }, - -- Color highlighting - { "catgoose/nvim-colorizer.lua", event = "BufReadPre" }, + -- Color highlighting + { "catgoose/nvim-colorizer.lua", event = "BufReadPre" }, - -- Undo tree viewer - { "mbbill/undotree", cmd = "UndotreeToggle" }, + -- Undo tree viewer + { "mbbill/undotree", cmd = "UndotreeToggle" }, - -- Devicons - { "nvim-tree/nvim-web-devicons", opts = {} }, + -- Devicons + { "nvim-tree/nvim-web-devicons", opts = {} }, - -- Neo-tree file explorer - { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - lazy = true, - }, + -- Neo-tree file explorer + { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + lazy = true, + }, - -- Telescope fuzzy finder - { - "nvim-telescope/telescope.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - }, + -- Telescope fuzzy finder + { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + }, - -- Treesitter - { - "nvim-treesitter/nvim-treesitter", - branch = "main", - lazy = false, - build = ":TSUpdate", - }, - { "nvim-treesitter/nvim-treesitter-textobjects", branch = "main" }, + -- Treesitter + { + "nvim-treesitter/nvim-treesitter", + branch = "main", + lazy = false, + build = ":TSUpdate", + }, + { "nvim-treesitter/nvim-treesitter-textobjects", branch = "main" }, - -- Mason package manager - { - "mason-org/mason.nvim", - cmd = { "Mason", "MasonInstall", "MasonUpdate" }, - opts = {}, - }, + -- Mason package manager + { + "mason-org/mason.nvim", + cmd = { "Mason", "MasonInstall", "MasonUpdate" }, + opts = {}, + }, - -- mason-lspconfig - { - "mason-org/mason-lspconfig.nvim", - opts = {}, - dependencies = { - { "mason-org/mason.nvim", opts = {} }, - "neovim/nvim-lspconfig", - }, - }, + -- mason-lspconfig + { + "mason-org/mason-lspconfig.nvim", + opts = {}, + dependencies = { + { "mason-org/mason.nvim", opts = {} }, + "neovim/nvim-lspconfig", + }, + }, - -- LuaSnip engine - { - "L3MON4D3/LuaSnip", - build = "make install_jsregexp", - }, - -- LuaSnip snippets - { "rafamadriz/friendly-snippets" }, + -- LuaSnip engine + { + "L3MON4D3/LuaSnip", + build = "make install_jsregexp", + }, - -- Autopairs - { - "windwp/nvim-autopairs", - event = "InsertEnter", - }, + -- Autopairs + { + "windwp/nvim-autopairs", + event = "InsertEnter", + }, - -- Commenting utility - { "tpope/vim-commentary" }, + -- Commenting utility + { "tpope/vim-commentary" }, - -- Catppuccin theme - { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, + -- Catppuccin theme + { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, - -- Surround plugin - { "tpope/vim-surround" }, + -- Surround plugin + { "tpope/vim-surround" }, - -- Formatter/Linter integration - { - "nvimtools/none-ls.nvim", - dependencies = { - "nvimtools/none-ls-extras.nvim", - }, - }, + -- Formatter/Linter integration + { + "nvimtools/none-ls.nvim", + dependencies = { + "nvimtools/none-ls-extras.nvim", + }, + }, - -- Treesitter auto-closing tags - { "windwp/nvim-ts-autotag", ft = { "html", "jsx", "tsx", "svelte", "vue", "xml" } }, + -- Treesitter auto-closing tags + { "windwp/nvim-ts-autotag", ft = { "html", "jsx", "tsx", "svelte", "vue", "xml" } }, - -- Signature marks - { "kshenoy/vim-signature" }, + -- Signature marks + { "kshenoy/vim-signature" }, - -- Oil file explorer - { - "stevearc/oil.nvim", - lazy = false, - }, + -- Oil file explorer + { + "stevearc/oil.nvim", + lazy = false, + }, - -- Rainbow delimiters - { "HiPhish/rainbow-delimiters.nvim", event = "BufReadPost" }, + -- Rainbow delimiters + { "HiPhish/rainbow-delimiters.nvim" }, - -- Completion engine - { "hrsh7th/nvim-cmp" }, - { "hrsh7th/cmp-buffer" }, - { "hrsh7th/cmp-path" }, - { "saadparwaiz1/cmp_luasnip" }, - { "hrsh7th/cmp-nvim-lsp" }, - { "hrsh7th/cmp-nvim-lua" }, + -- Completion engine + { "hrsh7th/nvim-cmp" }, + { "hrsh7th/cmp-buffer" }, + { "hrsh7th/cmp-path" }, + { "saadparwaiz1/cmp_luasnip" }, + { "hrsh7th/cmp-nvim-lsp" }, + { "hrsh7th/cmp-nvim-lua" }, - -- Lualine - { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" } }, + -- Lualine + { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" } }, - -- barbar - { - "romgrk/barbar.nvim", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - init = function() - vim.g.barbar_auto_setup = false -- disable auto-setup - end, - }, + -- barbar + { + "romgrk/barbar.nvim", + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + init = function() + vim.g.barbar_auto_setup = false -- disable auto-setup + end, + }, - -- highlight - { - "tzachar/local-highlight.nvim", - event = "BufReadPost", - }, + -- highlight + { + "tzachar/local-highlight.nvim", + event = "BufReadPost", + }, - -- buffer vacuum - { - "ChuufMaster/buffer-vacuum", - opts = { - max_buffers = 2, - count_pinned_buffers = false, - enable_messages = false, - }, - }, + -- buffer vacuum + { + "ChuufMaster/buffer-vacuum", + opts = { + max_buffers = 2, + count_pinned_buffers = false, + enable_messages = false, + }, + }, - -- telescope plugin - { "nvim-telescope/telescope-ui-select.nvim" }, + -- telescope plugin + { "nvim-telescope/telescope-ui-select.nvim" }, - -- harpoon - { "ThePrimeagen/harpoon", lazy = false }, + -- harpoon + { "ThePrimeagen/harpoon", lazy = false }, - --MarkdownPreview - { - "iamcco/markdown-preview.nvim", - cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, - build = "cd app && npm install", - init = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, - }, + --MarkdownPreview + { + "iamcco/markdown-preview.nvim", + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + build = "cd app && npm install", + init = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, + }, - -- Dadbod - { - "kristijanhusak/vim-dadbod-ui", - dependencies = { - { "tpope/vim-dadbod", lazy = true }, - { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, - }, - cmd = { - "DBUI", - "DBUIToggle", - "DBUIAddConnection", - "DBUIFindBuffer", - }, - init = function() - vim.g.db_ui_use_nerd_fonts = 1 - end, - }, + -- Dadbod + { + "kristijanhusak/vim-dadbod-ui", + dependencies = { + { "tpope/vim-dadbod", lazy = true }, + { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, + }, + cmd = { + "DBUI", + "DBUIToggle", + "DBUIAddConnection", + "DBUIFindBuffer", + }, + init = function() + vim.g.db_ui_use_nerd_fonts = 1 + end, + }, - -- go-tagger - { - "romus204/go-tagger.nvim", - ft = { "go" }, - config = function() - require("go-tagger").setup({ - skip_private = true, - casing = "camelCase", - tags = { - json = { - casing = "camelCase", - }, - xml = { - casing = "snake_case", - }, - }, - }) - end, - }, + -- go-tagger + { + "romus204/go-tagger.nvim", + ft = { "go" }, + config = function() + require("go-tagger").setup({ + skip_private = true, + casing = "camelCase", + tags = { + json = { + casing = "camelCase", + }, + xml = { + casing = "snake_case", + }, + }, + }) + 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 = {} diff --git a/desktop/systemd/user/default.target.wants/polkit-kde-authentication-agent.service b/desktop/systemd/user/default.target.wants/polkit-kde-authentication-agent.service deleted file mode 120000 index 4f6648e..0000000 --- a/desktop/systemd/user/default.target.wants/polkit-kde-authentication-agent.service +++ /dev/null @@ -1 +0,0 @@ -/home/mahalo/.config/systemd/user/polkit-kde-authentication-agent.service \ No newline at end of file diff --git a/desktop/systemd/user/polkit-kde-authentication-agent.service b/desktop/systemd/user/polkit-kde-authentication-agent.service deleted file mode 100644 index 530ee29..0000000 --- a/desktop/systemd/user/polkit-kde-authentication-agent.service +++ /dev/null @@ -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 - diff --git a/mimeapps.list b/mimeapps.list index a257ebc..379a612 100644 --- a/mimeapps.list +++ b/mimeapps.list @@ -40,6 +40,7 @@ x-scheme-handler/claude-cli=claude-code-url-handler.desktop text/javascript=org.gnome.TextEditor.desktop text/css=org.gnome.TextEditor.desktop x-scheme-handler/jetbrains=jetbrainsd.desktop +audio/x-mod=org.gnome.TextEditor.desktop [Added Associations] 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; text/javascript=org.gnome.TextEditor.desktop; text/css=org.gnome.TextEditor.desktop; +audio/x-mod=org.gnome.TextEditor.desktop;