From d9fe451ad46cc46583f62e0652593390b2dfbfeb Mon Sep 17 00:00:00 2001 From: afonso Date: Thu, 22 Feb 2024 11:32:07 +0000 Subject: [PATCH] [NVIM] updated nvim config with some stuff has tmux line integrated --- .config/nvim/lazy-lock.json | 70 +++++++++++++--------------- .config/nvim/lua/core/variables.lua | 5 +- .config/nvim/lua/plugins/cmp.lua | 23 ++------- .config/nvim/lua/plugins/jukit.lua | 21 ++++----- .config/nvim/lua/plugins/lazy.lua | 19 ++------ .config/nvim/lua/plugins/none-ls.lua | 3 +- .gitconfig-gh | 2 + 7 files changed, 60 insertions(+), 83 deletions(-) create mode 100644 .gitconfig-gh diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index efa58eb..c146ecc 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,7 +1,6 @@ { - "LuaSnip": { "branch": "master", "commit": "2463d687fe704b76eb0aa3bb34e95f69a5bb0362" }, - "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, - "catppuccin": { "branch": "main", "commit": "b901cf144573b293b6cefeb1ac8c97d5d239ee7a" }, + "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, + "catppuccin": { "branch": "main", "commit": "9703f227bfab20d04bcee62d2f08f1795723b4ae" }, "cinnamon.nvim": { "branch": "master", "commit": "c406ffda3a0302f32c23b24ab756ea20467d6578" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -10,48 +9,45 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, - "distant.nvim": { "branch": "v0.3", "commit": "998724f62386c8022a4e6c885f4509cf9477451a" }, - "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" }, - "fidget.nvim": { "branch": "main", "commit": "a4a7edfea37e557dbff5509ee374ffb57051bba9" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, + "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, + "distant.nvim": { "branch": "v0.3", "commit": "de7288b1af6fdb2d2e7a8aa00f07a236261c2491" }, + "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, + "fidget.nvim": { "branch": "main", "commit": "4e854f3299e21d1c18279add340428a97520fc44" }, + "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" }, "gruvbox-material": { "branch": "master", "commit": "b17fe51688b76e2ccf118e5f76f3978b9a8c503e" }, - "gruvbox.nvim": { "branch": "main", "commit": "4176b0b720db0c90ab4030e5c1b4893faf41fd51" }, "impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "leap.nvim": { "branch": "main", "commit": "47262a9beadd6945f51b0a4fc2d005aaa2095f04" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "9e82ded0515186edd4f69e4ce6b1a5f1b55b47e9" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, - "neovim": { "branch": "main", "commit": "c6d53a99d4c5c50fd10d5091208491b25130486b" }, - "nerdy.nvim": { "branch": "main", "commit": "548437ebcea9106156e7ea3a5612ee6444a1aba4" }, - "none-ls.nvim": { "branch": "main", "commit": "e7382de51b4cf629e56f1fa18192e716e5ba8145" }, - "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "leap.nvim": { "branch": "main", "commit": "657752e806916a72b0da4b669506d93c49a0c82b" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "nerdy.nvim": { "branch": "main", "commit": "7c9a4ea4a9ca7063e86dbcf7ce0f233cb59bdc10" }, + "none-ls.nvim": { "branch": "main", "commit": "34b1311bd07bd3741e60e06b34d0709d6e5a9f0f" }, + "nvim-autopairs": { "branch": "master", "commit": "2e8a10c5fc0dcaf8296a5f1a7077efcd37065cc8" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, - "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, + "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, "nvim-ghost.nvim": { "branch": "main", "commit": "a1ca0b2dac59881066d7ac9373cf64d59ba29d6a" }, - "nvim-lspconfig": { "branch": "master", "commit": "0d9e870d01894c592d7ea93cfe0fa451916d9a7f" }, - "nvim-tmux-navigation": { "branch": "main", "commit": "d9efffa413a530bdea3783af4fea86be84940283" }, - "nvim-treesitter": { "branch": "master", "commit": "362ebd3a210f20aab80be05557f216cbaf4531e6" }, - "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, - "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, - "oil.nvim": { "branch": "master", "commit": "523b61430cb7365f8f86609c2ea60e48456bac63" }, - "orgmode": { "branch": "master", "commit": "ab045e3084d5987e8939d25d69b09baaf762278c" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" }, + "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" }, + "nvim-treesitter": { "branch": "master", "commit": "b3e53e94232d2bc6d70516efbd932bcce3ba8e1e" }, + "nvim-treesitter-context": { "branch": "master", "commit": "6a4b354233b12f094d824575e09db089355e59dd" }, + "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, + "oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" }, + "orgmode": { "branch": "master", "commit": "5657e2f721d582bdd665686a0399c616bc697ccf" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" }, - "themery.nvim": { "branch": "main", "commit": "1005a58801276d29c4b1e11244cf7631250f9143" }, "tla.nvim": { "branch": "master", "commit": "e419c75e805ab6d9967c7325bf35734c372d3d4b" }, - "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, - "typst.vim": { "branch": "main", "commit": "308e7737d09de8c1100320ddc6bc270615ae791a" }, - "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" }, + "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, + "typst.vim": { "branch": "main", "commit": "e28d440c7ba4df2516d7d7f908c4fb664a8cf86c" }, + "undotree": { "branch": "master", "commit": "9dbbf3b7d19dda0d22ceca461818e4739ad8154d" }, "vim-alloy": { "branch": "master", "commit": "5bd57c4890be39e221dd3e1f6735457dce454bbd" }, "vim-jukit": { "branch": "master", "commit": "73214c9a8abc4b6aa7a6266b5bc2ddbf8b3e3c00" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "vimtex": { "branch": "master", "commit": "6179414f2eb3db977a513b7b19c23e7e62a0f388" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, - "zen-mode.nvim": { "branch": "main", "commit": "50e2e2a36cc97847d9ab3b1a3555ba2ef6839b50" } + "vim-tpipeline": { "branch": "master", "commit": "649f079a0bee19565978b82b672d831c6641d952" }, + "vimtex": { "branch": "master", "commit": "9df79e15bf035d1cfb32c11fffed38dd7b6a0501" }, + "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" } } \ No newline at end of file diff --git a/.config/nvim/lua/core/variables.lua b/.config/nvim/lua/core/variables.lua index 83e4810..b0669b5 100644 --- a/.config/nvim/lua/core/variables.lua +++ b/.config/nvim/lua/core/variables.lua @@ -43,4 +43,7 @@ vim.g.jukit_shell_cmd = 'ipython3' vim.g.jukit_terminal = 'nvimterm' vim.g.jukit_show_prompt = 1 vim.g.jukit_pdf_viewer = 'zathura' -vim.g.jukit_mappings = 1 +vim.g.jukit_mappings = 0 +--Format Options +vim.opt.formatoptions:remove("ro") + diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index 5ad0408..dee1733 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -151,30 +151,17 @@ cmp.setup { name = "nvim_lsp", entry_filter = function(entry, context) local kind = entry:get_kind() - local line = context.cursor_line - local col = context.cursor.col - local char_before_cursor = string.sub(line, col - 1, col - 1) - - if char_before_cursor == "." then - if kind == 2 or kind == 5 then - return true - else - return false - end - elseif string.match(line, "^%s*%w*$") then - if kind == 3 or kind == 6 then - return true - else - return false - end - end + vim.api.nvim_out_write(kind .. '\n') + if kind == "Text" then return false end return true end }, + + { name = 'orgmode' }, { name = 'nvim_lua' }, { name = 'luasnip' }, - { name = "vim-dadbod-completion" }, + --{ name = "vim-dadbod-completion" }, { name = "path" }, }, { diff --git a/.config/nvim/lua/plugins/jukit.lua b/.config/nvim/lua/plugins/jukit.lua index 7118fcc..49bcd25 100644 --- a/.config/nvim/lua/plugins/jukit.lua +++ b/.config/nvim/lua/plugins/jukit.lua @@ -1,26 +1,25 @@ +local opts = { noremap = true, silent = true, buffer = true } -- Create new code cell below. Argument: Whether to create code cell (0) or markdown cell (1) -vim.api.nvim_set_keymap('n', 'jco', ':call jukit#cells#create_below(0)', { noremap = true, silent = true}) +vim.keymap.set('n', 'jco', 'call jukit#cells#create_below(0)', opts) -- Create new code cell above. Argument: Whether to create code cell (0) or markdown cell (1) -vim.api.nvim_set_keymap('n', 'jcO', ':call jukit#cells#create_above(0)', { noremap = true, silent = true}) +vim.keymap.set('n', 'jcO', 'call jukit#cells#create_above(0)', opts) -- Create new text (markdown) cell below. Argument: Whether to create code cell (0) or markdown cell (1) -vim.api.nvim_set_keymap('n', 'jct', ':call jukit#cells#create_below(1)', { noremap = true, silent = true }) +vim.keymap.set('n', 'jct', 'call jukit#cells#create_below(1)', opts) -- Create new text (markdown) cell above. Argument: Whether to create code cell (0) or markdown cell (1) -vim.api.nvim_set_keymap('n', 'jcT', ':call jukit#cells#create_above(1)', { noremap = true, silent = true }) +vim.keymap.set('n', 'jcT', 'call jukit#cells#create_above(1)', opts) -- Deletes the current cell -vim.api.nvim_set_keymap('n', 'jcd', ':call jukit#cells#delete()', { noremap = true, silent = true }) +vim.keymap.set('n', 'jcd', 'call jukit#cells#delete()', opts) -- Send current section (argument: 0 indicates the current section) -vim.api.nvim_set_keymap('n', 'jcc', ':call jukit#send#section(0)', { noremap = true, silent = true }) +vim.keymap.set('n', 'jcc', 'call jukit#send#section(0)', opts) -- Send all sections up to the current section -vim.api.nvim_set_keymap('n', 'jcac', ':call jukit#send#until_current_section()', { noremap = true, silent = true }) +vim.keymap.set('n', 'jcac', 'call jukit#send#until_current_section()', opts) -- Send all sections -vim.api.nvim_set_keymap('n', 'jca', ':call jukit#send#all()', { noremap = true, silent = true }) +vim.keymap.set('n', 'jca', 'call jukit#send#all()', opts) -- Open an output split -vim.api.nvim_set_keymap('n', 'jos', ':call jukit#splits#output()', { noremap = true, silent = true }) - - +vim.keymap.set('n', 'jos', 'call jukit#splits#output()', opts) diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua index e55c0ee..9e3c571 100644 --- a/.config/nvim/lua/plugins/lazy.lua +++ b/.config/nvim/lua/plugins/lazy.lua @@ -54,6 +54,10 @@ lazy.setup({ }) end }, + + 'vimpostor/vim-tpipeline', + + --Python notebooks { 'luk400/vim-jukit', @@ -121,21 +125,6 @@ lazy.setup({ end }, - { - - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - } - }, - { "folke/todo-comments.nvim", event = "VeryLazy", diff --git a/.config/nvim/lua/plugins/none-ls.lua b/.config/nvim/lua/plugins/none-ls.lua index 6980746..837ccac 100644 --- a/.config/nvim/lua/plugins/none-ls.lua +++ b/.config/nvim/lua/plugins/none-ls.lua @@ -4,7 +4,8 @@ local null_ls = require("null-ls") null_ls.setup({ sources = { null_ls.builtins.formatting.rustfmt, - null_ls.builtins.formatting.blue, + null_ls.builtins.formatting.black, + null_ls.builtins.diagnostics.flake8, null_ls.builtins.formatting.gofmt, null_ls.builtins.code_actions.shellcheck, null_ls.builtins.formatting.beautysh, diff --git a/.gitconfig-gh b/.gitconfig-gh new file mode 100644 index 0000000..8f3993e --- /dev/null +++ b/.gitconfig-gh @@ -0,0 +1,2 @@ +[user] + name = afonsofrancof