From 7fc4c4cb57ebea10ad276f8c9578ecadcb7348e2 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 14:36:52 +0100 Subject: edited nvim keybinds --- config/essentials/nvim/lua/tlast/remap.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'config/essentials/nvim/lua/tlast') diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua index 09589c4..56316f5 100644 --- a/config/essentials/nvim/lua/tlast/remap.lua +++ b/config/essentials/nvim/lua/tlast/remap.lua @@ -1,5 +1,5 @@ vim.g.mapleader = " " -vim.g.localleader = "\\" +vim.g.maplocalleader = "\\" vim.keymap.set("n", "-", vim.cmd.Ex) @@ -8,12 +8,6 @@ vim.keymap.set("i", "", "I") vim.keymap.set("i", "", "A") vim.keymap.set("i", "", "D") --- -- add closing -vim.keymap.set("i", '"', '""') --- vim.keymap.set("i", "'", "''") --- vim.keymap.set("i", "(", "()") --- vim.keymap.set("i", "[", "[]") --- vim.keymap.set("i", "{", "{}") vim.keymap.set("i", "{", "{}O") vim.keymap.set("i", "{;", "{};O") -- cgit v1.2.3 From 39e2b6d33070e09b3c50fe39bcd9dd326998a85c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 22:38:33 +0100 Subject: added ** to path option for neovim to find files --- config/essentials/nvim/lua/tlast/set.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/essentials/nvim/lua/tlast') diff --git a/config/essentials/nvim/lua/tlast/set.lua b/config/essentials/nvim/lua/tlast/set.lua index a89e2e3..b9a12f0 100644 --- a/config/essentials/nvim/lua/tlast/set.lua +++ b/config/essentials/nvim/lua/tlast/set.lua @@ -10,6 +10,8 @@ vim.opt.showcmd = true vim.opt.cursorline = true vim.opt.ruler = true +vim.opt.path:append("**") + vim.opt.wildmenu = true vim.opt.incsearch = true vim.opt.hlsearch = false -- cgit v1.2.3 From 55aaddc6ca3a4056f92de86f29a04baaaef183ca Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 22:39:11 +0100 Subject: remoade source keymap --- config/essentials/nvim/lua/tlast/remap.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config/essentials/nvim/lua/tlast') diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua index 56316f5..7c3088c 100644 --- a/config/essentials/nvim/lua/tlast/remap.lua +++ b/config/essentials/nvim/lua/tlast/remap.lua @@ -67,7 +67,10 @@ vim.keymap.set("n", "rl", [[:s/\<\>//gIw", "write") vim.keymap.set("n", "W", "write!") vim.keymap.set("n", "e", "edit") -vim.keymap.set("n", "", "source") +vim.keymap.set("n", "s", function () + vim.cmd.source() + print("sourced.") +end) -- Packer vim.keymap.set("n", "P", "PackerSync") -- cgit v1.2.3 From d9e412cb45695a32eb7e89973e86f91f0ee60e16 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 10 Mar 2023 00:06:01 +0100 Subject: cleaned up keybinds --- config/essentials/nvim/lua/tlast/remap.lua | 74 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 38 deletions(-) (limited to 'config/essentials/nvim/lua/tlast') diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua index 7c3088c..4ff789b 100644 --- a/config/essentials/nvim/lua/tlast/remap.lua +++ b/config/essentials/nvim/lua/tlast/remap.lua @@ -1,42 +1,43 @@ vim.g.mapleader = " " vim.g.maplocalleader = "\\" -vim.keymap.set("n", "-", vim.cmd.Ex) +-- -- vinegar is already doing this +-- vim.keymap.set("n", "-", vim.cmd.Ex) -- moving -vim.keymap.set("i", "", "I") -vim.keymap.set("i", "", "A") -vim.keymap.set("i", "", "D") +vim.keymap.set("i", "", "I", { noremap = true }) +vim.keymap.set("i", "", "A", { noremap = true }) +vim.keymap.set("i", "", "D", { noremap = true }) -vim.keymap.set("i", "{", "{}O") -vim.keymap.set("i", "{;", "{};O") +vim.keymap.set("i", "{", "{}O", { noremap = true }) +vim.keymap.set("i", "{;", "{};O", { noremap = true }) -- buffers -vim.keymap.set("n", "gb", "buffers:buffer") -vim.keymap.set("n", "q", "q!") -vim.keymap.set("n", "Q", "qa!") +vim.keymap.set("n", "gb", "buffers:buffer", { noremap = true }) +vim.keymap.set("n", "q", "q!", { noremap = true }) +vim.keymap.set("n", "Q", "qa!", { noremap = true }) -- Windows -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "h") -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "j") -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "k") -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "l") -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "o") +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "h", { noremap = true }) +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "j", { noremap = true }) +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "k", { noremap = true }) +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "l", { noremap = true }) +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "o", { noremap = true }) -- command line -vim.keymap.set("c", "", "") -vim.keymap.set("c", "", "") -vim.keymap.set("c", "", "") +vim.keymap.set("c", "", "", { noremap = true }) +vim.keymap.set("c", "", "", { noremap = true }) +vim.keymap.set("c", "", "", { noremap = true }) -- move visual selection up/down wards -vim.keymap.set("v", "J", "m '>+1gv=gv") -vim.keymap.set("v", "K", "m '<-2gv=gv") +vim.keymap.set("v", "J", "m '>+1gv=gv", { noremap = true }) +vim.keymap.set("v", "K", "m '<-2gv=gv", { noremap = true }) -- clipboard -vim.keymap.set("n", "y", "\"+y") -vim.keymap.set("n", "o", "OSCYank") +vim.keymap.set("n", "y", "\"+y", { noremap = true }) +vim.keymap.set("n", "o", "OSCYank", { noremap = true }) -- templates -vim.keymap.set("n", "rt", ":r " .. vim.fn.stdpath("config") .. "/templates/") +vim.keymap.set("n", "rt", ":-1r " .. vim.fn.stdpath("config") .. "/templates", { noremap = true }) -- hide all local s = {hidden_all = 0} @@ -53,40 +54,37 @@ vim.keymap.set("n", "", function () end) -- utils -vim.keymap.set("i", "r", "r!echo -n $RANDOMkJA") +vim.keymap.set("i", "r", "r!echo -n $RANDOMkJA", { noremap = true }) -- ordered list -vim.keymap.set("v", "n", "I0. gvg") -vim.keymap.set("v", "u", "'<,'>s/^[0-9]\\+\\. //") +vim.keymap.set("v", "n", "I0. gvg", { noremap = true }) +vim.keymap.set("v", "u", "'<,'>s/^[0-9]\\+\\. //", { noremap = true }) -- scripts -vim.keymap.set("n", "x", "!chmod +x %", { silent = true}) +vim.keymap.set("n", "x", "!chmod +x %", { noremap = true, silent = true}) -- replace -vim.keymap.set("n", "rf", [[:%s/\<\>//gI]]) -vim.keymap.set("n", "rl", [[:s/\<\>//gI]]) +vim.keymap.set("n", "sf", [[:%s/\<\>//gI]]) +vim.keymap.set("n", "sl", [[:s/\<\>//gI]]) -- write -vim.keymap.set("n", "w", "write") -vim.keymap.set("n", "W", "write!") -vim.keymap.set("n", "e", "edit") +vim.keymap.set("n", "w", "write", { noremap = true }) +vim.keymap.set("n", "W", "write!", { noremap = true }) +vim.keymap.set("n", "e", "edit", { noremap = true }) vim.keymap.set("n", "s", function () vim.cmd.source() print("sourced.") end) -- Packer -vim.keymap.set("n", "P", "PackerSync") +vim.keymap.set("n", "P", "PackerSync", { noremap = true }) -- spelling -vim.keymap.set("n", "", "setlocal spell!") +vim.keymap.set("n", "", "setlocal spell!", { noremap = true }) -- open terminal in file's parent director -- this needs to be asynchrous vim.keymap.set("n", "", function () local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid st" - vim.fn.jobstart(cmd, { - on_exit = function(job_id, exit_code, event_type) - -- Do nothing here - end - }) + -- asynchrous go brr + vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end }) end) -- cgit v1.2.3 From afd843b48cceca0f879bf026b5523c481ccebcdc Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 11 Mar 2023 12:09:47 +0100 Subject: added formatoptions and bash lsp --- config/common/newsboat/urls | 18 ++++---- config/essentials/nvim/ftplugin/all.lua | 1 + config/essentials/nvim/ftplugin/sh.lua | 1 + config/essentials/nvim/lua/tlast/cmp/bash.lua | 1 + config/essentials/nvim/lua/tlast/cmp/init.lua | 1 + config/essentials/nvim/lua/tlast/set.lua | 61 ++++++++++++++------------- 6 files changed, 45 insertions(+), 38 deletions(-) create mode 100644 config/essentials/nvim/ftplugin/all.lua create mode 100644 config/essentials/nvim/lua/tlast/cmp/bash.lua (limited to 'config/essentials/nvim/lua/tlast') diff --git a/config/common/newsboat/urls b/config/common/newsboat/urls index 743b55e..801d556 100644 --- a/config/common/newsboat/urls +++ b/config/common/newsboat/urls @@ -5,15 +5,15 @@ https://itsfoss.com/rss https://archlinux.org/feeds/news/ https://www.hln.be/home/rss.xml "---VIDEOS---" -https://www.youtube.com/feeds/videos.xml?channel_id=UCngn7SVujlvskHRvRKc1cTw -https://www.youtube.com/feeds/videos.xml?channel_id=UCVls1GmFKf6WlTraIb_IaJg -https://www.youtube.com/feeds/videos.xml?channel_id=UCsBjURrPoezykLs9EqgamOA -https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA -https://www.youtube.com/feeds/videos.xml?channel_id=UC7YOGHUfC1Tb6E4pudI9STA -https://www.youtube.com/feeds/videos.xml?channel_id=UC5UAwBUum7CPN5buc-_N1Fw -https://www.youtube.com/feeds/videos.xml?channel_id=UCbTp1BYjpuhDRG5OmgIT8iw -https://www.youtube.com/feeds/videos.xml?channel_id=UC_ML5xP23TOWKUcc-oAE_Eg -https://www.youtube.com/feeds/videos.xml?channel_id=UCx-ljiKQcLSd8_4AFi_yaIw +https://www.youtube.com/feeds/videos.xml?channel_id=UCngn7SVujlvskHRvRKc1cTw # Bugswrite +https://www.youtube.com/feeds/videos.xml?channel_id=UCVls1GmFKf6WlTraIb_IaJg # Distrotube +https://www.youtube.com/feeds/videos.xml?channel_id=UCsBjURrPoezykLs9EqgamOA # Fireship +https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA # Luke Smith +https://www.youtube.com/feeds/videos.xml?channel_id=UC7YOGHUfC1Tb6E4pudI9STA # Mental Outlaw +https://www.youtube.com/feeds/videos.xml?channel_id=UC5UAwBUum7CPN5buc-_N1Fw # The Linux Experiment +https://www.youtube.com/feeds/videos.xml?channel_id=UCbTp1BYjpuhDRG5OmgIT8iw # James Tomsaino +https://www.youtube.com/feeds/videos.xml?channel_id=UC_ML5xP23TOWKUcc-oAE_Eg # Hussein Nasser +https://www.youtube.com/feeds/videos.xml?channel_id=UCd3dNckv1Za2coSaHGHl5aA # TJ De vries http://vimcasts.org/feeds/ogg.rss "---REDDIT---" https://www.reddit.com/r/linux.rss diff --git a/config/essentials/nvim/ftplugin/all.lua b/config/essentials/nvim/ftplugin/all.lua new file mode 100644 index 0000000..1608f4e --- /dev/null +++ b/config/essentials/nvim/ftplugin/all.lua @@ -0,0 +1 @@ +vim.cmd("set formatoptions=cqrnj") diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua index 3ebb1c9..4b66c75 100644 --- a/config/essentials/nvim/ftplugin/sh.lua +++ b/config/essentials/nvim/ftplugin/sh.lua @@ -1,2 +1,3 @@ vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"setlocal nohls") vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: ${\\2}\"setlocal nohls") +vim.opt.formatoptions = "cqrnj" diff --git a/config/essentials/nvim/lua/tlast/cmp/bash.lua b/config/essentials/nvim/lua/tlast/cmp/bash.lua new file mode 100644 index 0000000..91b6fba --- /dev/null +++ b/config/essentials/nvim/lua/tlast/cmp/bash.lua @@ -0,0 +1 @@ +require'lspconfig'.bashls.setup{} diff --git a/config/essentials/nvim/lua/tlast/cmp/init.lua b/config/essentials/nvim/lua/tlast/cmp/init.lua index d932138..a80856c 100644 --- a/config/essentials/nvim/lua/tlast/cmp/init.lua +++ b/config/essentials/nvim/lua/tlast/cmp/init.lua @@ -1,6 +1,7 @@ require("tlast.cmp.setup") require("tlast.cmp.arduino") +require("tlast.cmp.bash") require("tlast.cmp.clangd") require("tlast.cmp.html") require("tlast.cmp.css") diff --git a/config/essentials/nvim/lua/tlast/set.lua b/config/essentials/nvim/lua/tlast/set.lua index b9a12f0..69ee4ae 100644 --- a/config/essentials/nvim/lua/tlast/set.lua +++ b/config/essentials/nvim/lua/tlast/set.lua @@ -1,40 +1,43 @@ -vim.opt.clipboard = "unnamed" +local opt = vim.opt -vim.opt.termguicolors = true +opt.clipboard = "unnamed" -vim.opt.number = true -vim.opt.relativenumber = true -vim.opt.showmatch = true -vim.opt.matchtime = 0 -vim.opt.showcmd = true -vim.opt.cursorline = true -vim.opt.ruler = true +opt.termguicolors = true -vim.opt.path:append("**") +opt.number = true +opt.relativenumber = true +opt.showmatch = true +opt.matchtime = 0 +opt.showcmd = true +opt.cursorline = true +opt.ruler = true -vim.opt.wildmenu = true -vim.opt.incsearch = true -vim.opt.hlsearch = false +opt.path:append("**") -vim.opt.mouse = "" +opt.wildmenu = true +opt.incsearch = true +opt.hlsearch = false -vim.opt.tabstop = 4 -vim.opt.shiftwidth = 4 -vim.opt.backspace = "indent,eol,start" +opt.mouse = "" -vim.opt.signcolumn = "yes" -vim.opt.updatetime = 100 -vim.opt.laststatus = 2 -vim.opt.history = 200 -vim.opt.encoding = "utf-8" +opt.tabstop = 4 +opt.shiftwidth = 4 +opt.backspace = "indent,eol,start" -vim.opt.smartindent = true -vim.opt.scrolloff = 8 +opt.signcolumn = "yes" +opt.updatetime = 100 +opt.laststatus = 2 +opt.history = 200 +opt.encoding = "utf-8" -vim.opt.ignorecase = true -vim.opt.smartcase = true +opt.smartindent = true +opt.scrolloff = 8 -vim.opt.swapfile = false -vim.opt.backup = false +opt.ignorecase = true +opt.smartcase = true -vim.opt.spelllang = "en_us,nl" +opt.swapfile = false +opt.backup = false + +opt.spelllang = "en_us,nl" +opt.formatoptions = "cqrnj" -- cgit v1.2.3 From 3446a509e160006e150b2b32581236cb1ca177b0 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 11 Mar 2023 14:30:38 +0100 Subject: added noremap to remap.lua --- config/essentials/nvim/lua/tlast/remap.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config/essentials/nvim/lua/tlast') diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua index 4ff789b..c2d4c0b 100644 --- a/config/essentials/nvim/lua/tlast/remap.lua +++ b/config/essentials/nvim/lua/tlast/remap.lua @@ -51,7 +51,7 @@ vim.keymap.set("n", "", function () vim.opt.showcmd = opt vim.opt.laststatus = opt and 2 or 0 vim.opt.signcolumn = opt and "yes" or "no" -end) +end, { noremap = true }) -- utils vim.keymap.set("i", "r", "r!echo -n $RANDOMkJA", { noremap = true }) @@ -71,7 +71,7 @@ vim.keymap.set("n", "e", "edit", { noremap = true }) vim.keymap.set("n", "s", function () vim.cmd.source() print("sourced.") -end) +end, { noremap = true }) -- Packer vim.keymap.set("n", "P", "PackerSync", { noremap = true }) @@ -85,7 +85,7 @@ vim.keymap.set("n", "", function () local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid st" -- asynchrous go brr vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end }) -end) +end, { noremap = true }) -- clear registers @@ -98,4 +98,4 @@ vim.keymap.set("n", "rc", function () for _, r in ipairs(regs) do vim.fn.setreg(r, {}) end -end) +end, { noremap = true }) -- cgit v1.2.3 From 21ebc25d535c49607d6f2c9f07ef9a06f8380a2a Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 12 Mar 2023 15:10:03 +0100 Subject: readded telescope-symbols --- config/essentials/nvim/lua/tlast/packer.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials/nvim/lua/tlast') diff --git a/config/essentials/nvim/lua/tlast/packer.lua b/config/essentials/nvim/lua/tlast/packer.lua index 2400ff9..931e7d4 100644 --- a/config/essentials/nvim/lua/tlast/packer.lua +++ b/config/essentials/nvim/lua/tlast/packer.lua @@ -6,6 +6,7 @@ return require('packer').startup(function(use) 'nvim-telescope/telescope.nvim', tag = '0.1.1', requires = { {'nvim-lua/plenary.nvim'} } } + use('nvim-telescope/telescope-symbols.nvim') use('theprimeagen/harpoon') -- colors -- cgit v1.2.3