diff --git a/lazy-lock.json b/lazy-lock.json index 5b68657..d94479b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,7 +11,6 @@ "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, - "hover.nvim": { "branch": "main", "commit": "24a43e0eda924f1f32361c76ee9a1f0e8cc25650" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lazygit.nvim": { "branch": "main", "commit": "3c524ebec6072568064235c407195e9f9fd0cb8a" }, @@ -25,6 +24,7 @@ "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "statuscol.nvim": { "branch": "main", "commit": "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc" }, "telekasten.nvim": { "branch": "main", "commit": "b3ac2b07f2df504bb80112fec349714086a80037" }, "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 2e7322b..b01260a 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -20,7 +20,7 @@ vim.keymap.set("n", "snf", "set nonu") vim.keymap.set("n", "n", "nzz", { silent = true }) vim.keymap.set("n", "N", "Nzz", { silent = true }) vim.keymap.set("n", "", "zz", { silent = true }) -vim.keymap.set("n", "", "zz", { silent = true }) +vim.keymap.set("n", "<`C-i>", "zz", { silent = true }) vim.keymap.set("n", "", "zz", { silent = true }) vim.keymap.set("n", "", "zz", { silent = true }) vim.keymap.set('n', 'a', 'm9ggVG"+y`9') @@ -44,8 +44,8 @@ local function toggle_fold() end is_all_folded = not is_all_folded end -vim.api.nvim_set_keymap("n", "ft", "za", opts) -- toggle fold under cursor -vim.keymap.set("n", "fs", toggle_fold, opts) -- close all folds +vim.api.nvim_set_keymap("n", "ft", "za", opts) -- toggle fold under cursor +vim.keymap.set("n", "fs", toggle_fold, opts) -- close all folds -- Quickly open some buffers vim.keymap.set('n', 'occ', ':e ~/.config/nvim/init.lua`.zz') @@ -75,7 +75,6 @@ vim.keymap.set('n', 'oho', ':e ~/nixos/hosts') vim.keymap.set('n', 'll', ':Lazy') vim.keymap.set('n', 'sw', function() - local word = vim.fn.expand("") local replacement = vim.fn.input("Replace '" .. word .. "' with: ") if replacement ~= "" then @@ -202,8 +201,8 @@ vim.keymap.set("n", "r", vim.fn.system(cmd) if vim.v.shell_error == 0 then local git_root = vim.fn.systemlist('git -C ' .. - vim.fn.fnameescape(current_file) .. ' rev-parse --show-toplevel') - [1] + vim.fn.fnameescape(current_file) .. ' rev-parse --show-toplevel') + [1] vim.cmd('cd ' .. vim.fn.fnameescape(git_root)) else vim.cmd('cd ' .. vim.fn.fnameescape(current_file)) @@ -217,6 +216,6 @@ vim.keymap.set('n', 'ok', function() local day_of_week = os.date("%a") local path = "~/storage/notes/calendar/calendar_" .. os.date("%Y") .. ".txt" local keys = ":e " .. - path .. "/" .. current_date .. " w" .. tonumber(week_number) .. " " .. day_of_week .. "$" + path .. "/" .. current_date .. " w" .. tonumber(week_number) .. " " .. day_of_week .. "$" vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(keys, true, false, true), 'n', true) end) diff --git a/lua/config/options.lua b/lua/config/options.lua index f11e46e..1261d35 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -1,6 +1,7 @@ vim.o.shiftwidth = 4; vim.o.tabstop = 4; vim.o.number = true; +vim.opt.relativenumber = true vim.o.ignorecase = true; -- Disable mouse completly @@ -17,7 +18,8 @@ vim.opt.termguicolors = true --vim.g.loaded_netrw = 1 --vim.g.loaded_netrwPlugin = 1 -vim.opt.signcolumn = "yes" +--vim.opt.signcolumn = "number" +vim.opt.signcolumn = "yes:1" -- Enable Treesitter-based folding vim.opt.foldmethod = "expr" diff --git a/snippets/go.lua b/snippets/go.lua deleted file mode 100644 index 30b0345..0000000 --- a/snippets/go.lua +++ /dev/null @@ -1,17 +0,0 @@ -local ls = require("luasnip") -local s = ls.snippet -local t = ls.text_node -local i = ls.insert_node - -return { - s("cfo", { -- check for error - t("if err != nil {"), t({ "", "\t" }), - i(1, "return err"), - t({ "", "}" }) - }), - s("struct", { - t("type "), i(1, "MyStruct"), t(" struct {"), - t({ "", "\t" }), i(2, "Field type"), - t({ "", "}" }) - }), -}