Remove gg (git-gui) alias

dot_aliases

@@ -90,4 +90,5 @@ unalias -m 'fd'
 unalias -m 'ff'
 unalias -m '_'
 unalias -m 'please'
+unalias -m 'gg'
 unalias -m 'gsts'

dot_config/i3/i3-autoname-workspaces.py

@@ -48,18 +48,18 @@ WINDOW_ICONS: dict[str, str] = {
     'code-oss': nf.icons['fa_code'],
     'vscodium': nf.icons['fa_code'],
     'cutter': nf.icons['fa_bug'],
-    'darktable': nf.icons['fa_camera'],
+    'darktable': nf.icons['md_camera'],
     'discord': nf.icons['fa_comment'],
     'dwarf_fortress': nf.icons['fa_fort_awesome'],
     'easyeffects': nf.icons['fa_music'],
     'evince': nf.icons['fa_file_pdf_o'],
     'factorio': nf.icons['fa_cog'],
-    'feh': nf.icons['fa_image'],
+    'feh': nf.icons['md_image'],
     'firefox': nf.icons['fa_firefox'],
     'firefoxdeveloperedition': nf.icons['fa_firefox'],
     'ghb': nf.icons['md_video'],
-    'gimp': nf.icons['cod_file_media'],
-    'gimp-2.10': nf.icons['cod_file_media'],
+    'gimp': nf.icons['fa_paint_brush'],
+    'gimp-2.10': nf.icons['fa_paint_brush'],
     'gparted': nf.icons['fa_hdd_o'],
     'gsmartcontrol': nf.icons['fa_hdd_o'],
     'inkscape': nf.icons['md_fountain_pen_tip'],
@@ -74,8 +74,8 @@ WINDOW_ICONS: dict[str, str] = {
     'libreoffice-writer': nf.icons['fa_file_word_o'],
     'lutris': nf.icons['fa_gamepad'],
     'mpv': nf.icons['md_video'],
-    'polymc': nf.icons['fa_cube'],
-    'minecraft': nf.icons['fa_cube'],
+    'polymc': nf.icons['md_minecraft'],
+    'minecraft': nf.icons['md_minecraft'],
     'mupdf': nf.icons['fa_file_pdf_o'],
     'nemiver': nf.icons['fa_bug'],
     'nm-connection-editor': nf.icons['fa_wifi'],
@@ -85,13 +85,13 @@ WINDOW_ICONS: dict[str, str] = {
     'picard': nf.icons['fa_music'],
     'qbittorrent': nf.icons['fa_download'],
     'qtcreator': nf.icons['fa_code'],
-    'roxterm': nf.icons['fa_terminal'],
     'seahorse': nf.icons['fa_lock'],
     'simplescreenrecorder': nf.icons['md_video'],
     'slack': nf.icons['fa_slack'],
     'spotify': nf.icons['fa_spotify'],
     'sqlitebrowser': nf.icons['fa_database'],
-    'steam': nf.icons['fa_steam'],
+    'steam': nf.icons['md_steam'],
+    'steam_app_671860': nf.icons['md-pistol'],  # battlebit
     'surviving mars': nf.icons['fa_rocket'],
     'telegram-desktop': nf.icons['fa_telegram'],
     'terraria.bin.x86_64': nf.icons['fa_tree'],

dot_config/nvim/init.lua

@@ -1,4 +1,5 @@
-require("sets")
+vim.g.mapleader = " "
+
 
 -- Lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
@@ -25,11 +26,12 @@ require("lazy").setup("plugins", {
 
 vim.cmd([[colorscheme gruvbox]])
 
-require('telescope').load_extension('projects')
-require('project_nvim').setup({})
-
 -- Import additional config files
+require("sets")
 require("mappings")
 require("git")
 require("lsp")
 require("line")
+
+require('telescope').load_extension('projects')
+require('project_nvim').setup({})

dot_config/nvim/lazy-lock.json

@@ -1,25 +1,30 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "LuaSnip": { "branch": "master", "commit": "0df29db3543837f8b41597f2640397c5ec792b7b" },
+  "LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" },
   "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "copilot.vim": { "branch": "release", "commit": "998cf5ab1b85e844c7e8edb864a997e590df7182" },
   "diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" },
-  "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" },
+  "go.nvim": { "branch": "master", "commit": "d73ea5bc00f0d7b726b0ddfc29cea17a544459ba" },
   "gruvbox.nvim": { "branch": "main", "commit": "477c62493c82684ed510c4f70eaf83802e398898" },
-  "lazy.nvim": { "branch": "main", "commit": "276e572f645430bcfd6fd25faa301ea9077f6ab1" },
+  "guihua.lua": { "branch": "master", "commit": "5ad8dba19ce9b9fd8965598984dfdc9c119f97e4" },
+  "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "22d2186bee730d68f6fd3bb2d19a389784c37a96" },
-  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "397273083f988c1a17acf3816947cd198338e700" },
+  "lualine.nvim": { "branch": "master", "commit": "7533b0ead663d80452210c0c089e5105089697e5" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" },
   "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
-  "neodev.nvim": { "branch": "main", "commit": "24b403eabde652904077f84fd55441744e77a109" },
-  "nvim-autopairs": { "branch": "master", "commit": "748e72c05495a3d30e88a6ef04b21697019a9aa9" },
-  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
+  "neodev.nvim": { "branch": "main", "commit": "b094a663ccb71733543d8254b988e6bebdbdaca4" },
+  "nvim-autopairs": { "branch": "master", "commit": "f6c71641f6f183427a651c0ce4ba3fb89404fa9e" },
+  "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" },
   "nvim-cursorword": { "branch": "master", "commit": "c0f2958ec729b47be2dba0d79ef43d005dac9f4e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "bb8e3dfbe10d80c294bb609c4bb4bba3ecdfbfe2" },
-  "nvim-treesitter": { "branch": "master", "commit": "0d5c611e3fd36353b11b412661ff4f07bcc8e5c6" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "76c7a89b41de77a4f83fb77fa072c5ad7605fe3b" },
-  "nvim-web-devicons": { "branch": "master", "commit": "a1e6268779411048a87f767a27380089362a0ce2" },
+  "nvim-dap": { "branch": "master", "commit": "b595c820018a15b6d54bf53b5cbeaa6f2d7a27e2" },
+  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" },
+  "nvim-surround": { "branch": "main", "commit": "0d6882635817a2677749a330127d12ac30a4f3c8" },
+  "nvim-treesitter": { "branch": "master", "commit": "afa103385a2b5ef060596ed822ef63276ae88016" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" },
+  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
   "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
@@ -29,7 +34,6 @@
   "vim-fugitive": { "branch": "master", "commit": "cbe9dfa162c178946afa689dd3f42d4ea8bf89c1" },
   "vim-matchup": { "branch": "master", "commit": "6dbe108230c7dbbf00555b7d4d9f6a891837ef07" },
   "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
-  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "which-key.nvim": { "branch": "main", "commit": "6962dae3565369363b59dd51fb206051555fcb4d" },
+  "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" },
   "whitespace.nvim": { "branch": "master", "commit": "f0fc9e9c4ce3f7d2166e9e5a069b64b9ca4a3f15" }
 }

dot_config/nvim/lua/git.lua

@@ -1,7 +1,7 @@
 require('gitsigns').setup{
     signs = {
         add          = { text = '+' },
-        change       = { text = '│' },
+        change       = { text = '~' },
         delete       = { text = '_' },
         topdelete    = { text = '‾' },
         changedelete = { text = '~' },
@@ -15,14 +15,14 @@ require('gitsigns').setup{
         follow_files = true
     },
     attach_to_untracked = true,
-    current_line_blame = true, -- :Gitsigns toggle_current_line_blame
+    current_line_blame = true,
     current_line_blame_opts = {
         virt_text = true,
         virt_text_pos = 'right_align', -- 'eol' | 'overlay' | 'right_align'
         delay = 100,
         ignore_whitespace = false,
     },
-    current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
+    current_line_blame_formatter = '<abbrev_sha> - <author> <author_time:%Y-%m-%d>',
     sign_priority = 6,
     update_debounce = 100,
     status_formatter = nil, -- Use default

dot_config/nvim/lua/lsp.lua

@@ -1,9 +1,11 @@
 -- Load default lsp-zero keymaps
-local lsp_zero = require('lsp-zero')
+local lsp_zero = require("lsp-zero")
+local telescope = require("telescope.builtin")
+require("mason").setup()
+require("mason-lspconfig").setup({ automatic_installation = true })
 
 lsp_zero.on_attach(function(_, bufnr)
-    -- see :help lsp-zero-keybindings
-    -- to learn the available actions
+    -- see :help lsp-zero-keybindings to learn the available actions
     lsp_zero.default_keymaps({buffer = bufnr})
 
     local opts = {buffer = bufnr, remap = false}
@@ -14,6 +16,20 @@ lsp_zero.on_attach(function(_, bufnr)
     vim.keymap.set("n", "<leader>en", function() vim.diagnostic.goto_next() end, opts)
     vim.keymap.set("n", "<leader>ep", function() vim.diagnostic.goto_prev() end, opts)
     vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
+
+    vim.keymap.set("n", "gr", function() telescope.lsp_references({
+        include_declaration = false,
+        show_line = false,
+        fname_width = 64,
+    }) end, opts)
+    vim.keymap.set("n", "gd", function() telescope.lsp_definitions({
+        show_line = false,
+        fname_width = 64,
+    }) end, opts)
+    vim.keymap.set("n", "gi", function() telescope.lsp_implementations({
+        show_line = false,
+        fname_width = 64,
+    }) end, opts)
 end)
 
 lsp_zero.format_on_save({
@@ -22,47 +38,69 @@ lsp_zero.format_on_save({
         timeout_ms = 10000,
     },
     servers = {
-        ['prettier'] = {'javascript', 'typescript'},
-        ['gopls'] = {'go'},
-        ['stylua'] = {'lua'},
+        ["efm"] = {"javascript", "typescript"},
+        ["gopls"] = {"go"},
+        ["stylua"] = {"lua"},
     }
 })
 
 -- Setup LSP servers
-local lspconfig = require('lspconfig')
+local lspconfig = require("lspconfig")
+local prettier = {
+    formatCommand = 'prettierd "${INPUT}"',
+    formatStdin = true,
+    env = {
+        string.format('PRETTIERD_DEFAULT_CONFIG=%s', vim.fn.expand('~/.config/nvim/utils/linter-config/.prettierrc.json')),
+    },
+}
 -- go
 lspconfig.golangci_lint_ls.setup({})
 lspconfig.gopls.setup({})
 -- lua
-lspconfig.lua_ls.setup({})
+lspconfig.lua_ls.setup(lsp_zero.nvim_lua_ls())
 -- python
-lspconfig.pylsp.setup{}
+lspconfig.pylsp.setup({})
 -- typescript
-lspconfig.tsserver.setup({})
 lspconfig.eslint.setup({})
+lspconfig.tsserver.setup({})
+local languages = {
+    -- lua = { stylua },
+    typescript = { prettier },
+    javascript = { prettier },
+    json = { prettier },
+    markdown = { prettier },
+}
+lspconfig.efm.setup({
+    -- capabilities = capabilities,
+    cmd = { "/home/pavle/.local/share/nvim/mason/bin/efm-langserver" },
+    -- on_attach = on_attach,
+    init_options = { documentFormatting = true },
+    root_dir = vim.loop.cwd,
+    filetypes = vim.tbl_keys(languages),
+    settings = {
+        rootMarkers = { ".git/", ".prettierignore" },
+        lintDebounce = 100,
+        logLevel = 5,
+        logFile = "/home/pavle/efm.log",
+        languages = languages,
+    },
+    single_file_support = true,
+})
 -- other
 lspconfig.terraformls.setup({})
 lspconfig.jsonls.setup({})
 
 -- Customize keymaps
-local cmp = require('cmp')
--- local cmp_action = require('lsp-zero').cmp_action()
-
+local cmp = require("cmp")
 cmp.setup({
     mapping = cmp.mapping.preset.insert({
         -- `Enter` key to confirm completion
-        ['<CR>'] = cmp.mapping.confirm({select = false}),
+        ["<CR>"] = cmp.mapping.confirm({select = false}),
 
-        ['<C-Space>'] = cmp.mapping.complete(),
+        ["<C-Space>"] = cmp.mapping.complete(),
 
         -- Scroll up and down in the completion documentation
-        ['<C-u>'] = cmp.mapping.scroll_docs(-4),
-        ['<C-d>'] = cmp.mapping.scroll_docs(4),
+        ["<C-u>"] = cmp.mapping.scroll_docs(-4),
+        ["<C-d>"] = cmp.mapping.scroll_docs(4),
     })
 })
-
--- Fix lua lsp for nvim config
-local lua_opts = lsp_zero.nvim_lua_ls()
-require('lspconfig').lua_ls.setup(lua_opts)
-
-require("mason").setup()

dot_config/nvim/lua/mappings.lua

@@ -1,32 +1,34 @@
--- Colemak bindings
-vim.keymap.set("", "n", "j")
-vim.keymap.set("", "e", "k")
-vim.keymap.set("", "i", "l")
-vim.keymap.set("", "I", "$")
-vim.keymap.set("", "H", "0")
-vim.keymap.set("", "l", "i")
-vim.keymap.set("", "L", "I")
-vim.keymap.set("n", "N", "mzJ`z")
-vim.keymap.set("", "k", "n")
-vim.keymap.set("", "K", "N")
-vim.keymap.set("", "J", "M")
-vim.keymap.set("", "j", "m")
-vim.keymap.set("", "m", "e")
-vim.keymap.set("", "M", "E")
+local opts = {noremap = true, silent = true}
 
-vim.keymap.set("v", "N", ":m '>+1<CR>gv=gv")
-vim.keymap.set("v", "E", ":m '<-2<CR>gv=gv")
+-- Colemak bindings
+vim.keymap.set("", "n", "j", opts)
+vim.keymap.set("", "e", "k", opts)
+vim.keymap.set("", "i", "l", opts)
+vim.keymap.set("", "I", "$", opts)
+vim.keymap.set("", "H", "^", opts)
+vim.keymap.set("", "l", "i", opts)
+vim.keymap.set("", "L", "I", opts)
+vim.keymap.set("n", "N", "mzJ`z", opts)
+vim.keymap.set("", "k", "n", opts)
+vim.keymap.set("", "K", "N", opts)
+vim.keymap.set("", "J", "M", opts)
+vim.keymap.set("", "j", "m", opts)
+vim.keymap.set("", "m", "e", opts)
+vim.keymap.set("", "M", "E", opts)
+
+vim.keymap.set("v", "N", ":m '>+1<CR>gv=gv", opts)
+vim.keymap.set("v", "E", ":m '<-2<CR>gv=gv", opts)
 
 -- General mappings
-vim.keymap.set("", "<BS>", "gg")
-vim.keymap.set("", "<CR>", "G")
-vim.keymap.set("", "<Space>", "<NOP>")
+vim.keymap.set("", "<BS>", "gg", opts)
+vim.keymap.set("", "<CR>", "G", opts)
+vim.keymap.set("", "<Space>", "<NOP>", opts)
 
-vim.keymap.set("x", "p", "\"_dP")
+vim.keymap.set("x", "p", "\"_dP", opts)
 
-vim.keymap.set("n", "<tab>", vim.cmd.bn)
-vim.keymap.set("n", "<s-tab>", vim.cmd.bp)
-vim.keymap.set("n", "U", vim.cmd.redo)
+vim.keymap.set("n", "<tab>", vim.cmd.bn, opts)
+vim.keymap.set("n", "<s-tab>", vim.cmd.bp, opts)
+vim.keymap.set("n", "U", vim.cmd.redo, opts)
 
 -- File operation maps
 vim.keymap.set("n", "<leader>fd", function ()
@@ -36,35 +38,50 @@ vim.keymap.set("n", "<leader>fd", function ()
         vim.cmd.normal('jzgg=G`z')
     end
 end)
-vim.keymap.set("n", "<leader>fs", vim.cmd.w)
-vim.keymap.set("n", "<leader>W", vim.cmd.SudaWrite)
-vim.keymap.set("n", "<leader>q", vim.cmd.q)
-vim.keymap.set("n", "<leader>Q", ":q!<cr>")
-vim.keymap.set("n", "<leader>wq", vim.cmd.wq)
-vim.keymap.set("n", "<leader>bd", ":bp | bd #<cr>")
-vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
+vim.keymap.set("n", "<leader>fs", vim.cmd.w, opts)
+vim.keymap.set("n", "<leader>W", vim.cmd.SudaWrite, opts)
+vim.keymap.set("n", "<leader>q", vim.cmd.q, opts)
+vim.keymap.set("n", "<leader>Q", ":q!<cr>", opts)
+vim.keymap.set("n", "<leader>wq", vim.cmd.wq, opts)
+vim.keymap.set("n", "<leader>bd", ":bp | bd #<cr>", opts)
+vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle, opts)
 
-vim.keymap.set("", "\\", ":let @/ = \"\"<CR>")
+vim.keymap.set("", "\\", ":let @/ = \"\"<CR>", opts)
 
 -- Git
-vim.keymap.set("n", "<leader>gd", vim.cmd.Gvdiff)
+vim.keymap.set("n", "<leader>gd", vim.cmd.Gvdiff, opts)
 -- vim.keymap.set("n", "<leader>gb", vim.cmd('Gitsigns toggle_current_line_blame'))
 
 -- window movement
-vim.keymap.set("n", "<leader>wn", "<C-W>j")
-vim.keymap.set("n", "<leader>we", "<C-W>k")
-vim.keymap.set("n", "<leader>wh", "<C-W>h")
-vim.keymap.set("n", "<leader>wi", "<C-W>l")
-vim.keymap.set("n", "<leader>wH", "<C-W>5<")
-vim.keymap.set("n", "<leader>wI", "<C-W>5>")
-vim.keymap.set("n", "<leader>wN", ":resize +5<CR>")
-vim.keymap.set("n", "<leader>wE", ":resize -5<CR>")
+vim.keymap.set("n", "<leader>wn", "<C-W>j", opts)
+vim.keymap.set("n", "<leader>we", "<C-W>k", opts)
+vim.keymap.set("n", "<leader>wh", "<C-W>h", opts)
+vim.keymap.set("n", "<leader>wi", "<C-W>l", opts)
+vim.keymap.set("n", "<leader>wH", "<C-W>5<", opts)
+vim.keymap.set("n", "<leader>wI", "<C-W>5>", opts)
+vim.keymap.set("n", "<leader>wN", ":resize +5<CR>", opts)
+vim.keymap.set("n", "<leader>wE", ":resize -5<CR>", opts)
 
 -- Telescope
-local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>fp', builtin.git_files, {})
-vim.keymap.set('n', '<c-p>', builtin.git_files, {})
-vim.keymap.set('n', '<leader>rg', builtin.live_grep, {})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+require('telescope').setup({
+    defaults = {
+        mappings = {
+            i = {
+                ["<esc>"] = require('telescope.actions').close,
+            },
+        },
+    },
+})
+
+local telescope = require('telescope.builtin')
+
+local git_files = function()
+    telescope.git_files({show_untracked = true})
+end
+
+vim.keymap.set('n', '<leader>ff', git_files, opts)
+vim.keymap.set('n', '<c-p>', git_files, opts)
+vim.keymap.set('n', '<leader>fp', function() telescope.find_files({hidden=true}) end, opts)
+vim.keymap.set('n', '<leader>rg', telescope.live_grep, opts)
+vim.keymap.set('n', '<leader>fb', telescope.buffers, opts)
+vim.keymap.set('n', '<leader>fh', telescope.help_tags, opts)

dot_config/nvim/lua/plugins/comment.lua

@@ -7,6 +7,12 @@ return {
             ---Block-comment toggle keymap
             block = '<leader>b/',
         },
+        opleader = {
+            ---Line-comment keymap
+            line = '<leader>/',
+            ---Block-comment keymap
+            block = '<leader>b/',
+        },
     },
     lazy = false,
 }

dot_config/nvim/lua/plugins/init.lua

@@ -12,23 +12,47 @@ return {
     },
     "nvim-lualine/lualine.nvim",
 
-    -- keymaps and functionality
+    -- keymaps
     {
         'windwp/nvim-autopairs',
         event = "InsertEnter",
         opts = {}
     },
-    "tpope/vim-surround",
+    {
+        "kylechui/nvim-surround",
+        version = "*",
+        event = "VeryLazy",
+        config = function()
+            require("nvim-surround").setup({
+                -- Configuration here, or leave empty to use defaults
+            })
+        end
+    },
     "folke/which-key.nvim",
+
+    -- functionality
     'andymass/vim-matchup',
     'tpope/vim-repeat',
     'mbbill/undotree',
     'jdhao/whitespace.nvim',
     'lambdalisue/suda.vim',
     'xiyaowong/nvim-cursorword',
-
-    -- other
     'ahmedkhalf/project.nvim',
-    'folke/neodev.nvim',
     'github/copilot.vim',
+    "mfussenegger/nvim-dap",
+    "rcarriga/nvim-dap-ui",
+    {
+        'folke/neodev.nvim',
+        dependencies = {
+            "rcarriga/nvim-dap-ui",
+        },
+        opts = {
+            library = {
+                plugins = {
+                    "nvim-dap-ui",
+                },
+                types = true,
+            },
+        },
+    },
 }

dot_config/nvim/lua/plugins/lsp.lua

@@ -7,4 +7,19 @@ return {
     {'hrsh7th/cmp-nvim-lsp'},
     {'hrsh7th/nvim-cmp'},
     {'L3MON4D3/LuaSnip'},
+
+    {
+        "ray-x/go.nvim",
+        dependencies = {
+            "ray-x/guihua.lua",
+            "neovim/nvim-lspconfig",
+            "nvim-treesitter/nvim-treesitter",
+        },
+        config = function()
+            require("go").setup()
+        end,
+        event = {"CmdlineEnter"},
+        ft = {"go", "gomod"},
+        build = ":lua require('go.install').update_all_sync()"
+    }
 }

dot_config/nvim/lua/plugins/treesitter.lua

@@ -1,57 +1,65 @@
 return {
-    "nvim-treesitter/nvim-treesitter",
-    version = false,
-    build = ":TSUpdate",
-    event = { "BufReadPost", "BufNewFile" },
-    dependencies = {
-        {
-            "nvim-treesitter/nvim-treesitter-textobjects",
-            init = function()
-                require("lazy.core.loader").disable_rtp_plugin("nvim-treesitter-textobjects")
-                load_textobjects = true
-            end,
+    {
+        "nvim-treesitter/playground",
+        dependencies = {
+            "nvim-treesitter/nvim-treesitter",
         },
     },
-    cmd = { "TSUpdateSync" },
-    keys = {
-        { "<c-space>", desc = "Increment selection" },
-        { "<bs>", desc = "Decrement selection", mode = "x" },
-    },
-    opts = {
-        highlight = {
-            enable = true,
-            additional_vim_regex_highlighting = false,
-        },
-        indent = { enable = true },
-        auto_install = true,
-        ensure_installed = {
-            "bash",
-            "go",
-            "javascript",
-            "json",
-            "lua",
-            "luadoc",
-            "luap",
-            "markdown",
-            "markdown_inline",
-            "python",
-            "query",
-            "regex",
-            "terraform",
-            "tsx",
-            "typescript",
-            "vim",
-            "vimdoc",
-            "yaml",
-        },
-        incremental_selection = {
-            enable = true,
-            keymaps = {
-                init_selection = "<C-space>",
-                node_incremental = "<C-space>",
-                scope_incremental = false,
-                node_decremental = "<bs>",
-            },
-        },
+    {
+        "nvim-treesitter/nvim-treesitter",
+        version = false,
+        build = ":TSUpdate",
+        event = { "BufReadPost", "BufNewFile", "VeryLazy" },
+        cmd = { "TSUpdateSync", "TSUpdate", "TSInstall" },
+        config = function()
+            require'nvim-treesitter.configs'.setup({
+                highlight = {
+                    enable = true,
+                    additional_vim_regex_highlighting = false,
+                },
+                indent = {
+                    enable = true,
+                },
+                auto_install = true,
+                ensure_installed = {
+                    "bash",
+                    "go",
+                    "javascript",
+                    "json",
+                    "lua",
+                    "luadoc",
+                    "luap",
+                    "markdown",
+                    "markdown_inline",
+                    "python",
+                    "query",
+                    "regex",
+                    "terraform",
+                    "tsx",
+                    "typescript",
+                    "vim",
+                    "vimdoc",
+                    "yaml",
+                },
+                playground = {
+                    enable = true,
+                    disable = {},
+                    updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
+                    persist_queries = false,
+                    keybindings = {
+                        toggle_query_editor = 'o',
+                        toggle_hl_groups = 'i',
+                        toggle_injected_languages = 't',
+                        toggle_anonymous_nodes = 'a',
+                        toggle_language_display = 'I',
+                        focus_language = 'f',
+                        unfocus_language = 'F',
+                        update = 'R',
+                        goto_node = '<cr>',
+                        show_help = '?',
+                    },
+                },
+            })
+        end,
     },
 }

dot_config/nvim/lua/sets.lua

@@ -1,6 +1,3 @@
-vim.g.mapleader = " "
-
--- sets
 vim.opt.clipboard = "unnamedplus"
 vim.opt.nu = true
 vim.opt.relativenumber = true
@@ -16,6 +13,7 @@ vim.opt.listchars = "tab:│ ,trail:~,extends:>,precedes:<"
 vim.opt.foldenable = false
 vim.opt.foldmethod = "expr"
 vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+vim.opt.foldlevel = 99
 vim.opt.termguicolors = true
 vim.opt.autochdir = true
 vim.opt.showcmd = true

dot_config/rofi/gruvbox-common.inc.rasi

@@ -38,7 +38,7 @@ listview {
 
 element {
     border:  0;
-    padding: 2px;
+    padding: 0 2px;
 }
 
 element.normal.normal {