diff --git a/copyq/copyq.conf b/copyq/copyq.conf index 6ae5aec..40d0c85 100644 --- a/copyq/copyq.conf +++ b/copyq/copyq.conf @@ -4,7 +4,7 @@ plugin_priority=itemimage, itemencrypted, itemfakevim, itemnotes, itempinned, it [Options] activate_closes=true activate_focuses=true -activate_item_with_single_click=false +activate_item_with_single_click=true activate_pastes=true always_on_top=false autocompletion=true diff --git a/gtk-4.0/servers b/gtk-4.0/servers index c6d9e92..1205346 100644 --- a/gtk-4.0/servers +++ b/gtk-4.0/servers @@ -3,12 +3,12 @@ xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info" > - + Windows shares on 192.168.1.4 - + diff --git a/hypr_desktop/conf/keybinds.conf b/hypr_desktop/conf/keybinds.conf index 6e1d999..5a1ce26 100644 --- a/hypr_desktop/conf/keybinds.conf +++ b/hypr_desktop/conf/keybinds.conf @@ -1,7 +1,7 @@ # binds bind=SUPER,S,exec,grim -g "$(slurp)" - | wl-copy bind=SUPERSHIFTALT,S,exec, grim -g "$(slurp)" $HOME/gits/ost-5semester/Screenshots/$(date +'%Y_%m_%d_%I_%M_%S.png') && (date +'%Y_%m_%d_%I_%M_%S.png') | wl-copy -bind=SUPERSHIFT,S,exec,grim -g "$(slurp)" - | swappy -f - +bind=SUPERSHIFT,S,exec,grim -g "$(slurp)" - | satty -f - bind=SUPERCONTROLSHIFT,S,exec,grim -c -g "0,0 3440x1440" - | wl-copy bind=SUPER,F,exec,firefox bind=SUPER,T,exec,kitty -1 diff --git a/hypr_desktop/conf/rules.conf b/hypr_desktop/conf/rules.conf index 4c6af1d..9e41b8f 100644 --- a/hypr_desktop/conf/rules.conf +++ b/hypr_desktop/conf/rules.conf @@ -8,6 +8,7 @@ windowrule=float,^(.*)(copyq)(.*)$ # windowrule=size 1200 800,^(org.gnome.NautilusPreviewer)$ windowrule=center,^(.*)(swappy)(.*)$ windowrule=float,title:^(.*)(Spirit)(.*)$ +windowrule=float,title:^(.*)(reset)(.*)$ windowrule=workspace 10 silent,^(.*)(steam)(.*)$ windowrule=workspace 9 silent,^(.*)(dota)(.*)$ windowrule=workspace 9 silent,^(.*)(battlebits)(.*)$ diff --git a/nvim/ftplugin/java.lua b/nvim/ftplugin/java.lua deleted file mode 100644 index a94c6af..0000000 --- a/nvim/ftplugin/java.lua +++ /dev/null @@ -1,46 +0,0 @@ -local jdtls = require("jdtls") - -jdtls.start_or_attach({ - cmd = { "jdtls" }, - root_dir = vim.fs.dirname(vim.fs.find({ "settings.gradle", ".git", "pom.xml" }, { upward = true })[1]), - init_options = { - bundles = vim.list_extend( - { - -- Mason: java-debug-adapter - -- stylua: ignore - vim.fn.glob( "~/.local/share/nvim/mason/packages/java-debug-adapter/extension/server/com.microsoft.java.debug.plugin-*.jar", 1), - }, - -- Mason: java-test - -- stylua: ignore - vim.split(vim.fn.glob("~/.local/share/nvim/mason/packages/java-test/extension/server/*.jar", 1), "\n") - ), - }, - on_attach = function() - jdtls.setup_dap() -- Create new dap adapter for java - - -- nvim-jdtls specific mappings - vim.keymap.set("n", "", jdtls.organize_imports, {}) - vim.keymap.set("n", "crv", jdtls.extract_variable, {}) - vim.keymap.set("v", "crv", jdtls.extract_variable, {}) - vim.keymap.set("n", "crc", jdtls.extract_constant, {}) - vim.keymap.set("v", "crc", jdtls.extract_constant, {}) - vim.keymap.set("v", "crm", jdtls.extract_method, {}) - - vim.keymap.set("n", "df", jdtls.test_class, {}) - vim.keymap.set("n", "dn", jdtls.test_nearest_method, {}) - end, -}) - -local dap_status, dap = pcall(require, "dap") -if not dap_status then - return -end - -dap.configurations.java = { - { - name = "Launch current file", - type = "java", - request = "launch", - program = "${file}", - }, -} diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 420389a..bfe2724 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,31 +1,36 @@ { "LazyVim": { "branch": "main", "commit": "68ff818a5bb7549f90b05e412b76fe448f605ffb" }, - "LuaSnip": { "branch": "master", "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" }, + "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" }, + "SchemaStore.nvim": { "branch": "main", "commit": "9fb873af43568464f9a1936fc334dfa3d7a59418" }, "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" }, "bufferline.nvim": { "branch": "main", "commit": "9e8d2f695dd50ab6821a6a53a840c32d2067a78a" }, - "catppuccin": { "branch": "main", "commit": "d7521f6050b94cb0e23067f63829d86886f870fe" }, + "catppuccin": { "branch": "main", "commit": "a8dfb969e76d1a0752d98b5347be9ffb9bca9592" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "34c8eaa12be192e83cd4865ce2375e9f53e728f2" }, + "cmake-tools.nvim": { "branch": "master", "commit": "4b965b5785776b6d258d57ce8fb7efa1a8170a7b" }, "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "161d95bfbb1ad1a2b89ba2ea75ca1b5e012a111e" }, - "crates.nvim": { "branch": "main", "commit": "aac57ef84cf4fecf7907114b22e875f84a6128ee" }, + "conform.nvim": { "branch": "master", "commit": "4524a687107c6e598017dc7356b7cd1eb046aa71" }, + "crates.nvim": { "branch": "main", "commit": "f47c77d99f11362ddc2f4891f35407fb0b76d485" }, "dressing.nvim": { "branch": "master", "commit": "fe3071330a0720ce3695ac915820c8134b22d1b0" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "git-blame.nvim": { "branch": "master", "commit": "c9d778a95af2380f27eeaf6420dca406e64046b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, + "git-blame.nvim": { "branch": "master", "commit": "f07e913b7143f19edd6787229f2d51759b478600" }, + "gitsigns.nvim": { "branch": "main", "commit": "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55" }, "harpoon": { "branch": "master", "commit": "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a" }, + "headlines.nvim": { "branch": "master", "commit": "e3d7bfdf40e41a020d966d35f8b48d75b90367d2" }, + "inc-rename.nvim": { "branch": "main", "commit": "ed0f6f2b917cac4eb3259f907da0a481b27a3b7e" }, "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "ltex_extra.nvim": { "branch": "master", "commit": "9bed99b2b8488cc2daf66c76d2e0cf051ee80d13" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ab640b38ca9fa50d25d2d249b6606b9456b628d5" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "f0cd12f7a8a310c58cecebddb6b219ffad1cfd0f" }, - "mason.nvim": { "branch": "main", "commit": "eabf6d347fdb75be360d4c0ced1145670a171453" }, + "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "mini.ai": { "branch": "main", "commit": "4a2e387b121352dfb478f440c9a5313a9d97006c" }, "mini.bufremove": { "branch": "main", "commit": "f53c7f27e36009fe61563c11cde154b94a0e5b94" }, "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" }, @@ -33,47 +38,50 @@ "mini.pairs": { "branch": "main", "commit": "71f117fd57f930da6ef4126b24f594dd398bac26" }, "mini.surround": { "branch": "main", "commit": "af8129efcabe95fc08a233e9f91569829bed031f" }, "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" }, - "neodev.nvim": { "branch": "main", "commit": "80487e4f7bfa11c2ef2a1b461963db019aad6a73" }, - "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" }, - "neotest": { "branch": "master", "commit": "901891484db3d46ce43d56871273dc7d40621356" }, + "neodev.nvim": { "branch": "main", "commit": "b2881eeb395d2b268de5fe9b5e201a8f1816beb8" }, + "neoscroll.nvim": { "branch": "master", "commit": "e85740d1a54ab0f10127b08c67a291053bc3acfa" }, + "neotest": { "branch": "master", "commit": "d424d262d01bccc1e0b038c9a7220a755afd2a1f" }, "neotest-dotnet": { "branch": "main", "commit": "f7bdb60c3d7716f75fb04582f64dae8efb7716f1" }, "neotest-go": { "branch": "main", "commit": "1a15e1136db43775214a3e7a598f8930c29c94b7" }, "neotest-java": { "branch": "main", "commit": "5b915ad065e24149983a672c63e7273fe742fc0e" }, - "neotest-python": { "branch": "master", "commit": "81d2265efac717bb567bc15cc652ae10801286b3" }, - "neotest-rust": { "branch": "main", "commit": "03e036a310379f132d4e39387e9076396132ce3f" }, + "neotest-python": { "branch": "master", "commit": "c969a5b0073f2b5c8eaf017d1652f9251d761a15" }, + "neotest-rust": { "branch": "main", "commit": "f4e58d5278344440f65c5a5177f16711337e44f7" }, "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, - "null.nvim": { "branch": "main", "commit": "bc6ea9deac03b791cdd980d8c84a5d923a26381c" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, - "nvim-dap": { "branch": "master", "commit": "4048f37bc8b1a36fe1f5fde0df7d84aef71380e4" }, + "nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" }, + "nvim-dap-python": { "branch": "master", "commit": "e0be843877e7ae756ef1ee7a441ca0b9e1677da9" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, - "nvim-lint": { "branch": "master", "commit": "7746f952827dabfb70194518c99c93d5651b8f19" }, - "nvim-lspconfig": { "branch": "master", "commit": "37457f268af5cd6765e589b0dcd7cbd192d8da00" }, - "nvim-spectre": { "branch": "master", "commit": "37c3c04a5fbab09c64b6c66dd9a93c92039e93fd" }, - "nvim-tree.lua": { "branch": "master", "commit": "4ee6366ff1fc5d66231516ed05beffb50004261b" }, - "nvim-treesitter": { "branch": "master", "commit": "9a746b4b6a1ef215943f07e6aa2ec35fb14097d4" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2806d83e3965017382ce08792ee527e708fa1bd4" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "e1e670a86274d5cb681e475d4891ea1afe605ced" }, + "nvim-lint": { "branch": "master", "commit": "15fcab91e6a4e2a3e41dc55c5b3471f66c11ce39" }, + "nvim-lspconfig": { "branch": "master", "commit": "48347089666d5b77d054088aa72e4e0b58026e6e" }, + "nvim-spectre": { "branch": "master", "commit": "a18a58015b46f02b4fe537ebfffd82e46110ff24" }, + "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, + "nvim-treesitter": { "branch": "master", "commit": "557561fbc17269cdd4e9e88ef0ca1a9ff0bbf7e6" }, + "nvim-treesitter-context": { "branch": "master", "commit": "c03f8aab1e6649036d69ba7e3af4d09cb7e4d977" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, - "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, + "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" }, "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "53edfb413a54c9e55dcddc9e9fa4977a897e4425" }, "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "3044ff9e38d1ed8d7818d72d9f951ed9d1b0563d" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "f41675fddb1ea9003187d07ecc627a8bf8292633" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-project.nvim": { "branch": "master", "commit": "5460c6c60d48618c5c746e5b1cad4c3e8262fdae" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "telescope.nvim": { "branch": "master", "commit": "18774ec7929c8a8003a91e9e1f69f6c32258bbfe" }, "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, + "tree-sitter-hypr": { "branch": "master", "commit": "90b3ddf8a85b5ea3d9dc4920fddb16182a192e14" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "typst.vim": { "branch": "main", "commit": "2fddf2beeec265e0a41dd24ac668d825f8f3657a" }, + "typst.vim": { "branch": "main", "commit": "e72561f0023860eb83bd7680573b05ecfc016c55" }, + "venv-selector.nvim": { "branch": "main", "commit": "c259dacb20a00fb84ec6006e9a24b4085b27120a" }, "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, "vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" }, - "vimtex": { "branch": "master", "commit": "7d1dbd0eebe041fbda4d1132622bf051b1546497" }, + "vimtex": { "branch": "master", "commit": "a630f0f75d9468d10c9125f2f1b0049e479c2f54" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index dbd795d..2936ac5 100644 --- a/nvim/lua/config/keymaps.lua +++ b/nvim/lua/config/keymaps.lua @@ -142,6 +142,11 @@ require("neoscroll.config").set_mappings(t) -- trouble map("n", "t", "TroubleToggle", term_opts) +-- format +map({ "n", "v" }, "", function() + Util.format({ force = true }) +end, { desc = "Format" }) + -- better yank function Better_yank(opts) local current_line = unpack(vim.api.nvim_win_get_cursor(0)) diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua index 1121d80..bfe302b 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -1,45 +1,47 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - -- bootstrap lazy.nvim - -- stylua: ignore - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", - lazypath }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath, + }) end vim.opt.rtp:prepend(vim.env.LAZY or lazypath) require("lazy").setup({ spec = { - -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + { import = "lazyvim.plugins.extras.lang.rust" }, + { import = "lazyvim.plugins.extras.lang.java" }, + { import = "lazyvim.plugins.extras.lang.clangd" }, + { import = "lazyvim.plugins.extras.lang.typescript" }, + { import = "lazyvim.plugins.extras.lang.python" }, + { import = "lazyvim.plugins.extras.lang.markdown" }, + { import = "lazyvim.plugins.extras.lang.cmake" }, + { import = "lazyvim.plugins.extras.lang.omnisharp" }, + { import = "lazyvim.plugins.extras.lang.tailwind" }, + { import = "lazyvim.plugins.extras.lang.json" }, + { import = "lazyvim.plugins.extras.util.dot" }, + { import = "lazyvim.plugins.extras.test.core" }, { import = "lazyvim.plugins.extras.ui.alpha" }, - { import = "plugins.plugins" }, + { import = "lazyvim.plugins.extras.dap.core" }, { import = "plugins" }, - -- import any extras modules here - -- { import = "lazyvim.plugins.extras.lang.typescript" }, - -- { import = "lazyvim.plugins.extras.lang.json" }, - -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, - -- import/override with your plugins + { import = "plugins.plugins" }, }, defaults = { - -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. - -- If you - lazy = false, - -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, - -- have outdated releases, which may break your Neovim install. - version = false, -- always use the latest git commit - -- version = "*", -- try installing the latest stable version for plugins that support semver + lazy = true, + version = false, }, install = { colorscheme = { "tokyonight", "catppuccin-mocha" } }, checker = { enabled = true, notify = false }, - change_detection = { enabled = true, notify = false }, --know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + change_detection = { enabled = true, notify = false }, performance = { rtp = { - -- disable some rtp plugins disabled_plugins = { "gzip", - -- "matchit", - -- "matchparen", - -- "netrwPlugin", "tarPlugin", "tohtml", "tutor", diff --git a/nvim/lua/config/lsp-keymap.lua b/nvim/lua/config/lsp-keymap.lua index 5218d6c..1951e04 100644 --- a/nvim/lua/config/lsp-keymap.lua +++ b/nvim/lua/config/lsp-keymap.lua @@ -15,7 +15,7 @@ function M.get() { "cl", "LspInfo", desc = "Lsp Info" }, { "ca", "Telescope lsp_definitions", desc = "Goto Definition", has = "definition" }, { "cs", "Telescope lsp_references", desc = "References" }, - { "gD", vim.lsp.buf.declaration, desc = "Goto Declaration" }, + { "cA", vim.lsp.buf.declaration, desc = "Goto Declaration" }, { "cf", "Telescope lsp_implementations", desc = "Goto Implementation" }, { "cd", "Telescope lsp_type_definitions", desc = "Goto Type Definition" }, { "ce", vim.lsp.buf.hover, desc = "Hover" }, @@ -27,8 +27,8 @@ function M.get() { "[e", M.diagnostic_goto(false, "ERROR"), desc = "Prev Error" }, { "]w", M.diagnostic_goto(true, "WARN"), desc = "Next Warning" }, { "[w", M.diagnostic_goto(false, "WARN"), desc = "Prev Warning" }, - { "", format, desc = "Format Document", has = "formatting" }, - -- { "cf", format, desc = "Format Range", mode = "v", has = "documentRangeFormatting" }, + { "", format, desc = "Format Range", mode = "v", has = "documentRangeFormatting" }, + { "cr", ":IncRename ", desc = "FUCK", has = "rename" }, { "cq", function() @@ -68,20 +68,6 @@ function M.get() has = "codeAction", }, } - if require("lazyvim.util").has("inc-rename.nvim") then - M._keys[#M._keys + 1] = { - "cr", - function() - require("inc_rename") - return ":IncRename " .. vim.fn.expand("") - end, - expr = true, - desc = "Rename", - has = "rename", - } - else - M._keys[#M._keys + 1] = { "cr", vim.lsp.buf.rename, desc = "Rename", has = "rename" } - end end return M._keys end diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index ed5b07f..164d889 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -20,6 +20,7 @@ vim.g.neovide_refresh_rate_idle = 5 vim.g.neovide_hide_mouse_when_typing = true vim.g.mkdp_browser = "/usr/bin/firefox" vim.g.mkdp_auto_start = 1 +vim.g.autoformat = false for k, v in pairs(options) do vim.opt[k] = v end diff --git a/nvim/lua/plugins/dap.lua b/nvim/lua/plugins/dap.lua deleted file mode 100644 index cdcdfb7..0000000 --- a/nvim/lua/plugins/dap.lua +++ /dev/null @@ -1,301 +0,0 @@ -return { - { - "rcarriga/nvim-dap-ui", - keys = {}, - opts = {}, - config = function(_, opts) - local dap = require("dap") - local dapui = require("dapui") - dapui.setup(opts) - dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open({}) - end - dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close({}) - end - dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close({}) - end - end, - }, - { - "mfussenegger/nvim-dap", - lazy = true, - dependencies = { - "rcarriga/nvim-dap-ui", - "theHamsta/nvim-dap-virtual-text", - { - "jay-babu/mason-nvim-dap.nvim", - opts = { - ensure_installed = { - "node2", - "python", - "javadbg", - "javatest", - "codelldb", - "firefox", - "bash", - "delve", - "coreclr", - }, - automatic_installation = true, - automatic_setup = true, - }, - config = function(_, opts) - require("mason-nvim-dap").setup(opts) - -- require("mason-nvim-dap").setup_handlers({ - -- javadbg = function() end, - -- }) - end, - }, - }, - config = function() - local dap = require("dap") - dap.adapters.lldb = { - type = "executable", - command = "/usr/bin/lldb-vscode", - name = "lldb", - } - dap.adapters.nlua = function(callback, config) - callback({ type = "server", host = config.host or "127.0.0.1", port = config.port or 8086 }) - end - dap.adapters.bashdb = { - type = "executable", - command = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/bash-debug-adapter", - name = "bashdb", - } - dap.adapters.coreclr = { - type = "executable", - command = "netcoredbg", - args = { "--interpreter=vscode" }, - } - - local rust_dap = Get_git_root().cwd - local filename = "" - for w in rust_dap:gmatch("([^/]+)") do - filename = w - end - filename = filename:gsub("-", "_") - filename = string.lower(filename) - - dap.configurations.rust = { - { - type = "lldb", - request = "launch", - program = function() - return rust_dap .. "/target/debug/" .. filename - end, - --program = '${fileDirname}/${fileBasenameNoExtension}', - cwd = "${workspaceFolder}", - terminal = "integrated", - initCommands = function() - -- Find out where to look for the pretty printer Python module - local rustc_sysroot = vim.fn.trim(vim.fn.system("rustc --print sysroot")) - - local script_import = 'command script import "' .. rustc_sysroot .. '/lib/rustlib/etc/lldb_lookup.py"' - local commands_file = rustc_sysroot .. "/lib/rustlib/etc/lldb_commands" - - local commands = {} - local file = io.open(commands_file, "r") - if file then - for line in file:lines() do - table.insert(commands, line) - end - file:close() - end - table.insert(commands, 1, script_import) - - return commands - end, - }, - } - - dap.configurations.cpp = { - { - name = "debug cpp", - type = "lldb", - request = "launch", - program = function() - return vim.fn.input("Path to executable: ", Get_git_root().cwd .. "/build/", "file") - end, - cwd = "${workspaceFolder}", - terminal = "integrated", - }, - } - dap.configurations.c = dap.configurations.cpp - - dap.configurations.python = { - { - type = "python", -- the type here established the link to the adapter definition: `dap.adapters.python` - request = "launch", - name = "Launch file", - program = "${file}", -- This configuration will launch the current file if used. - pythonPath = function() - local cwd = vim.fn.getcwd() - if vim.fn.executable(cwd .. "/venv/bin/python") == 1 then - return cwd .. "/venv/bin/python" - elseif vim.fn.executable(cwd .. "/.venv/bin/python") == 1 then - return cwd .. "/.venv/bin/python" - else - return "/usr/bin/python" - end - end, - }, - } - dap.configurations.java = { - { - request = "attach", - name = "Debug (Attach) - Remote", - hostName = "127.0.0.1", - port = 5005, - }, - } - dap.configurations.go = { - { - type = "delve", - name = "Debug", - request = "launch", - program = "${file}", - }, - { - type = "delve", - name = "Debug test", -- configuration for debugging test files - request = "launch", - mode = "test", - program = "${file}", - }, - { - type = "delve", - name = "Debug test (go.mod)", - request = "launch", - mode = "test", - program = "./${relativeFileDirname}", - }, - } - dap.configurations.javascript = { - { - name = "Launch", - type = "js", - request = "launch", - program = "${file}", - cwd = vim.fn.getcwd(), - sourceMaps = true, - protocol = "inspector", - console = "integratedTerminal", - }, - } - dap.configurations.typescript = { - { - name = "Debug with Firefox", - type = "firefox", - request = "launch", - reAttach = true, - url = "http://localhost:3000", - webRoot = "${workspaceFolder}", - firefoxExecutable = "/usr/bin/firefox", - }, - } - dap.configurations.lua = { - { - type = "nlua", - request = "attach", - name = "Attach to running Neovim instance", - }, - } - dap.configurations.cs = { - { - type = "coreclr", - name = "launch - netcoredbg", - request = "launch", - program = function() - return vim.fn.input("Path to dll: ", Get_git_root().cwd, "file") - end, - -- args = function() - -- vim.fn.input("args: ", Get_git_root().cwd, "file") - -- end, - }, - } - dap.configurations.sh = { - { - type = "bashdb", - request = "launch", - name = "Launch file", - showDebugOutput = true, - pathBashdb = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir/bashdb", - pathBashdbLib = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir", - trace = true, - file = "${file}", - program = "${file}", - cwd = "${workspaceFolder}", - pathCat = "cat", - pathBash = "/bin/bash", - pathMkfifo = "mkfifo", - pathPkill = "pkill", - args = {}, - env = {}, - terminalKind = "integrated", - }, - } - require("dapui").setup({ - icons = { expanded = "▾", collapsed = "▸", current_frame = "▸" }, - mappings = { - expand = { "", "<2-LeftMouse>" }, - open = "o", - remove = "d", - edit = "e", - repl = "r", - toggle = "t", - }, - expand_lines = vim.fn.has("nvim-0.7") == 1, - layouts = { - { - elements = { - { id = "scopes", size = 0.25 }, - "breakpoints", - "stacks", - "watches", - }, - size = 40, -- 40 columns - position = "left", - }, - { - elements = { - "repl", - "console", - }, - size = 0.25, -- 25% of total lines - position = "bottom", - }, - }, - controls = { - enabled = true, - element = "repl", - icons = { - pause = "", - play = "", - step_into = "", - step_over = "", - step_out = "", - step_back = "", - run_last = "↻", - terminate = "□", - }, - }, - floating = { - max_height = nil, -- These can be integers or a float between 0 and 1. - max_width = nil, -- Floats will be treated as percentage of your screen. - border = "single", -- Border style. Can be "single", "double" or "rounded" - mappings = { - close = { "q", "" }, - }, - }, - windows = { indent = 1 }, - render = { - max_type_length = nil, -- Can be integer or nil. - max_value_lines = 100, -- Can be integer or nil. - }, - }) - require("nvim-dap-virtual-text").setup() - end, - }, -} diff --git a/nvim/lua/plugins/java.lua b/nvim/lua/plugins/java.lua deleted file mode 100644 index 5044d6f..0000000 --- a/nvim/lua/plugins/java.lua +++ /dev/null @@ -1,3 +0,0 @@ -local M = {} - -return M diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 7ff852e..603bc0a 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -10,11 +10,10 @@ return { virtual_text = { spacing = 4, source = "if_many", prefix = "●" }, severity_sort = true, }, - inlay_hints = { - enabled = true, - }, + -- inlay_hints = { + -- enabled = true, + -- }, capabilities = {}, - autoformat = false, format_notify = false, format = { formatting_options = nil, @@ -147,7 +146,6 @@ return { opencl_ls = {}, yamlls = {}, lua_ls = { - -- mason = false, -- set to false if you don't want this server to be installed with mason settings = { Lua = { workspace = { @@ -166,35 +164,28 @@ return { end, }, }, - setup = function(_, _) - local Util = require("lazyvim.util") - Util.lsp.on_attach(function(client, buffer) - require("config.lsp-keymap").on_attach(client, buffer) - end) - - vim.cmd([[highlight LspInlayHint guibg=#1A1B26]]) + init = function() + local keys = require("lazyvim.plugins.lsp.keymaps").get() + local my_keys = require("config.lsp-keymap").get() + local count = 0 + for _ in pairs(my_keys) do + keys[#keys + 1] = my_keys[count] + count = count + 1 + end end, }, { - "DashieTM/null.nvim", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { "mason.nvim" }, + "stevearc/conform.nvim", opts = function() - local nls = require("null-ls") - return { - root_dir = require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git"), - - sources = { - nls.builtins.formatting.fish_indent, - nls.builtins.diagnostics.fish, - nls.builtins.formatting.stylua, - nls.builtins.formatting.shfmt, - nls.builtins.diagnostics.flake8, - nls.builtins.formatting.autopep8, - nls.builtins.formatting.prettierd, - nls.builtins.formatting.typst, + local opts = { + formatters_by_ft = { + lua = { "stylua" }, + fish = { "fish_indent" }, + sh = { "shfmt" }, + typst = { "typstfmt" }, }, } + return opts end, }, } diff --git a/nvim/lua/plugins/lspbackup.lua b/nvim/lua/plugins/lspbackup.lua deleted file mode 100644 index 981adfb..0000000 --- a/nvim/lua/plugins/lspbackup.lua +++ /dev/null @@ -1,342 +0,0 @@ -return { - { - "neovim/nvim-lspconfig", - lazy = true, - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - { "folke/neoconf.nvim", cmd = "Neoconf", config = false, dependencies = { "nvim-lspconfig" } }, - { "folke/neodev.nvim", opts = { experimental = { pathStrict = true } } }, - "mason.nvim", - "williamboman/mason-lspconfig.nvim", - "mfussenegger/nvim-jdtls", - { - "hrsh7th/cmp-nvim-lsp", - cond = function() - return require("lazyvim.util").has("nvim-cmp") - end, - }, - { "Hoffs/omnisharp-extended-lsp.nvim", lazy = true }, - }, - ---@class PluginLspOpts - opts = { - -- options for vim.diagnostic.config() - diagnostics = { - underline = true, - update_in_insert = false, - virtual_text = { spacing = 4, source = "if_many", prefix = "●" }, - severity_sort = true, - }, - inlay_hints = { - enabled = true, - }, - capabilities = {}, - autoformat = false, - format_notify = false, - format = { - formatting_options = nil, - timeout_ms = nil, - }, - -- LSP Server Settings - ---@type lspconfig.options - servers = { - jsonls = {}, - tailwindcss = {}, - cssls = {}, - html = {}, - clangd = { - root_pattern = { - ".clangd", - ".clang-tidy", - ".clang-format", - "compile_commands.json", - "compile_flags.txt", - "configure.ac", - ".git", - "build/compile_commands.json", - }, - filetypes = { - "c", - "cpp", - "objc", - "objcpp", - "cuda", - "proto", - "cl", - }, - }, - pyright = {}, - cmake = {}, - bashls = {}, - ansiblels = {}, - marksman = {}, - asm_lsp = {}, - omnisharp = { - handlers = { - ["textDocument/definition"] = function(...) - return require("omnisharp_extended").handler(...) - end, - }, - inlayHintsOptions = { - enableForParameters = true, - forLiteralParameters = true, - forIndexerParameters = true, - forObjectCreationParameters = true, - forOtherParameters = true, - suppressForParametersThatDifferOnlyBySuffix = false, - suppressForParametersThatMatchMethodIntent = false, - suppressForParametersThatMatchArgumentName = false, - enableForTypes = true, - forImplicitVariableTypes = true, - forLambdaParameterTypes = true, - forImplicitObjectCreation = true, - }, - enable_roslyn_analyzers = true, - organize_imports_on_format = true, - enable_import_completion = true, - }, - rnix = {}, - rust_analyzer = { - diagnostics = { - enable = true, - experimental = true, - }, - }, - tsserver = { - settings = { - typescript = { - inlayHints = { - includeInlayParameterNameHints = "all", - includeInlayParameterNameHintsWhenArgumentMatchesName = true, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = true, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, - }, - }, - javascript = { - inlayHints = { - includeInlayParameterNameHints = "all", - includeInlayParameterNameHintsWhenArgumentMatchesName = true, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = true, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, - }, - }, - }, - }, - typst_lsp = { - settings = { - experimentalFormatterMode = "on", - exportPdf = "onSave", - }, - }, - texlab = {}, - ltex = { - settings = { - ltex = { - checkFrequency = "save", - }, - }, - filetypes = { - "bib", - "gitcommit", - "markdown", - "org", - "plaintex", - "rst", - "rnoweb", - "tex", - "pandoc", - "typst", - "typ", - }, - }, - gopls = { - staticcheck = true, - }, - sqlls = {}, - taplo = {}, - lemminx = {}, - opencl_ls = {}, - yamlls = {}, - lua_ls = { - -- mason = false, -- set to false if you don't want this server to be installed with mason - settings = { - Lua = { - workspace = { - checkThirdParty = false, - }, - completion = { - callSnippet = "Replace", - }, - }, - }, - }, - }, - setup = { - jdtls = function() - return true - end, - }, - }, - config = function(_, opts) - local Util = require("lazyvim.util") - - if Util.has("neoconf.nvim") then - local plugin = require("lazy.core.config").spec.plugins["neoconf.nvim"] - require("neoconf").setup(require("lazy.core.plugin").values(plugin, "opts", false)) - end - - -- setup autoformat - Util.format.register(Util.lsp.formatter()) - - -- deprectaed options - if opts.autoformat ~= nil then - vim.g.autoformat = opts.autoformat - end - - -- setup formatting and keymaps - Util.lsp.on_attach(function(client, buffer) - require("config.lsp-keymap").on_attach(client, buffer) - end) - - local register_capability = vim.lsp.handlers["client/registerCapability"] - - vim.lsp.handlers["client/registerCapability"] = function(err, res, ctx) - local ret = register_capability(err, res, ctx) - local client_id = ctx.client_id - ---@type lsp.Client - local client = vim.lsp.get_client_by_id(client_id) - local buffer = vim.api.nvim_get_current_buf() - require("config.lsp-keymap").on_attach(client, buffer) - return ret - end - - -- diagnostics - for name, icon in pairs(require("lazyvim.config").icons.diagnostics) do - name = "DiagnosticSign" .. name - vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" }) - end - - local inlay_hint = vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint - - if opts.inlay_hints.enabled and inlay_hint then - Util.lsp.on_attach(function(client, buffer) - if client.supports_method("textDocument/inlayHint") then - inlay_hint(buffer, true) - end - end) - end - - if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then - opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●" - or function(diagnostic) - local icons = require("lazyvim.config").icons.diagnostics - for d, icon in pairs(icons) do - if diagnostic.severity == vim.diagnostic.severity[d:upper()] then - return icon - end - end - end - end - - vim.diagnostic.config(vim.deepcopy(opts.diagnostics)) - - local servers = opts.servers - local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") - local capabilities = vim.tbl_deep_extend( - "force", - {}, - vim.lsp.protocol.make_client_capabilities(), - has_cmp and cmp_nvim_lsp.default_capabilities() or {}, - opts.capabilities or {} - ) - - local function setup(server) - local server_opts = vim.tbl_deep_extend("force", { - capabilities = vim.deepcopy(capabilities), - }, servers[server] or {}) - - if opts.setup[server] then - if opts.setup[server](server, server_opts) then - return - end - elseif opts.setup["*"] then - if opts.setup["*"](server, server_opts) then - return - end - end - require("lspconfig")[server].setup(server_opts) - end - - -- get all the servers that are available through mason-lspconfig - local have_mason, mlsp = pcall(require, "mason-lspconfig") - local all_mslp_servers = {} - if have_mason then - all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package) - end - - local ensure_installed = {} ---@type string[] - for server, server_opts in pairs(servers) do - if server_opts then - server_opts = server_opts == true and {} or server_opts - -- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig - if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then - setup(server) - else - ensure_installed[#ensure_installed + 1] = server - end - end - end - - if have_mason then - mlsp.setup({ ensure_installed = ensure_installed, handlers = { setup } }) - end - - if Util.lsp.get_config("denols") and Util.lsp.get_config("tsserver") then - local is_deno = require("lspconfig.util").root_pattern("deno.json", "deno.jsonc") - Util.lsp.disable("tsserver", is_deno) - Util.lsp.disable("denols", function(root_dir) - return not is_deno(root_dir) - end) - end - - require("lspconfig").ltex.setup({ - capabilities = capabilities, - on_attach = Util.lsp.on_attach(function(client, buffer) - require("config.lsp-keymap").on_attach(client, buffer) - require("ltex_extra").setup({ - path = vim.fn.expand("~") .. "/.local/share/ltex", - }) - end), - }) - - vim.cmd([[highlight LspInlayHint guibg=#1A1B26]]) - end, - }, - { - "DashieTM/null.nvim", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { "mason.nvim" }, - opts = function() - local nls = require("null-ls") - return { - root_dir = require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git"), - - sources = { - nls.builtins.formatting.fish_indent, - nls.builtins.diagnostics.fish, - nls.builtins.formatting.stylua, - nls.builtins.formatting.shfmt, - nls.builtins.diagnostics.flake8, - nls.builtins.formatting.autopep8, - nls.builtins.formatting.prettierd, - nls.builtins.formatting.typst, - }, - } - end, - }, -} diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index ef35632..a3b211b 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -266,4 +266,19 @@ return { ft = { "markdown", "tex", "typst", "typ" }, lazy = true, }, + { + "smjonas/inc-rename.nvim", + lazy = true, + event = "BufEnter", + config = function() + require("inc_rename").setup({ + cmd_name = "IncRename", -- the name of the command + hl_group = "Substitute", -- the highlight group used for highlighting the identifier's new name + preview_empty_name = true, -- whether an empty new name should be previewed; if false the command preview will be cancelled instead + show_message = true, -- whether to display a `Renamed m instances in n files` message after a rename operation + input_buffer_type = nil, -- the type of the external input buffer to use (the only supported value is currently "dressing") + post_hook = nil, -- callback to run after renaming, receives the result table (from LSP handler) as an argument + }) + end, + }, } diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf index e73d46f..8ed098c 100644 --- a/qt5ct/qt5ct.conf +++ b/qt5ct/qt5ct.conf @@ -31,7 +31,7 @@ geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\0\0\0\0\0\0\0\fv\0\0\x2\x10\0 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\x2\x2\0\0\0\n\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2) [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3O\0\0\x2\xd9\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x5\x61\0\0\0\0\x2\0\0\0\rp\0\0\0\0\0\0\0\0\0\0\x3O\0\0\x2\xd9) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x5-\0\0\x3P\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x5\x61\0\0\0\0\x2\0\0\0\rp\0\0\0\0\0\0\0\0\0\0\x5-\0\0\x3P) [Troubleshooting] force_raster_widgets=1 diff --git a/qt6ct/qt6ct.conf b/qt6ct/qt6ct.conf index 4f338f0..09e5ca8 100644 --- a/qt6ct/qt6ct.conf +++ b/qt6ct/qt6ct.conf @@ -27,7 +27,7 @@ wheel_scroll_lines=3 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x30\0\0\x1\xf4\0\0\0\0\0\0\0\0\0\0\x2\x30\0\0\x1\xf4\0\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x2\x30\0\0\x1\xf4) [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3#\0\0\x2\xe9\0\0\0\0\0\0\0\0\0\0\x3#\0\0\x2\xe9\0\0\0\x2\0\0\0\0\n\0\0\0\0\0\0\0\0\0\0\0\x3#\0\0\x2\xe9) +geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\xec\0\0\x3,\0\0\0\0\0\0\0\0\0\0\x3\xec\0\0\x3,\0\0\0\0\0\0\0\0\rp\0\0\0\0\0\0\0\0\0\0\x3\xec\0\0\x3,)" [Troubleshooting] force_raster_widgets=1