From 95e243a13346d299ad1a8bb93009f91344c174f9 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Mon, 13 Mar 2023 17:07:59 -0400 Subject: [PATCH] Telescope Filebrowser keymap --- nvim/.config/nvim/lazy-lock.json | 74 +++++++++--------- nvim/.config/nvim/lua/plugins/init.lua | 27 +++++-- nvim/.config/nvim/lua/plugins/null-ls.lua | 29 ++++--- .../nvim/lua/plugins/nvim-lspconfig.lua | 51 ++++++++++++ nvim/.config/nvim/lua/plugins/telescope.lua | 3 +- nvim/.config/nvim/lua/settings/init.lua | 8 +- nvim/.config/nvim/spell/en.utf-8.add | 4 + nvim/.config/nvim/spell/en.utf-8.add.spl | Bin 3029 -> 3072 bytes tmuxinator/.config/tmuxinator/Flask.yml | 9 +++ 9 files changed, 142 insertions(+), 63 deletions(-) create mode 100644 nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua create mode 100644 tmuxinator/.config/tmuxinator/Flask.yml diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 09009a4..7712d0b 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "alpha-nvim": { "branch": "main", "commit": "d35b99e36e32040ba06c48a25b5bd3e75be2a566" }, + "alpha-nvim": { "branch": "main", "commit": "4e1c4dedf5983e84b3ed305228b2235c56c7023c" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" }, + "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -11,54 +11,54 @@ "colorschemes": { "branch": "master", "commit": "e29f32990d6e2c7c3a4763326194fbd847b49dac" }, "dracula.nvim": { "branch": "main", "commit": "798274ba3c454a9aa3cd71f95a86ea55cbbbb142" }, "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, - "friendly-snippets": { "branch": "main", "commit": "1645e7cd98ed99e766c84ab3cf13a1612c77dcee" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f1451ea7d9a9005b3f0bedeab20cef7a4c65993" }, - "glow.nvim": { "branch": "main", "commit": "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac" }, - "headlines.nvim": { "branch": "master", "commit": "1cd93a641c03419bb255f8b3fe734451517763b1" }, - "indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" }, - "lazy.nvim": { "branch": "main", "commit": "e916f41df26e33b01f1b3ebe28881090da3a7281" }, + "friendly-snippets": { "branch": "main", "commit": "2f5b8a41659a19bd602497a35da8d81f1e88f6d9" }, + "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" }, + "glow.nvim": { "branch": "main", "commit": "5a8ccfb1876b1b2e29ea32c63221be6df45870d1" }, + "headlines.nvim": { "branch": "master", "commit": "6496b6229ce708253a906daed07067c1d32a427b" }, + "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, + "lazy.nvim": { "branch": "main", "commit": "5b4444f0d7e556deba3f7ca949a2ba0e2c3369fb" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, - "lsp-colors.nvim": { "branch": "main", "commit": "d0b245232aeb197bbd097111d8b69621b0671edb" }, + "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "93e58e100f37ef4fb0f897deeed20599dae9d128" }, - "mason.nvim": { "branch": "main", "commit": "fecabaff94c34bf8ed9c3b2a45d42a5906ea251c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a81503f0019942111fe464209237f8b4e85f4687" }, + "mason.nvim": { "branch": "main", "commit": "10ff879fc56160e10437da5c1ca558371ddb6989" }, "mini.fuzzy": { "branch": "stable", "commit": "e8faf897330eadb1b1b76da67eeff04be85cbd8b" }, - "mini.move": { "branch": "main", "commit": "a0c5930e33e55467b0a9f3bca93d8f6fdbfac2e4" }, + "mini.move": { "branch": "main", "commit": "33c54f69a3d72aa3d22c73d1f6b11601d65caff4" }, "mini.pairs": { "branch": "stable", "commit": "4ebc1ff8d77fe75e8f219432302800ca29e17614" }, "mini.surround": { "branch": "main", "commit": "6a4f31e2a380439315729f561d7e7898bde1fd52" }, - "mini.trailspace": { "branch": "main", "commit": "8566ae0cf1524b263e489b6771d339025773189e" }, - "mkdnflow.nvim": { "branch": "main", "commit": "51cf944514e49662cca8a075b1a8f485c2c39d0f" }, + "mini.trailspace": { "branch": "main", "commit": "37b6517750353fb53b546494093461ccc319a7f4" }, + "mkdnflow.nvim": { "branch": "main", "commit": "555bdbaf1daae077000b54c63dec323056b43155" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, - "neovim": { "branch": "main", "commit": "845a6ad5443e3559dde42910c4523a5835c9233b" }, - "nord.nvim": { "branch": "main", "commit": "70df2b61de21b953fd577f292a973cd22e0ca686" }, - "null-ls.nvim": { "branch": "main", "commit": "a75bba0ae5e89df03f01c17a1d913884eeebcc2e" }, - "nvim": { "branch": "main", "commit": "b0ab85552b0f60ab7a0aa46f432e709c124f8153" }, - "nvim-cmp": { "branch": "main", "commit": "208d69f233d65526a22c6497ed57d0c80d99fa5f" }, - "nvim-dap": { "branch": "master", "commit": "82e98f340cf5183e1c8743a3986c5b2e8705063b" }, - "nvim-dap-python": { "branch": "master", "commit": "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531" }, - "nvim-lspconfig": { "branch": "master", "commit": "649137cbc53a044bffde36294ce3160cb18f32c7" }, - "nvim-mapper": { "branch": "main", "commit": "7585479199ad7c3fdfed47ae79d26198f948cfc5" }, - "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, - "nvim-tree.lua": { "branch": "master", "commit": "08a0aa1a3b7411ee0a7887c8818528b1558cef96" }, - "nvim-treesitter": { "branch": "master", "commit": "b44871afb59e456bbff4113e416405c06c991cf5" }, - "nvim-web-devicons": { "branch": "master", "commit": "bb6d4fd1e010300510172b173ab5205d37af084f" }, - "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" }, + "neovim": { "branch": "main", "commit": "1883d8b417403f1d8c56d52d90445bbbe6be4b80" }, + "nord.nvim": { "branch": "main", "commit": "c0c131e51768e8b0cadf01637e60ea3ac9a5ee70" }, + "null-ls.nvim": { "branch": "main", "commit": "09e99259f4cdd929e7fb5487bf9d92426ccf7cc1" }, + "nvim": { "branch": "main", "commit": "3861919e7f39cb09b8993ccd9881a4f875d8a7e4" }, + "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" }, + "nvim-dap": { "branch": "master", "commit": "73196075627a4f079c62b0dd4aff8ce0a1b7cf57" }, + "nvim-dap-python": { "branch": "master", "commit": "65ccab83fb3d0b29ead6c765c1c52a1ed49592e8" }, + "nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" }, + "nvim-lspconfig": { "branch": "master", "commit": "4bb0f1845c5cc6465aecedc773fc2d619fcd8faf" }, + "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" }, + "nvim-notify": { "branch": "master", "commit": "281e4d793c550c866bea3fb85d39de1f0188fb50" }, + "nvim-tree.lua": { "branch": "master", "commit": "fe980baa945100d92f77fe55e2ca113cae1b1bd3" }, + "nvim-treesitter": { "branch": "master", "commit": "834f1dcb8736c82b1269227b4bfe830310b5b6a1" }, + "nvim-web-devicons": { "branch": "master", "commit": "b8d0c99578dcb9d084a45ca4b3a4a502712c2741" }, + "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "prettier.nvim": { "branch": "main", "commit": "918b99f5ddd7a56395fd393767ab6a3c15a50789" }, + "prettier.nvim": { "branch": "main", "commit": "08f7f08fae57fd970c7470d883c9127f172bd9e6" }, "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "4a7a7d2746c1c11d0e26b9dd638a62df08692ae5" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "94fe37a1ea217dd2f90d91222bc1531521146ac3" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "7de3baef1ec4fb77f7a8195fe87bebd513244b6a" }, "telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" }, - "tmux.nvim": { "branch": "main", "commit": "feafcf8f48c49c720ee64e745648d69d42cb9c5a" }, - "todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" }, - "tokyonight.nvim": { "branch": "main", "commit": "a0abe53df53616d13da327636cb0bcac3ea7f5af" }, - "trouble.nvim": { "branch": "main", "commit": "556ef3089709a6e253df1e500381fec5eb48e48a" }, + "tmux.nvim": { "branch": "main", "commit": "9ba03cc5dfb30f1dc9eb50d0796dfdd52c5f454e" }, + "todo-comments.nvim": { "branch": "main", "commit": "6ccb0bebeb22dbe31940776a750db54b844ae653" }, + "tokyonight.nvim": { "branch": "main", "commit": "27203d70747094527d13575ed08f6a714e7a43f8" }, + "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, "vem-tabline": { "branch": "master", "commit": "8399cf77603b6c2110a39ea3efe1053f64b057aa" }, - "vim-wakatime": { "branch": "master", "commit": "ee4ab57adf62a309aeef383a2da23b6e48e5ae50" }, - "vista.vim": { "branch": "master", "commit": "33774aff5d8b224f24c2e4c6015c613c1a17bf74" }, - "which-key.nvim": { "branch": "main", "commit": "5224c261825263f46f6771f1b644cae33cd06995" } + "vim-wakatime": { "branch": "master", "commit": "62113bb063aa1923146e59270d71563441ceabe5" }, + "which-key.nvim": { "branch": "main", "commit": "fb027738340502b556c3f43051f113bcaa7e8e63" } } \ No newline at end of file diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index a6294ef..a9b6378 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -51,7 +51,7 @@ return { config = function() require("tmux").setup() end }, -- Find & Search LSP Tags - 'liuchengxu/vista.vim', +-- 'liuchengxu/vista.vim', -- Snippets 'rafamadriz/friendly-snippets', @@ -173,25 +173,36 @@ return { config = function() require("sidebar-nvim").setup({ sections = { - "symbols", "git", + "symbols", "diagnostics", "todos", + }, + todos = { + initially_closed = false, -- whether the groups should be initially closed on start. You can manually open/close groups later. + }, + diagnostics = { + icon = "", }, - initial_width = 45, - hide_statusline = true, - todos = { - initially_closed = false, -- whether the groups should be initially closed on start. You can manually open/close groups later. - } }) end }, +{ + 'rcarriga/nvim-dap-ui', dependencies = {"mfussenegger/nvim-dap"} +}, + --------------------------------------------------------- -- Text, Icons, Symbols ---------------------------------------------------------- + { + 'simrat39/symbols-outline.nvim', + config = function() + require('symbols-outline').setup() + end + }, + 'lukas-reineke/indent-blankline.nvim', - 'simrat39/symbols-outline.nvim', -- 'nvim-tree/nvim-web-devicons', 'folke/lsp-colors.nvim', 'karb94/neoscroll.nvim', diff --git a/nvim/.config/nvim/lua/plugins/null-ls.lua b/nvim/.config/nvim/lua/plugins/null-ls.lua index e91ddba..991f2be 100644 --- a/nvim/.config/nvim/lua/plugins/null-ls.lua +++ b/nvim/.config/nvim/lua/plugins/null-ls.lua @@ -4,17 +4,20 @@ return { 'nvim-lua/plenary.nvim', }, config = function () - local null_ls = require'null-ls' - null_ls.setup({ - debug = true, - sources = { - null_ls.builtins.completion.spell, - null_ls.builtins.diagnostics.codespell, - null_ls.builtins.diagnostics.markdownlint.with({ extra_args = { "--disable", "MD013", "MD024", "--" } - ,}), - null_ls.builtins.diagnostics.pycodestyle.with({ extra_args = { "--max-line-length=150" }}), - null_ls.builtins.formatting.black.with({ extra_args = { "--fast" }}), - }, - }) - end + local null_ls = require'null-ls' + null_ls.setup({ + debug = true, + sources = { + null_ls.builtins.completion.spell, + null_ls.builtins.diagnostics.codespell, + null_ls.builtins.diagnostics.markdownlint.with({ extra_args = { "--disable", "MD013", "MD024", "--" } + ,}), + null_ls.builtins.diagnostics.ruff, + null_ls.builtins.diagnostics.pylama, + -- null_ls.builtins.diagnostics.pylint, + -- null_ls.builtins.diagnostics.pycodestyle.with({ extra_args = { "--max-line-length=150" }}), + null_ls.builtins.formatting.black.with({ extra_args = { "--fast" }}), + }, + }) + end } diff --git a/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua new file mode 100644 index 0000000..fafa3ca --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua @@ -0,0 +1,51 @@ +return { + 'neovim/nvim-lspconfig', + config = function() + -- Mappings. + -- See `:help vim.diagnostic.*` for documentation on any of the below functions + local opts = { noremap=true, silent=true } + vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) + vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) + vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) + vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) + + -- Use an on_attach function to only map the following keys + -- after the language server attaches to the current buffer + local on_attach = function(client, bufnr) + -- Enable completion triggered by + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap=true, silent=true, buffer=bufnr } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) + end + + local lsp_flags = { + -- This is the default in Nvim 0.7+ + debounce_text_changes = 150, + } + require('lspconfig')['pyright'].setup{ + on_attach = on_attach, + flags = lsp_flags, + } + require('lspconfig')['tsserver'].setup{ + on_attach = on_attach, + flags = lsp_flags, + } + end +} diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua index a0de994..0aa6c44 100644 --- a/nvim/.config/nvim/lua/plugins/telescope.lua +++ b/nvim/.config/nvim/lua/plugins/telescope.lua @@ -138,7 +138,8 @@ return { [""] = fb_actions.copy, [""] = fb_actions.rename, [""] = fb_actions.goto_cwd, - [""] = fb_actions.open + [""] = fb_actions.open, + [""] = fb_actions.remove }, }, }, diff --git a/nvim/.config/nvim/lua/settings/init.lua b/nvim/.config/nvim/lua/settings/init.lua index 516a229..e6a4710 100755 --- a/nvim/.config/nvim/lua/settings/init.lua +++ b/nvim/.config/nvim/lua/settings/init.lua @@ -35,8 +35,8 @@ opt.number = true -- Show line number opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor. opt.showmatch = true -- Highlight matching parenthesis opt.foldmethod = 'syntax' -- Enable folding (default 'foldmarker') -opt.colorcolumn = '120' -- Line length marker at 80 columns -opt.textwidth = 120 +opt.colorcolumn = '100' -- Line length marker at 80 columns +opt.textwidth = 100 opt.splitright = true -- Vertical split to the right opt.splitbelow = true -- Horizontal split to the bottom opt.ignorecase = true -- Ignore case letters when search @@ -68,9 +68,9 @@ opt.smartindent = true -- Autoindent new lines ----------------------------------------------------------- g.glow_binary_path = '/bin' g.glow_border = 'rounded' -g.glow_width = 120 +g.glow_width = 100 g.glow_use_pager = true -g.glow_style = 'dark' +g.glow_style = 'light' ----------------------------------------------------------- -- MKDX Settings, mkdx#settings. ----------------------------------------------------------- diff --git a/nvim/.config/nvim/spell/en.utf-8.add b/nvim/.config/nvim/spell/en.utf-8.add index 78fee19..11719a0 100644 --- a/nvim/.config/nvim/spell/en.utf-8.add +++ b/nvim/.config/nvim/spell/en.utf-8.add @@ -287,3 +287,7 @@ Unific AIIM FOMO Async +zendesk +centre +centres +consisently diff --git a/nvim/.config/nvim/spell/en.utf-8.add.spl b/nvim/.config/nvim/spell/en.utf-8.add.spl index 76a5084857d17049520253947ccdb753b0bba18e..48eb3826a954808539cfffdb84ec6beeb34b4894 100644 GIT binary patch delta 813 zcmXX^O=}ZT6n*#2N75A9g+jY1Mg?mX7ge(mtYQ(Vf`SbqVh3T8nb_A%GQ-TIO@c_V zf~ZsjGOeREjbkH=Q;6b1SS&JQq@q{k9cQz_VuB26C$VG zvb09^yn9Ys!@BFu1^GTX1?x}skcYP6&O6wZvxv4m?pe=)}B zF^u~!e7tyiVj)13KtTiLR??#m47KKb685xyRJ>EpdMIc@Xo3Xiz7JPf_VJrJQ~G=H z6iw>i#qzTa#cxqntkYgIJAg&v(Ho|tou;lbOLUZWSWp*cJd delta 781 zcmXX^O=}ZT6rKAfGig!?h@uhWCukKH!IFjeMf?IQ2yGV{WHyszlDy0$Go8t#O*VdP z6mjK~QltnjEr`Z0>?T5gg#HS50bMAx=T2PAo4NO%d+vGX&eQylBe{nQ52C>Fy!ky% zGuKDC4@7PCg|3=Jnr6jnk8YpP>m3e!a;Qok`BdX#$>npcvmJ}Kbf+OS&P8M+D_%=# z04b@@#H4qhKQl=Ng{qwYvQ zNJLwC)Z2tVF*f(L-UyIbWxs!G0#{-R${ZKQFBN3Y zUnqvA?X;x73Z=a2)Nh-rqSXfxQ;8iH8b~u+YBzK9qC2&BHK7ZDh@mC<+ZL