Refactoring
- Added macos
This commit is contained in:
parent
03a7616e8c
commit
2c1ccaffd1
47 changed files with 76 additions and 33 deletions
23
global/.config/nvim/lua/core/autocmds.lua
Normal file
23
global/.config/nvim/lua/core/autocmds.lua
Normal file
|
@ -0,0 +1,23 @@
|
|||
-- auto-format on save
|
||||
local lsp_fmt_group = vim.api.nvim_create_augroup("LspFormattingGroup", {})
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = lsp_fmt_group,
|
||||
callback = function()
|
||||
local efm = vim.lsp.get_active_clients({ name = "efm" })
|
||||
|
||||
if vim.tbl_isempty(efm) then
|
||||
return
|
||||
end
|
||||
|
||||
vim.lsp.buf.format({ name = "efm", async = true })
|
||||
end,
|
||||
})
|
||||
|
||||
-- highlight on yank
|
||||
local highlight_yank_group = vim.api.nvim_create_augroup("HighlightYankGroup", {})
|
||||
vim.api.nvim_create_autocmd("TextYankPost", {
|
||||
group = highlight_yank_group,
|
||||
callback = function()
|
||||
vim.highlight.on_yank()
|
||||
end,
|
||||
})
|
59
global/.config/nvim/lua/core/keymaps.lua
Normal file
59
global/.config/nvim/lua/core/keymaps.lua
Normal file
|
@ -0,0 +1,59 @@
|
|||
local mapkey = require("utils.keymapper").mapvimkey
|
||||
|
||||
-- Buffer Navigation
|
||||
mapkey("<leader>bn", "bnext", "n") -- Next buffer
|
||||
mapkey("<leader>bp", "bprevious", "n") -- Prev buffer
|
||||
mapkey("<leader>bb", "e #", "n") -- Switch to Other Buffer
|
||||
mapkey("<leader>`", "e #", "n") -- Switch to Other Buffer
|
||||
mapkey("<leader>bc", "bd", "n") -- Close the buffer
|
||||
|
||||
-- Directory Navigatio}n
|
||||
mapkey("<leader>m", "NvimTreeFocus", "n")
|
||||
mapkey("<leader>e", "NvimTreeToggle", "n")
|
||||
|
||||
-- Pane and Window Navigation
|
||||
mapkey("<C-h>", "<C-w>h", "n") -- Navigate Left
|
||||
mapkey("<C-j>", "<C-w>j", "n") -- Navigate Down
|
||||
mapkey("<C-k>", "<C-w>k", "n") -- Navigate Up
|
||||
mapkey("<C-l>", "<C-w>l", "n") -- Navigate Right
|
||||
mapkey("<C-h>", "wincmd h", "t") -- Navigate Left
|
||||
mapkey("<C-j>", "wincmd j", "t") -- Navigate Down
|
||||
mapkey("<C-k>", "wincmd k", "t") -- Navigate Up
|
||||
mapkey("<C-l>", "wincmd l", "t") -- Navigate Right
|
||||
mapkey("<C-h>", "TmuxNavigateLeft", "n") -- Navigate Left
|
||||
mapkey("<C-j>", "TmuxNavigateDown", "n") -- Navigate Down
|
||||
mapkey("<C-k>", "TmuxNavigateUp", "n") -- Navigate Up
|
||||
mapkey("<C-l>", "TmuxNavigateRight", "n") -- Navigate Right
|
||||
|
||||
-- Window Management
|
||||
mapkey("<leader>sv", "vsplit", "n") -- Split Vertically
|
||||
mapkey("<leader>sh", "split", "n") -- Split Horizontally
|
||||
mapkey("<C-Up>", "resize +2", "n")
|
||||
mapkey("<C-Down>", "resize -2", "n")
|
||||
mapkey("<C-Left>", "vertical resize +2", "n")
|
||||
mapkey("<C-Right>", "vertical resize -2", "n")
|
||||
|
||||
-- Show Full File-Path
|
||||
mapkey("<leader>pa", "echo expand('%:p')", "n") -- Show Full File Path
|
||||
|
||||
-- Notes
|
||||
mapkey("<leader>ng", "Neorg workspace general", "n")
|
||||
mapkey("<leader>nw", "Neorg workspace work", "n")
|
||||
mapkey("<leader>ny", "Neorg workspace youtube", "n")
|
||||
|
||||
-- Indenting
|
||||
vim.keymap.set("v", "<", "<gv", { silent = true, noremap = true })
|
||||
vim.keymap.set("v", ">", ">gv", { silent = true, noremap = true })
|
||||
|
||||
local api = vim.api
|
||||
|
||||
-- Zen Mode
|
||||
api.nvim_set_keymap("n", "<leader>zn", ":TZNarrow<CR>", {})
|
||||
api.nvim_set_keymap("v", "<leader>zn", ":'<,'>TZNarrow<CR>", {})
|
||||
api.nvim_set_keymap("n", "<leader>sm", ":TZFocus<CR>", {})
|
||||
api.nvim_set_keymap("n", "<leader>zm", ":TZMinimalist<CR>", {})
|
||||
api.nvim_set_keymap("n", "<leader>za", ":TZAtaraxis<CR>", {})
|
||||
|
||||
-- Comments
|
||||
api.nvim_set_keymap("n", "<C-_>", "gtc", { noremap = false })
|
||||
api.nvim_set_keymap("v", "<C-_>", "goc", { noremap = false })
|
41
global/.config/nvim/lua/core/lazy.lua
Normal file
41
global/.config/nvim/lua/core/lazy.lua
Normal file
|
@ -0,0 +1,41 @@
|
|||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
local plugins = "plugins"
|
||||
|
||||
local opts = {
|
||||
defaults = {
|
||||
lazy = true,
|
||||
},
|
||||
install = {
|
||||
colorscheme = { "nightfox" },
|
||||
},
|
||||
rtp = {
|
||||
disabled_plugins = {
|
||||
"gzip",
|
||||
"matchit",
|
||||
"matchparen",
|
||||
"netrw",
|
||||
"netrwPlugin",
|
||||
"tarPlugin",
|
||||
"tohtml",
|
||||
"tutor",
|
||||
"zipPlugin",
|
||||
},
|
||||
},
|
||||
change_detection = {
|
||||
notify = false,
|
||||
},
|
||||
}
|
||||
|
||||
require("lazy").setup(plugins, opts)
|
49
global/.config/nvim/lua/core/options.lua
Normal file
49
global/.config/nvim/lua/core/options.lua
Normal file
|
@ -0,0 +1,49 @@
|
|||
local opt = vim.opt
|
||||
|
||||
-- Tab / Indentation
|
||||
opt.tabstop = 2
|
||||
opt.shiftwidth = 2
|
||||
opt.softtabstop = 2
|
||||
opt.expandtab = true
|
||||
opt.smartindent = true
|
||||
opt.wrap = false
|
||||
|
||||
-- Search
|
||||
opt.incsearch = true
|
||||
opt.ignorecase = true
|
||||
opt.smartcase = true
|
||||
opt.hlsearch = false
|
||||
|
||||
-- Appearance
|
||||
opt.number = true
|
||||
opt.relativenumber = false
|
||||
opt.termguicolors = true
|
||||
opt.colorcolumn = "100"
|
||||
opt.signcolumn = "yes"
|
||||
-- opt.signcolumn = "number"
|
||||
opt.cmdheight = 1
|
||||
opt.scrolloff = 10
|
||||
opt.completeopt = "menuone,noinsert,noselect"
|
||||
-- opt.guicursor = ""
|
||||
opt.showmode = false
|
||||
-- opt.tabline = '%!v:lua.require("utils").tabline()'
|
||||
|
||||
-- Behaviour
|
||||
opt.hidden = true
|
||||
opt.errorbells = false
|
||||
opt.swapfile = false
|
||||
opt.backup = false
|
||||
opt.undodir = vim.fn.expand("~/.vim/undodir")
|
||||
opt.undofile = true
|
||||
opt.backspace = "indent,eol,start"
|
||||
opt.splitright = true
|
||||
opt.splitbelow = true
|
||||
opt.autochdir = false
|
||||
opt.iskeyword:append("-")
|
||||
opt.mouse:append("a")
|
||||
opt.clipboard:append("unnamedplus")
|
||||
opt.modifiable = true
|
||||
-- opt.guicursor =
|
||||
-- "n-v-c:block,i-ci-ve:block,r-cr:hor20,o:hor50,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor,sm:block-blinkwait175-blinkoff150-blinkon175"
|
||||
opt.encoding = "UTF-8"
|
||||
opt.cursorline = false
|
Loading…
Add table
Add a link
Reference in a new issue