inkletblot/config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated, pretty much finished, nvim config :D

Browse Source
This commit is contained in:
Solomon Laing 2022-08-23 17:03:37 +09:30
parent e2b02e081b
commit 641cc38811
17 changed files with 248 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.config/nvim/init.lua
View File

@ -14,7 +14,7 @@ require("user.comment")
require("user.gitsigns")
require("user.nvim-tree")
require("user.bufferline")
require("user.toggleterm")
require("user.toggleterm") -- Need to look into this and how it's configured.
require("user.project")
require("user.impatient")
require("user.indentline")
@ -23,26 +23,27 @@ require("user.whichkey")
-- Not sure I want to use this yet.
-- require "user.hop"
require("user.matchup")
require "user.numb"
require("user.numb")
require("user.colorizer")
require "user.spectre"
require("user.spectre")
require("user.zen-mode")
require("user.neoscroll")
require("user.todo-comments")
require("user.symbol-outline")
require("user.symbol-outline") -- not working? look into further...
require("user.notify")
require("user.ts-context")
-- I can look at this in Chritian Chiarulli's config if I wish, for now I can't be bothered.
-- require("user.copilot")
require("user.functions")
require("user.illuminate")
require("user.dap")
require "user.lir"
require("user.dap") -- Need to work this one out.
-- require("user.lir")
require("user.winbar")
require("user.nvim-webdev-icons")
require "user.fidget"
require("user.fidget")
require("user.dressing")
require("user.browse")
require("user.surround")
require("user.harpoon")
require("user.surround") -- This need reconfiguration and fixing
require("user.harpoon") -- mark files and navigate them through a nice ui or with keys (good for large codebases)
require("user.vim-slash")
require("user.lualine")

44
.config/nvim/lua/user/alpha.lua
View File

@ -13,14 +13,40 @@ end
local icons = require "user.icons"
-- dashboard.section.header.val = {
-- [[ __ ]],
-- [[ ___ ___ ___ __ __ /\_\ ___ ___ ]],
-- [[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]],
-- [[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]],
-- [[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]],
-- [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]],
-- }
-- dashboard.section.header.val = {
-- [[ ▟▙ ]],
-- [[ ▝▘ ]],
-- [[ ██▃▅▇█▆▖ ▗▟████▙▖ ▄████▄ ██▄ ▄██ ██ ▗▟█▆▄▄▆█▙▖]],
-- [[ ██▛▔ ▝██ ██▄▄▄▄██ ██▛▔▔▜██ ▝██ ██▘ ██ ██▛▜██▛▜██]],
-- [[ ██ ██ ██▀▀▀▀▀▘ ██▖ ▗██ ▜█▙▟█▛ ██ ██ ██ ██]],
-- [[ ██ ██ ▜█▙▄▄▄▟▊ ▀██▙▟██▀ ▝████▘ ██ ██ ██ ██]],
-- [[ ▀▀ ▀▀ ▝▀▀▀▀▀ ▀▀▀▀ ▀▀ ▀▀ ▀▀ ▀▀ ▀▀]],
-- }
-- ▄▀▀▄ ▀▄ ▄▀▀█▄▄▄▄ ▄▀▀▀▀▄ ▄▀▀▄ ▄▀▀▄ ▄▀▀█▀▄ ▄▀▀▄ ▄▀▄
-- █ █ █ █ ▐ ▄▀ ▐ █ █ █ █ █ █ █ █ █ █ ▀ █
-- ▐ █ ▀█ █▄▄▄▄▄ █ █ ▐ █ █ ▐ █ ▐ ▐ █ █
-- █ █ █ ▌ ▀▄ ▄▀ █ ▄▀ █ █ █
-- ▄▀ █ ▄▀▄▄▄▄ ▀▀▀▀ ▀▄▀ ▄▀▀▀▀▀▄ ▄▀ ▄▀
-- █ ▐ █ ▐ █ █ █ █
-- ▐ ▐ ▐ ▐ ▐ ▐
dashboard.section.header.val = {
[[ __ ]],
[[ ___ ___ ___ __ __ /\_\ ___ ___ ]],
[[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]],
[[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]],
[[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]],
[[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]],
[[ , __ ___ __. _ __ ` , _ , _ ]],
[[ |' `. .' ` .' \ | / | |' `|' `.]],
[[ | | |----' | | ` / | | | |]],
[[ / | `.___, `._.' \/ / / ' /]],
}
dashboard.section.buttons.val = {
button("f", icons.documents.Files .. " Find file", ":Telescope find_files <CR>"),
button("e", icons.ui.NewFile .. " New file", ":ene <BAR> startinsert <CR>"),
@ -37,7 +63,11 @@ local function footer()
-- local fortune = handle:read("*a")
-- handle:close()
-- return fortune
return "inkletblot.com"
return {
[[┬┌┐┌┬┌─┬ ┌─┐┌┬┐┌┐ ┬ ┌─┐┌┬┐┌─┐┌─┐┌┬┐]],
[[││││├┴┐│ ├┤ │ ├┴┐│ │ │ │ │ │ ││││]],
[[┴┘└┘┴ ┴┴─┘└─┘ ┴ └─┘┴─┘└─┘ ┴o└─┘└─┘┴ ┴]],
}
end
dashboard.section.footer.val = footer()

27
.config/nvim/lua/user/autocommands.lua
View File

@ -38,17 +38,6 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
end,
})
vim.api.nvim_create_autocmd({ "FileType" }, {
pattern = { "Jaq" },
callback = function()
vim.cmd [[
nnoremap <silent> <buffer> <m-r> :close<CR>
" nnoremap <silent> <buffer> <m-r> <NOP>
set nobuflisted
]]
end,
})
vim.api.nvim_create_autocmd({ "BufEnter" }, {
pattern = { "" },
callback = function()
@ -170,17 +159,6 @@ vim.api.nvim_create_autocmd({ "CursorHold" }, {
end,
})
-- vim.api.nvim_create_autocmd({ "ModeChanged" }, {
-- callback = function()
-- local luasnip = require "luasnip"
-- if luasnip.expand_or_jumpable() then
-- -- ask maintainer for option to make this silent
-- -- luasnip.unlink_current()
-- vim.cmd [[silent! lua require("luasnip").unlink_current()]]
-- end
-- end,
-- })
vim.api.nvim_create_autocmd({ "BufWritePost" }, {
pattern = { "*.ts" },
callback = function()
@ -188,10 +166,13 @@ vim.api.nvim_create_autocmd({ "BufWritePost" }, {
end,
})
-- Prevent auto comment on next line
vim.cmd [[autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o]]
-- Set filetype to tex for .tex files?
vim.cmd [[autocmd BufRead,BufNewFile *.tex set filetype=tex]]
-- Trim whitespace from files on save
vim.cmd [[
autocmd BufWritePre * let currPos = getpos(".")
autocmd BufWritePre * %s/\s\+$//e
@ -200,6 +181,8 @@ autocmd BufWritePre *.[ch] %s/\%$/\r/e
autocmd BufWritePre * cal cursor(currPos[1], currPos[2])
]]
-- Recompile and restart Xmonad on save of config file for Xmonad or Xmobar
vim.cmd [[autocmd BufWritePost ~/.xmonad/xmonad.hs,~/.config/xmobar/xmobar-main.hs,~/.config/xmobar/xmobar-sub.hs,~/.config/xmobar/xmobar-single.hs !xmonad --recompile && xmonad --restart]]
-- Run custom textclear command when exiting a .tex file (cleanup files)
vim.cmd [[autocmd VimLeave *.tex !texclear %]]

7
.config/nvim/lua/user/browse.lua
View File

@ -8,6 +8,7 @@ browse.setup {
}
local bookmarks = {
"https://duckduckgo.com/",
"https://www.chrisatmachine.com/",
"https://github.com/christianchiarulli",
"https://github.com/rockerBOO/awesome-neovim",
@ -15,8 +16,6 @@ local bookmarks = {
"https://doc.rust-lang.org/book/",
"https://aur.archlinux.org/packages/",
"https://news.ycombinator.com/",
-- "https://github.com/neovim/neovim",
-- "https://neovim.discourse.group/",
}
local function command(name, rhs, opts)
@ -53,4 +52,6 @@ local opts = { noremap = true, silent = true }
local keymap = vim.api.nvim_set_keymap
keymap("n", "<m-o>", "<cmd>BrowseBookmarks<cr>", opts)
keymap("n", "<m-i>", "<cmd>BrowseInputSearch<cr>", opts)
-- Broken, causes segfault.
-- keymap("n", "<m-i>", "<cmd>BrowseInputSearch<cr>", opts)

23
.config/nvim/lua/user/cmp.lua
View File

@ -28,11 +28,6 @@ local compare = require "cmp.config.compare"
require("luasnip/loaders/from_vscode").lazy_load()
-- local check_backspace = function()
-- local col = vim.fn.col "." - 1
-- return col == 0 or vim.fn.getline("."):sub(col, col):match "%s"
-- end
local check_backspace = function()
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil
@ -42,6 +37,7 @@ local icons = require "user.icons"
local kind_icons = icons.kind
-- I don't have most of the following but they can serve as future examples
vim.api.nvim_set_hl(0, "CmpItemKindCopilot", { fg = "#6CC644" })
vim.api.nvim_set_hl(0, "CmpItemKindTabnine", { fg = "#CA42F0" })
vim.api.nvim_set_hl(0, "CmpItemKindEmoji", { fg = "#FDE030" })
@ -69,7 +65,6 @@ cmp.setup {
["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }),
["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }),
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
["<m-o>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
-- ["<C-y>"] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
["<C-c>"] = cmp.mapping {
i = cmp.mapping.abort(),
@ -170,15 +165,11 @@ cmp.setup {
end,
},
sources = {
{ name = "crates", group_index = 1 },
{
name = "crates", group_index = 1 },
{
name = "copilot",
-- keyword_length = 0,
max_item_count = 3,
-- trigger_characters = {
-- { ".", ":", "(", "'", '"', "[", ",", "#", "*", "@", "|", "=", "-", "{", "/", "\\", "+", "?", " ", "\t", "\n" },
-- },
group_index = 2,
},
{
@ -213,8 +204,6 @@ cmp.setup {
sorting = {
priority_weight = 2,
comparators = {
-- require("copilot_cmp.comparators").prioritize,
-- require("copilot_cmp.comparators").score,
compare.offset,
compare.exact,
-- compare.scopes,
@ -225,8 +214,6 @@ cmp.setup {
compare.sort_text,
compare.length,
compare.order,
-- require("copilot_cmp.comparators").prioritize,
-- require("copilot_cmp.comparators").score,
},
},
confirm_opts = {
@ -235,10 +222,6 @@ cmp.setup {
},
window = {
documentation = false,
-- documentation = {
-- border = "rounded",
-- winhighlight = "NormalFloat:Pmenu,NormalFloat:Pmenu,CursorLine:PmenuSel,Search:None",
-- },
completion = {
border = "rounded",
winhighlight = "NormalFloat:Pmenu,NormalFloat:Pmenu,CursorLine:PmenuSel,Search:None",

4
.config/nvim/lua/user/copilot.lua
View File

@ -1,3 +1,7 @@
-- NOTE!
-- I AM NOT USING THIS, IT'S HERE IF I CHOOSE TO IN THE FUTURE!
-- PROBABLY NOT THOUGH...
-- For copilot.vim
-- vim.g.copilot_filetypes = {
-- ["*"] = false,

1
.config/nvim/lua/user/harpoon.lua
View File

@ -7,4 +7,5 @@ local h_status_ok, harpoon = pcall(require, "harpoon")
if not h_status_ok then
return
end
telescope.load_extension "harpoon"

3
.config/nvim/lua/user/hop.lua
View File

@ -1,3 +1,6 @@
-- NOTE!
-- Not using this currently, might be useful in future but for now I'm happy with default nvim.
local status_ok, hop = pcall(require, "hop")
if not status_ok then
return

7
.config/nvim/lua/user/icons.lua
View File

@ -6,14 +6,15 @@
kind = {
Text = "",
-- Method = "m",
-- Function = "",
Function = "",
-- Constructor = "",
Method = "",
Function = "",
-- Function = "",
Constructor = "",
Field = "",
-- Variable = "",
Variable = "",
Namespace = "פּ",
Class = "",
Interface = "",
-- Module = "",
@ -22,6 +23,7 @@
Unit = "",
Value = "",
Enum = "",
Key = "k",
-- Keyword = "",
Keyword = "",
-- Snippet = "",
@ -42,6 +44,7 @@
Number = "",
String = "",
Boolean = "蘒",
Null = "ﳠ",
Object = "",
},
documents = {

14
.config/nvim/lua/user/illuminate.lua
View File

@ -1,3 +1,11 @@
vim.g.Illuminate_ftblacklist = { "alpha", "NvimTree", "DressingSelect", "harpoon" }
vim.api.nvim_set_keymap("n", "<a-n>", '<cmd>lua require"illuminate".next_reference{wrap=true}<cr>', { noremap = true })
vim.api.nvim_set_keymap("n", "<a-p>", '<cmd>lua require"illuminate".next_reference{reverse=true,wrap=true}<cr>', { noremap = true })
require('illuminate').configure({
providers = {
'lsp',
'treesitter',
'regex',
},
delay = 100,
filetypes_denylist = {
'alpha',
},
})

16
.config/nvim/lua/user/keymaps.lua
View File

@ -57,15 +57,8 @@ keymap("n", "<leader>o", ":setlocal spell! spelllang=en_us<CR>", opts)
-- Tree
keymap("n", "<leader>n", ":NvimTreeToggle<CR>", opts)
-- Telescope
keymap("n", "<leader>ff", ":Telescope find_files<CR>", opts)
keymap("n", "<leader>ft", ":Telescope live_grep<CR>", opts)
keymap("n", "<leader>fp", ":Telescope projects<CR>", opts)
keymap("n", "<leader>fb", ":Telescope buffers<CR>", opts)
keymap("n", "<leader>fr", ":Telescope oldfiles<CR>", opts)
-- Goyo
keymap("n", "<leader>f", ":Goyo<CR>", opts)
-- keymap("n", "<leader>f", ":Goyo<CR>", opts)
-- Copy and Paste
keymap("n", "<C-c>", '"+y', opts)
@ -88,7 +81,6 @@ keymap("n", "w!!", 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!',
-- ZenMode
keymap("n", "<C-z>", "<cmd>ZenMode<cr>", opts)
-- Temporary till I work out whichkey.
keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
keymap("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
-- Save
keymap("i", "<C-s>", "<ESC>:w<CR>a", opts)
keymap("n", "<C-s>", ":w<CR>", opts)

21
.config/nvim/lua/user/lsp/handlers.lua
View File

@ -97,16 +97,16 @@ end
local function lsp_keymaps(bufnr)
local opts = { noremap = true, silent = true }
vim.api.nvim_buf_set_keymap(bufnr, "n", "gd", "<cmd>Telescope lsp_definitions<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gD", "<cmd>Telescope lsp_declarations<CR>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gd", "<cmd>Telescope lsp_definitions<CR>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gD", "<cmd>Telescope lsp_declarations<CR>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gI", "<cmd>Telescope lsp_implementations<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", "<cmd>Telescope lsp_references<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gl", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
vim.cmd [[ command! Format execute 'lua vim.lsp.buf.format({ async = true })' ]]
vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<M-f>", "<cmd>Format<cr>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<M-a>", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gI", "<cmd>Telescope lsp_implementations<CR>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", "<cmd>Telescope lsp_references<CR>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gl", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
-- vim.cmd [[ command! Format execute 'lua vim.lsp.buf.format({ async = true })' ]]
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "<M-f>", "<cmd>Format<cr>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "<M-a>", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "<M-s>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
@ -118,8 +118,7 @@ end
M.on_attach = function(client, bufnr)
lsp_keymaps(bufnr)
-- This is currently broken, not sure why.
-- lsp_highlight_document(client)
lsp_highlight_document(client)
attach_navic(client, bufnr)
if client.name == "tsserver" then

54
.config/nvim/lua/user/navic.lua
View File

@ -1,5 +1,6 @@
local status_ok, navic = pcall(require, "nvim-navic")
if not status_ok then
print("navic error!")
return
end
@ -8,32 +9,32 @@ local icons = require "user.icons"
navic.setup {
icons = {
File = '',
Module = '',
Namespace = '',
Package = '',
Class = '',
Method = '',
Property = '',
Field = '',
Constructor = '',
Enum = '',
Interface = '',
Function = '',
Variable = '',
Constant = '',
String = '',
Number = '',
Boolean = '',
Array = '',
Object = '',
Key = '',
Null = '',
EnumMember = '',
Struct = '',
Event = '',
Operator = '',
TypeParameter = ''
File = icons.kind.File,
Module = icons.kind.Module,
Namespace = icons.kind.Namespace,
Package = icons.ui.Package,
Class = icons.kind.Class,
Method = icons.kind.Method,
Property = icons.kind.Property,
Field = icons.kind.Field,
Constructor = icons.kind.Constructor,
Enum = icons.kind.Enum,
Interface = icons.kind.Interface,
Function = icons.kind.Function,
Variable = icons.kind.Variable,
Constant = icons.kind.Constant,
String = icons.type.String,
Number = icons.type.Number,
Boolean = icons.type.Boolean,
Array = icons.type.Array,
Object = icons.type.Object,
Key = icons.kind.Key,
Null = icons.type.Null,
EnumMember = icons.kind.EnumMember,
Struct = icons.kind.Struct,
Event = icons.kind.Event,
Operator = icons.kind.Operator,
TypeParameter = icons.kind.TypeParameter
},
highlight = true,
@ -41,4 +42,3 @@ navic.setup {
depth_limit = 0,
depth_limit_indicator = "..",
}

4
.config/nvim/lua/user/neoscroll.lua
View File

@ -26,8 +26,8 @@ local t = {}
-- t['<C-e>'] = {'scroll', { '0.10', 'false', '100'}}
-- t['H'] = {'scroll', {'-0.10', 'true', '100'}}
-- t['L'] = {'scroll', { '0.10', 'true', '100'}}
t["<c-k>"] = { "scroll", { "-vim.wo.scroll", "true", "250" } }
t["<c-j>"] = { "scroll", { "vim.wo.scroll", "true", "250" } }
-- t["<c-k>"] = { "scroll", { "-vim.wo.scroll", "true", "250" } }
-- t["<c-j>"] = { "scroll", { "vim.wo.scroll", "true", "250" } }
-- t['zt'] = {'zt', {'250'}}
-- t['zz'] = {'zz', {'250'}}
-- t['zb'] = {'zb', {'250'}}

9
.config/nvim/lua/user/plugins.lua
View File

@ -64,7 +64,7 @@ return packer.startup(function(use)
use "simrat39/symbols-outline.nvim"
use "b0o/SchemaStore.nvim"
use "RRethy/vim-illuminate"
use "j-hui/fidget.nvim"
use "j-hui/fidget.nvim" -- displays LSP progress in bottom right
use "lvimuser/lsp-inlayhints.nvim"
-- use "simrat39/inlay-hints.nvim"
use "https://git.sr.ht/~whynothugo/lsp_lines.nvim"
@ -88,7 +88,7 @@ return packer.startup(function(use)
use "kylechui/nvim-surround"
-- Marks
use "christianchiarulli/harpoon"
use "christianchiarulli/harpoon" -- mark files and navigate them through a nice ui or with keys (good for large codebases)
use "MattesGroeger/vim-bookmarks"
-- Fuzzy Finder/Telescope
@ -109,13 +109,14 @@ return packer.startup(function(use)
-- Utility
use "rcarriga/nvim-notify"
use "stevearc/dressing.nvim"
use "stevearc/dressing.nvim" -- extends the vim api for window (window dressing)
use "ghillb/cybu.nvim"
use "moll/vim-bbye"
use "lewis6991/impatient.nvim"
use "lalitmee/browse.nvim"
use 'junegunn/goyo.vim'
use 'junegunn/limelight.vim'
use 'folke/trouble.nvim'
-- Icon
use "kyazdani42/nvim-web-devicons"
@ -140,7 +141,7 @@ return packer.startup(function(use)
-- File Explorer
use "kyazdani42/nvim-tree.lua"
use "christianchiarulli/lir.nvim"
-- use "christianchiarulli/lir.nvim"
-- Comment
use "numToStr/Comment.nvim"

2
.config/nvim/lua/user/toggleterm.lua
View File

@ -5,7 +5,7 @@ end
toggleterm.setup {
size = 20,
open_mapping = [[<m-0>]],
open_mapping = [[<C-0>]],
hide_numbers = true,
shade_filetypes = {},
shade_terminals = true,

70
.config/nvim/lua/user/whichkey.lua
View File

@ -108,7 +108,6 @@ local m_mappings = {
}
local mappings = {
-- ["1"] = "which_key_ignore",
a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Action" },
b = { "<cmd>Telescope buffers<cr>", "Buffers" },
e = { "<cmd>NvimTreeToggle<cr>", "Explorer" },
@ -118,7 +117,6 @@ local mappings = {
-- h = { "<cmd>nohlsearch<CR>", "No HL" },
q = { '<cmd>lua require("user.functions").smart_quit()<CR>', "Quit" },
["/"] = { '<cmd>lua require("Comment.api").toggle.linewise.current()<CR>', "Comment" },
-- ["c"] = { "<cmd>Bdelete!<CR>", "Close Buffer" },
c = { "<cmd>Bdelete!<CR>", "Close Buffer" },
-- :lua require'lir.float'.toggle()
@ -130,7 +128,6 @@ local mappings = {
-- P = { "<cmd>lua require('telescope').extensions.projects.projects()<cr>", "Projects" },
-- ["R"] = { '<cmd>lua require("renamer").rename()<cr>', "Rename" },
-- ["z"] = { "<cmd>ZenMode<cr>", "Zen" },
["gy"] = "Link",
B = {
name = "Browse",
@ -159,26 +156,6 @@ local mappings = {
l = { '<cmd>lua require("user.functions").toggle_option("cursorline")<cr>', "Cursorline" },
s = { '<cmd>lua require("user.functions").toggle_option("spell")<cr>', "Spell" },
t = { '<cmd>lua require("user.functions").toggle_tabline()<cr>', "Tabline" },
},
-- s = {
-- name = "Split",
-- s = { "<cmd>split<cr>", "HSplit" },
-- v = { "<cmd>vsplit<cr>", "VSplit" },
-- },
s = {
name = "Session",
s = { "<cmd>SaveSession<cr>", "Save" },
r = { "<cmd>RestoreSession<cr>", "Restore" },
x = { "<cmd>DeleteSession<cr>", "Delete" },
f = { "<cmd>Autosession search<cr>", "Find" },
d = { "<cmd>Autosession delete<cr>", "Find Delete" },
-- a = { ":SaveSession<cr>", "test" },
-- a = { ":RestoreSession<cr>", "test" },
-- a = { ":RestoreSessionFromFile<cr>", "test" },
-- a = { ":DeleteSession<cr>", "test" },
},
r = {
@ -201,12 +178,6 @@ local mappings = {
x = { "<cmd>lua require'dap'.terminate()<cr>", "Exit" },
},
-- nnoremap <silent> <leader>B :lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>
-- nnoremap <silent> <leader>lp :lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>
-- require("dapui").open()
-- require("dapui").close()
-- require("dapui").toggle()
f = {
name = "Find",
b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
@ -216,7 +187,6 @@ local mappings = {
s = { "<cmd>Telescope grep_string<cr>", "Find String" },
h = { "<cmd>Telescope help_tags<cr>", "Help" },
H = { "<cmd>Telescope highlights<cr>", "Highlights" },
i = { "<cmd>lua require('telescope').extensions.media_files.media_files()<cr>", "Media" },
l = { "<cmd>Telescope resume<cr>", "Last Search" },
M = { "<cmd>Telescope man_pages<cr>", "Man Pages" },
r = { "<cmd>Telescope oldfiles<cr>", "Recent File" },
@ -246,15 +216,6 @@ local mappings = {
"<cmd>Gitsigns diffthis HEAD<cr>",
"Diff",
},
G = {
name = "Gist",
a = { "<cmd>Gist -b -a<cr>", "Create Anon" },
d = { "<cmd>Gist -d<cr>", "Delete" },
f = { "<cmd>Gist -f<cr>", "Fork" },
g = { "<cmd>Gist -b<cr>", "Create" },
l = { "<cmd>Gist -l<cr>", "List" },
p = { "<cmd>Gist -b -p<cr>", "Create Private" },
},
},
l = {
@ -295,22 +256,17 @@ local mappings = {
u = { "<cmd>LuaSnipUnlinkCurrent<cr>", "Unlink Snippet" },
},
-- s = {
-- name = "Surround",
-- ["."] = { "<cmd>lua require('surround').repeat_last()<cr>", "Repeat" },
-- a = { "<cmd>lua require('surround').surround_add(true)<cr>", "Add" },
-- d = { "<cmd>lua require('surround').surround_delete()<cr>", "Delete" },
-- r = { "<cmd>lua require('surround').surround_replace()<cr>", "Replace" },
-- q = { "<cmd>lua require('surround').toggle_quotes()<cr>", "Quotes" },
-- b = { "<cmd>lua require('surround').toggle_brackets()<cr>", "Brackets" },
-- },
s = {
name = "Surround",
["."] = { "<cmd>lua require('surround').repeat_last()<cr>", "Repeat" },
a = { "<cmd>lua require('surround').surround_add(true)<cr>", "Add" },
d = { "<cmd>lua require('surround').surround_delete()<cr>", "Delete" },
r = { "<cmd>lua require('surround').surround_replace()<cr>", "Replace" },
q = { "<cmd>lua require('surround').toggle_quotes()<cr>", "Quotes" },
b = { "<cmd>lua require('surround').toggle_brackets()<cr>", "Brackets" },
},
S = {
-- name = "Session",
-- s = { "<cmd>SaveSession<cr>", "Save" },
-- l = { "<cmd>LoadLastSession!<cr>", "Load Last" },
-- d = { "<cmd>LoadCurrentDirSession!<cr>", "Load Last Dir" },
-- f = { "<cmd>Telescope sessions save_current=false<cr>", "Find Session" },
name = "SnipRun",
c = { "<cmd>SnipClose<cr>", "Close" },
f = { "<cmd>%SnipRun<cr>", "Run File" },
@ -342,14 +298,6 @@ local mappings = {
p = { "<cmd>TSPlaygroundToggle<cr>", "Playground" },
r = { "<cmd>TSToggle rainbow<cr>", "Rainbow" },
},
-- z = {
-- name = "Zen",
-- z = { "<cmd>TZAtaraxis<cr>", "Zen" },
-- m = { "<cmd>TZMinimalist<cr>", "Minimal" },
-- n = { "<cmd>TZNarrow<cr>", "Narrow" },
-- f = { "<cmd>TZFocus<cr>", "Focus" },
-- },
}
local vopts = {