mirror of
https://github.com/Ascyii/nvim.git
synced 2026-01-01 04:04:24 -05:00
Played around with the signcolum
This commit is contained in:
@@ -11,7 +11,6 @@
|
|||||||
"gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
|
"gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
|
||||||
"gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" },
|
"gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" },
|
||||||
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
|
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
|
||||||
"hover.nvim": { "branch": "main", "commit": "24a43e0eda924f1f32361c76ee9a1f0e8cc25650" },
|
|
||||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
||||||
"lazygit.nvim": { "branch": "main", "commit": "3c524ebec6072568064235c407195e9f9fd0cb8a" },
|
"lazygit.nvim": { "branch": "main", "commit": "3c524ebec6072568064235c407195e9f9fd0cb8a" },
|
||||||
@@ -25,6 +24,7 @@
|
|||||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
|
"nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||||
|
"statuscol.nvim": { "branch": "main", "commit": "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc" },
|
||||||
"telekasten.nvim": { "branch": "main", "commit": "b3ac2b07f2df504bb80112fec349714086a80037" },
|
"telekasten.nvim": { "branch": "main", "commit": "b3ac2b07f2df504bb80112fec349714086a80037" },
|
||||||
"telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" },
|
"telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ vim.keymap.set("n", "<leader>snf", "<cmd>set nonu<CR>")
|
|||||||
vim.keymap.set("n", "n", "nzz", { silent = true })
|
vim.keymap.set("n", "n", "nzz", { silent = true })
|
||||||
vim.keymap.set("n", "N", "Nzz", { silent = true })
|
vim.keymap.set("n", "N", "Nzz", { silent = true })
|
||||||
vim.keymap.set("n", "<C-o>", "<C-o>zz", { silent = true })
|
vim.keymap.set("n", "<C-o>", "<C-o>zz", { silent = true })
|
||||||
vim.keymap.set("n", "<C-i>", "<C-i>zz", { silent = true })
|
vim.keymap.set("n", "<`C-i>", "<C-i>zz", { silent = true })
|
||||||
vim.keymap.set("n", "<C-u>", "<C-u>zz", { silent = true })
|
vim.keymap.set("n", "<C-u>", "<C-u>zz", { silent = true })
|
||||||
vim.keymap.set("n", "<C-d>", "<C-d>zz", { silent = true })
|
vim.keymap.set("n", "<C-d>", "<C-d>zz", { silent = true })
|
||||||
vim.keymap.set('n', '<leader>a', 'm9ggVG"+y`9')
|
vim.keymap.set('n', '<leader>a', 'm9ggVG"+y`9')
|
||||||
@@ -44,8 +44,8 @@ local function toggle_fold()
|
|||||||
end
|
end
|
||||||
is_all_folded = not is_all_folded
|
is_all_folded = not is_all_folded
|
||||||
end
|
end
|
||||||
vim.api.nvim_set_keymap("n", "<leader>ft", "za", opts) -- toggle fold under cursor
|
vim.api.nvim_set_keymap("n", "<leader>ft", "za", opts) -- toggle fold under cursor
|
||||||
vim.keymap.set("n", "<leader>fs", toggle_fold, opts) -- close all folds
|
vim.keymap.set("n", "<leader>fs", toggle_fold, opts) -- close all folds
|
||||||
|
|
||||||
-- Quickly open some buffers
|
-- Quickly open some buffers
|
||||||
vim.keymap.set('n', '<leader>occ', ':e ~/.config/nvim/init.lua<CR>`.zz')
|
vim.keymap.set('n', '<leader>occ', ':e ~/.config/nvim/init.lua<CR>`.zz')
|
||||||
@@ -75,7 +75,6 @@ vim.keymap.set('n', '<leader>oho', ':e ~/nixos/hosts<CR>')
|
|||||||
vim.keymap.set('n', '<leader>ll', ':Lazy<CR>')
|
vim.keymap.set('n', '<leader>ll', ':Lazy<CR>')
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>sw', function()
|
vim.keymap.set('n', '<leader>sw', function()
|
||||||
|
|
||||||
local word = vim.fn.expand("<cword>")
|
local word = vim.fn.expand("<cword>")
|
||||||
local replacement = vim.fn.input("Replace '" .. word .. "' with: ")
|
local replacement = vim.fn.input("Replace '" .. word .. "' with: ")
|
||||||
if replacement ~= "" then
|
if replacement ~= "" then
|
||||||
@@ -202,8 +201,8 @@ vim.keymap.set("n", "<leader>r",
|
|||||||
vim.fn.system(cmd)
|
vim.fn.system(cmd)
|
||||||
if vim.v.shell_error == 0 then
|
if vim.v.shell_error == 0 then
|
||||||
local git_root = vim.fn.systemlist('git -C ' ..
|
local git_root = vim.fn.systemlist('git -C ' ..
|
||||||
vim.fn.fnameescape(current_file) .. ' rev-parse --show-toplevel')
|
vim.fn.fnameescape(current_file) .. ' rev-parse --show-toplevel')
|
||||||
[1]
|
[1]
|
||||||
vim.cmd('cd ' .. vim.fn.fnameescape(git_root))
|
vim.cmd('cd ' .. vim.fn.fnameescape(git_root))
|
||||||
else
|
else
|
||||||
vim.cmd('cd ' .. vim.fn.fnameescape(current_file))
|
vim.cmd('cd ' .. vim.fn.fnameescape(current_file))
|
||||||
@@ -217,6 +216,6 @@ vim.keymap.set('n', '<leader>ok', function()
|
|||||||
local day_of_week = os.date("%a")
|
local day_of_week = os.date("%a")
|
||||||
local path = "~/storage/notes/calendar/calendar_" .. os.date("%Y") .. ".txt"
|
local path = "~/storage/notes/calendar/calendar_" .. os.date("%Y") .. ".txt"
|
||||||
local keys = ":e " ..
|
local keys = ":e " ..
|
||||||
path .. "<CR>/" .. current_date .. " w" .. tonumber(week_number) .. " " .. day_of_week .. "<CR>$"
|
path .. "<CR>/" .. current_date .. " w" .. tonumber(week_number) .. " " .. day_of_week .. "<CR>$"
|
||||||
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(keys, true, false, true), 'n', true)
|
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(keys, true, false, true), 'n', true)
|
||||||
end)
|
end)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
vim.o.shiftwidth = 4;
|
vim.o.shiftwidth = 4;
|
||||||
vim.o.tabstop = 4;
|
vim.o.tabstop = 4;
|
||||||
vim.o.number = true;
|
vim.o.number = true;
|
||||||
|
vim.opt.relativenumber = true
|
||||||
vim.o.ignorecase = true;
|
vim.o.ignorecase = true;
|
||||||
|
|
||||||
-- Disable mouse completly
|
-- Disable mouse completly
|
||||||
@@ -17,7 +18,8 @@ vim.opt.termguicolors = true
|
|||||||
--vim.g.loaded_netrw = 1
|
--vim.g.loaded_netrw = 1
|
||||||
--vim.g.loaded_netrwPlugin = 1
|
--vim.g.loaded_netrwPlugin = 1
|
||||||
|
|
||||||
vim.opt.signcolumn = "yes"
|
--vim.opt.signcolumn = "number"
|
||||||
|
vim.opt.signcolumn = "yes:1"
|
||||||
|
|
||||||
-- Enable Treesitter-based folding
|
-- Enable Treesitter-based folding
|
||||||
vim.opt.foldmethod = "expr"
|
vim.opt.foldmethod = "expr"
|
||||||
|
|||||||
@@ -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({ "", "}" })
|
|
||||||
}),
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user