From dfe212fdf0bf414493fccb1bfbcef6f30c6cab73 Mon Sep 17 00:00:00 2001 From: srdusr Date: Mon, 24 Oct 2022 00:11:06 +0200 Subject: Resort files into different directories --- lua/user/keys.lua | 25 +++++++++++++------------ lua/user/pack.lua | 31 +++++++++++++++++++++---------- lua/user/utils.lua | 48 +++++++++++++++++++++++++++++------------------- 3 files changed, 63 insertions(+), 41 deletions(-) (limited to 'lua/user') diff --git a/lua/user/keys.lua b/lua/user/keys.lua index 1a2994b..bc1f874 100644 --- a/lua/user/keys.lua +++ b/lua/user/keys.lua @@ -26,7 +26,7 @@ vim.g.mapleader = ";" --vim.g.maplocalleader = ";" -- "jj" to exit insert-mode -map("i", "jj", "") +map("i", "kk", "") -- save quickly --map("n", ";w", ":w", d("Save buffer")) @@ -40,16 +40,17 @@ map("i", "jj", "") --vim.api.nvim_set_keymap("n", "", "lua ReloadConfig()", { noremap = true, silent = false }) map("n", "", "luafile ~/.config/nvim/init.lua", print ("Nvim configuration reloaded")) --- + +map("n", "tc", ":lua require('user.utils').toggle_completion()") -- vim.notify("Nvim configuration reloaded!", vim.log.levels.INFO) --vim.api.nvim_set_keymap('n', 'qr', ':lua require("plugins.telescope").reload()', { noremap = true, silent = true }) --Easier split navigations, just ctrl-j instead of ctrl-w then j ---map("n", "", "") ---map("n", "", "") ---map("n", "", "") ---map("n", "", "") +map("n", "", "") +map("n", "", "") +map("n", "", "") +map("n", "", "") -- Combine buffers list with buffer name map("n", "b", ":buffers:buffer") @@ -151,12 +152,12 @@ map("v", "p", '"_dP') -- Paste end of line --map("n", ",", "$p") -vim.cmd([[ - nmap , $p -]]) +--vim.cmd([[ +-- nmap , $p +--]]) -- Select entire buffer -map("v", "", "ggG") +--map("v", "", "ggG") -- Delete without changing the registers --map('n', 'x', '"_x') @@ -349,8 +350,8 @@ vim.cmd([[ --EasyAlign /--/ --:'<,'>Tabularize /-- -map("n", ",", ":hide") -map("n", ".", ":unhide") +--map("n", ",", ":hide") +--map("n", ".", ":unhide") --" Clean trailing whitespace --nnoremap ww mz:%s/\s\+$//:let @/=''`z diff --git a/lua/user/pack.lua b/lua/user/pack.lua index 55b52cd..05999eb 100644 --- a/lua/user/pack.lua +++ b/lua/user/pack.lua @@ -43,6 +43,7 @@ packer.init({ return packer.startup(function(use) use("wbthomason/packer.nvim") -- Have packer manage itself + use("lewis6991/impatient.nvim") use("nvim-lua/plenary.nvim") -- Useful lua functions used ny lots of plugins --use("jose-elias-alvarez/null-ls.nvim") @@ -175,7 +176,7 @@ return packer.startup(function(use) -- snippets --use("L3MON4D3/LuaSnip") --snippet engine - use({"L3MON4D3/LuaSnip", tag = "v.*"}) + use("L3MON4D3/LuaSnip") use("rafamadriz/friendly-snippets") -- a bunch of snippets to use --use("github/copilot.vim") --use({ @@ -302,7 +303,7 @@ return packer.startup(function(use) -- Utilities use("nathom/filetype.nvim") - --use("christoomey/vim-tmux-navigator") + use("christoomey/vim-tmux-navigator") --use("preservim/vimux") use("myusuf3/numbers.vim") use("windwp/nvim-autopairs") @@ -310,20 +311,30 @@ return packer.startup(function(use) use("dinhhuy258/git.nvim") -- For git blame & browse use("kyazdani42/nvim-tree.lua") use("numToStr/Comment.nvim") - use("akinsho/toggleterm.nvim") + --use("akinsho/toggleterm.nvim") --use("godlygeek/tabular") --use("Vonr/align.nvim") --use("junegunn/vim-easy-align") --use("dstein64/vim-startuptime") use("tweekmonster/startuptime.vim") - use("lewis6991/impatient.nvim") -- use("luukvbaal/stabilize.nvim") - --use({ - -- "ggandor/leap.nvim", - -- config = function() - -- require("leap").set_default_keymaps() - -- end, - --}) + --use("rhysd/clever-f.vim") + --use("ggandor/lightspeed.nvim") -- use 'cl' and 'cc' instead of 's' and 'S' respectively + --use("ggandor/leap.nvim") + use({ + "ggandor/leap.nvim", + config = function() + require("leap").set_default_keymaps() + --vim.keymap.set('n', '-', '(leap-forward)', {}) + --vim.keymap.set('n', '_', '(leap-backward)', {}) + end, + }) + use({ "ggandor/flit.nvim", + config = function() + require("flit").setup() + end, + }) + --use("Shatur/neovim-session-manager") --use("rmagatti/auto-session") --use("rmagatti/session-lens") diff --git a/lua/user/utils.lua b/lua/user/utils.lua index ab1473f..3c6f89e 100644 --- a/lua/user/utils.lua +++ b/lua/user/utils.lua @@ -31,6 +31,35 @@ function M.may_create_dir(dir) end end +-- toggle cmp completion +vim.g.cmp_toggle_flag = false -- initialize +local normal_buftype = function() + return vim.api.nvim_buf_get_option(0, "buftype") ~= "prompt" +end +M.toggle_completion = function() + local ok, cmp = pcall(require, "cmp") + if ok then + local next_cmp_toggle_flag = not vim.g.cmp_toggle_flag + if next_cmp_toggle_flag then + print("completion on") + else + print("completion off") + end + cmp.setup({ + enabled = function() + vim.g.cmp_toggle_flag = next_cmp_toggle_flag + if next_cmp_toggle_flag then + return normal_buftype + else + return next_cmp_toggle_flag + end + end, + }) + else + print("completion not available") + end +end + function M.get_nvim_version() local actual_ver = vim.version() @@ -38,25 +67,6 @@ function M.get_nvim_version() return nvim_ver_str end ---- Generate random integers in the range [Low, High], inclusive, ---- adapted from https://stackoverflow.com/a/12739441/6064933 ---- @low: the lower value for this range ---- @high: the upper value for this range -function M.rand_int(low, high) - -- Use lua to generate random int, see also: https://stackoverflow.com/a/20157671/6064933 - math.randomseed(os.time()) - - return math.random(low, high) -end - ---- Select a random element from a sequence/list. ---- @seq: the sequence to choose an element -function M.rand_element(seq) - local idx = M.rand_int(1, #seq) - - return seq[idx] -end - function M.add_pack(name) local status, error = pcall(vim.cmd, "packadd " .. name) -- cgit v1.2.3