Compare commits
46 Commits
4e205dd040
...
list
| Author | SHA1 | Date | |
|---|---|---|---|
| 2f6161a917 | |||
| b1d3afc7d8 | |||
| dc4a294bc7 | |||
| d4d1d5ef23 | |||
| 00a84209f8 | |||
| bfd35215c7 | |||
| 2dbad0ebdf | |||
| 699304de12 | |||
| 54583572b8 | |||
| ebbf7b99ae | |||
| 458f46cef4 | |||
| e4ca0941d5 | |||
| 4069c13d0d | |||
| b3413957d3 | |||
| 86f495c878 | |||
| 9814c1a966 | |||
| c08235014a | |||
| 1ee43ea0ae | |||
| 7d2555b42f | |||
| 89abb2744f | |||
| a86c559502 | |||
| 5ccc55acc1 | |||
| ff327001e4 | |||
| daf05a0684 | |||
| 5be1c4a058 | |||
| 40ee634f58 | |||
| 69670a07ce | |||
| 269882e420 | |||
| 1091d71798 | |||
| 6ab45cfe73 | |||
| c901bb0dc1 | |||
| cfc13d1567 | |||
| e8b1d00fc8 | |||
| 8b13ced135 | |||
| 88c1e905aa | |||
| 3f09dba214 | |||
| 8eb23777f4 | |||
| 8c2a4f1a90 | |||
| 7254c723e8 | |||
| eb70be50e6 | |||
| f4c409ee0c | |||
| 95e243a133 | |||
| 5948052590 | |||
| defa706a8c | |||
| dbe8da155a | |||
| 53e45cb96e |
BIN
nvim/.config/nvim/lua/.DS_Store → .DS_Store
vendored
BIN
nvim/.config/nvim/lua/.DS_Store → .DS_Store
vendored
Binary file not shown.
22
README.md
Normal file
22
README.md
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
```
|
||||||
|
_ _ _
|
||||||
|
| \ | | (_)
|
||||||
|
| \| | ___ _ __ _ __ ___ __ __ _ _ __ ___
|
||||||
|
| . ` | / _ \ | '__|| '_ ` _ \\ \ / /| || '_ ` _ \
|
||||||
|
| |\ || (_) || | | | | | | |\ V / | || | | | | |
|
||||||
|
|_| \_| \___/ |_| |_| |_| |_| \_/ |_||_| |_| |_|
|
||||||
|
```
|
||||||
|
|
||||||
|
### Welcome to my setup
|
||||||
|
|
||||||
|
Most of the times I'm writing in Markdown or Python. I'll also manage my servers from a similar environment which is mostly yaml and bash scripts. Here's a few images.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
BIN
images/neovim1.png
Normal file
BIN
images/neovim1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 184 KiB |
BIN
images/neovim2.png
Normal file
BIN
images/neovim2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 226 KiB |
BIN
images/neovim3.png
Normal file
BIN
images/neovim3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 345 KiB |
BIN
images/neovim4.png
Normal file
BIN
images/neovim4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 271 KiB |
BIN
images/neovim5.png
Normal file
BIN
images/neovim5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 269 KiB |
@ -1,22 +1,23 @@
|
|||||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||||
if not vim.loop.fs_stat(lazypath) then
|
if not vim.loop.fs_stat(lazypath) then
|
||||||
vim.fn.system({
|
vim.fn.system({
|
||||||
"git",
|
"git",
|
||||||
"clone",
|
"clone",
|
||||||
"--filter=blob:none",
|
"--filteer=blob:none",
|
||||||
"https://github.com/folke/lazy.nvim.git",
|
"https://github.com/folke/lazy.nvim.git",
|
||||||
"--branch=stable", -- latest stable release
|
"--branch=stable", -- latest stable release
|
||||||
lazypath,
|
lazypath,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
vim.opt.rtp:prepend(lazypath)
|
vim.opt.rtp:prepend(lazypath)
|
||||||
|
|
||||||
vim.g.mapleader = ','
|
vim.g.mapleader = ','
|
||||||
vim.g.localmapleader = ','
|
vim.g.localmapleader = ','
|
||||||
|
--- vim.opt.textwidth = 85
|
||||||
|
vim.opt.colorcolumn = '+2'
|
||||||
|
|
||||||
require('lazy').setup('plugins')
|
require('lazy').setup('plugins')
|
||||||
require('keymaps')
|
|
||||||
|
|
||||||
|
-----------------------------------------------------------
|
||||||
-- General Neovim settings and configuration
|
-- General Neovim settings and configuration
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
|
|
||||||
@ -46,22 +47,20 @@ g.markdown_folding = 1
|
|||||||
opt.spell=true
|
opt.spell=true
|
||||||
opt.spelllang = 'en_us'
|
opt.spelllang = 'en_us'
|
||||||
cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
|
cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
|
||||||
vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta})
|
vim.api.nvim_set_hl(0, "ColorColumn", {guibg=DarkOrchid1})
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
-- Neovim UI
|
-- Neovim UI
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
opt.number = true -- Show line number
|
opt.number = true -- Show line number
|
||||||
opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor.
|
opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor.
|
||||||
opt.showmatch = true -- Highlight matching parenthesis
|
opt.showmatch = true -- Highlight matching parenthesis
|
||||||
opt.foldmethod = 'syntax' -- Enable folding (default 'foldmarker')
|
opt.foldmethod = "syntax" -- Enable folding (default 'foldmarker')
|
||||||
opt.colorcolumn = '120' -- Line length marker at 80 columns
|
|
||||||
opt.textwidth = 120
|
|
||||||
opt.splitright = true -- Vertical split to the right
|
opt.splitright = true -- Vertical split to the right
|
||||||
opt.splitbelow = true -- Horizontal split to the bottom
|
opt.splitbelow = true -- Horizontal split to the bottom
|
||||||
opt.ignorecase = true -- Ignore case letters when search
|
opt.ignorecase = true -- Ignore case letters when search
|
||||||
opt.smartcase = true -- Ignore lowercase for the whole pattern
|
opt.smartcase = true -- Ignore lowercase for the whole pattern
|
||||||
opt.linebreak = true -- Wrap on word boundary
|
opt.linebreak = true -- Wrap on word boundary
|
||||||
opt.signcolumn = 'yes:2' -- Signs column always on, minimum 2.
|
opt.signcolumn = 'yes:1' -- Signs column always on, minimum 2.
|
||||||
opt.wrap = true
|
opt.wrap = true
|
||||||
|
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
@ -78,10 +77,10 @@ opt.termguicolors = true -- Enable 24-bit RGB colors
|
|||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
-- Tabs, indent
|
-- Tabs, indent
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
opt.expandtab = true -- Use spaces instead of tabs
|
g.expandtab = true -- Use spaces instead of tabs
|
||||||
opt.shiftwidth = 1 -- Shift 4 spaces when tab
|
g.shiftwidth = 2 -- Shift 4 spaces when tab
|
||||||
opt.tabstop = 1 -- 1 tab == 4 spaces
|
g.tabstop = 1 -- 1 tab == 4 spaces
|
||||||
opt.smartindent = true -- Autoindent new lines
|
g.smartindent = true -- Autoindent new lines
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
-- Glow Settings
|
-- Glow Settings
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
@ -90,15 +89,19 @@ g.glow_border = 'rounded'
|
|||||||
g.glow_width = 120
|
g.glow_width = 120
|
||||||
g.glow_use_pager = true
|
g.glow_use_pager = true
|
||||||
g.glow_style = 'dark'
|
g.glow_style = 'dark'
|
||||||
|
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
-- MKDX Settings, mkdx#settings.
|
-- AutoCmd and Additional Function Settings.
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
-- 2 spaces for selected filetypes
|
-- 2 spaces for selected filetypes
|
||||||
cmd [[
|
vim.cmd [[
|
||||||
autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=8 noexpandtab
|
autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=4 noexpandtab
|
||||||
]]
|
]]
|
||||||
|
vim.cmd [[ autocmd FileType python set textwidth=110 ]]
|
||||||
|
vim.cmd [[ autocmd FileType lua set textwidth=80 ]]
|
||||||
|
vim.cmd [[ autocmd FileType markdown,text set textwidth=125 shiftwidth=2 ]]
|
||||||
|
|
||||||
|
--[[
|
||||||
local disabled_built_ins = {
|
local disabled_built_ins = {
|
||||||
"netrw",
|
"netrw",
|
||||||
"netrwPlugin",
|
"netrwPlugin",
|
||||||
@ -122,11 +125,10 @@ local disabled_built_ins = {
|
|||||||
|
|
||||||
for _, plugin in pairs(disabled_built_ins) do
|
for _, plugin in pairs(disabled_built_ins) do
|
||||||
vim.g["loaded_" .. plugin] = 1
|
vim.g["loaded_" .. plugin] = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
--[[
|
|
||||||
Deletes all trailing whitespaces in a file if it's not binary nor a diff.
|
|
||||||
]]--
|
]]--
|
||||||
|
|
||||||
|
-- Deletes all trailing whitespaces in a file if it's not binary nor a diff.
|
||||||
function _G.trim_trailing_whitespaces()
|
function _G.trim_trailing_whitespaces()
|
||||||
if not o.binary and o.filetype ~= 'diff' then
|
if not o.binary and o.filetype ~= 'diff' then
|
||||||
local current_view = fn.winsaveview()
|
local current_view = fn.winsaveview()
|
||||||
@ -135,8 +137,15 @@ function _G.trim_trailing_whitespaces()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Correctly set $VIRTUAL_ENV for Python venvs.
|
||||||
|
if vim.fn.exists("$VIRTUAL_ENV") == 1 then
|
||||||
|
vim.g.python3_host_prog = vim.fn.substitute(vim.fn.system("pyenv which python3 | head -n2 | tail -n1"), "\n", "", "g")
|
||||||
|
else
|
||||||
|
vim.g.python3_host_prog = vim.fn.substitute(vim.fn.system("which python3"), "\n", "", "g")
|
||||||
|
end
|
||||||
|
|
||||||
-- see https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-add-visual-studio-code-dark-theme-colors-to-the-menu
|
-- see https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-add-visual-studio-code-dark-theme-colors-to-the-menu
|
||||||
vim.cmd[[
|
--[[vim.cmd[[
|
||||||
highlight! link CmpItemMenu Comment
|
highlight! link CmpItemMenu Comment
|
||||||
" gray
|
" gray
|
||||||
highlight! CmpItemAbbrDeprecated guibg=NONE gui=strikethrough guifg=#808080
|
highlight! CmpItemAbbrDeprecated guibg=NONE gui=strikethrough guifg=#808080
|
||||||
@ -155,4 +164,7 @@ vim.cmd[[
|
|||||||
highlight! CmpItemKindProperty guibg=NONE guifg=#D4D4D4
|
highlight! CmpItemKindProperty guibg=NONE guifg=#D4D4D4
|
||||||
highlight! CmpItemKindUnit guibg=NONE guifg=#D4D4D4
|
highlight! CmpItemKindUnit guibg=NONE guifg=#D4D4D4
|
||||||
]]
|
]]
|
||||||
|
--]]
|
||||||
|
|
||||||
|
require('core/keymaps')
|
||||||
|
vim.cmd[[colorscheme tol]]
|
||||||
|
|||||||
@ -1,63 +1,28 @@
|
|||||||
{
|
{
|
||||||
"LuaSnip": { "branch": "master", "commit": "563827f00bb4fe43269e3be653deabc0005f1302" },
|
"LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
|
||||||
"alpha-nvim": { "branch": "main", "commit": "d35b99e36e32040ba06c48a25b5bd3e75be2a566" },
|
"alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" },
|
||||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||||
"cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" },
|
"cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
|
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
|
||||||
|
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
|
||||||
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
|
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
"cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
|
"cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
|
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||||
"colorschemes": { "branch": "master", "commit": "e29f32990d6e2c7c3a4763326194fbd847b49dac" },
|
"distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" },
|
||||||
"dracula.nvim": { "branch": "main", "commit": "798274ba3c454a9aa3cd71f95a86ea55cbbbb142" },
|
"gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" },
|
||||||
"feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" },
|
"headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "1645e7cd98ed99e766c84ab3cf13a1612c77dcee" },
|
"hover.nvim": { "branch": "main", "commit": "a173256a9dba938e876ceb4bb5d2742f8866e349" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "4bd5d7702c17643ff40c035b6b936757b99743c7" },
|
"lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" },
|
||||||
"glow.nvim": { "branch": "main", "commit": "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac" },
|
"mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
|
||||||
"headlines.nvim": { "branch": "master", "commit": "1cd93a641c03419bb255f8b3fe734451517763b1" },
|
"mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" },
|
"mkdnflow.nvim": { "branch": "main", "commit": "f7e513a521f5926df034cf40ddd54b43ba73a013" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "c249ea376bcd3e5d121b79eac595837b7d0c73a4" },
|
"null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
|
||||||
"lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" },
|
"nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" },
|
||||||
"lsp-colors.nvim": { "branch": "main", "commit": "d0b245232aeb197bbd097111d8b69621b0671edb" },
|
"nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" },
|
||||||
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
|
"nvim-treesitter": { "branch": "master", "commit": "afa103385a2b5ef060596ed822ef63276ae88016" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "93e58e100f37ef4fb0f897deeed20599dae9d128" },
|
"nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "eb6010ac97e9b510ddce8d28b6925ff6b046eab2" },
|
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
||||||
"mini.fuzzy": { "branch": "stable", "commit": "e8faf897330eadb1b1b76da67eeff04be85cbd8b" },
|
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" },
|
||||||
"mini.move": { "branch": "main", "commit": "a0c5930e33e55467b0a9f3bca93d8f6fdbfac2e4" },
|
"telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }
|
||||||
"mini.pairs": { "branch": "stable", "commit": "4ebc1ff8d77fe75e8f219432302800ca29e17614" },
|
|
||||||
"mini.surround": { "branch": "main", "commit": "6a4f31e2a380439315729f561d7e7898bde1fd52" },
|
|
||||||
"mini.trailspace": { "branch": "main", "commit": "8566ae0cf1524b263e489b6771d339025773189e" },
|
|
||||||
"mkdnflow.nvim": { "branch": "main", "commit": "51cf944514e49662cca8a075b1a8f485c2c39d0f" },
|
|
||||||
"monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" },
|
|
||||||
"neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" },
|
|
||||||
"neovim": { "branch": "main", "commit": "845a6ad5443e3559dde42910c4523a5835c9233b" },
|
|
||||||
"nord.nvim": { "branch": "main", "commit": "70df2b61de21b953fd577f292a973cd22e0ca686" },
|
|
||||||
"null-ls.nvim": { "branch": "main", "commit": "9d811bb6ed44cf766f4bda8a47fd65fdfbdcaa7d" },
|
|
||||||
"nvim": { "branch": "main", "commit": "a5f3ed5d3b1d9ea21183718a8a89a6653bd6ea48" },
|
|
||||||
"nvim-cmp": { "branch": "main", "commit": "c4128bcd131fb7152bda8f8dd2b5e41d2fefa88c" },
|
|
||||||
"nvim-dap": { "branch": "master", "commit": "401f5f22b2d7f9bdbb9294d0235136091458816a" },
|
|
||||||
"nvim-dap-python": { "branch": "master", "commit": "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531" },
|
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "9b8f5260f3e793e2dcb2899e0a5b944667a95cb2" },
|
|
||||||
"nvim-mapper": { "branch": "main", "commit": "7585479199ad7c3fdfed47ae79d26198f948cfc5" },
|
|
||||||
"nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" },
|
|
||||||
"nvim-tree.lua": { "branch": "master", "commit": "4222bb875d86a2a53069c75c4833e27f58e26d90" },
|
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "6cdaf3f15ecf2495d890715723686abfb667cb7a" },
|
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "bb6d4fd1e010300510172b173ab5205d37af084f" },
|
|
||||||
"plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" },
|
|
||||||
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
|
||||||
"prettier.nvim": { "branch": "main", "commit": "918b99f5ddd7a56395fd393767ab6a3c15a50789" },
|
|
||||||
"sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" },
|
|
||||||
"symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
|
|
||||||
"telescope-file-browser.nvim": { "branch": "master", "commit": "a18f78121d74c4fae9edd29e138a918a8ede2a70" },
|
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
|
|
||||||
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "7de3baef1ec4fb77f7a8195fe87bebd513244b6a" },
|
|
||||||
"telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" },
|
|
||||||
"tmux.nvim": { "branch": "main", "commit": "feafcf8f48c49c720ee64e745648d69d42cb9c5a" },
|
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" },
|
|
||||||
"tokyonight.nvim": { "branch": "main", "commit": "a0abe53df53616d13da327636cb0bcac3ea7f5af" },
|
|
||||||
"trouble.nvim": { "branch": "main", "commit": "556ef3089709a6e253df1e500381fec5eb48e48a" },
|
|
||||||
"vem-tabline": { "branch": "master", "commit": "8399cf77603b6c2110a39ea3efe1053f64b057aa" },
|
|
||||||
"vim-wakatime": { "branch": "master", "commit": "ee4ab57adf62a309aeef383a2da23b6e48e5ae50" },
|
|
||||||
"vista.vim": { "branch": "master", "commit": "33774aff5d8b224f24c2e4c6015c613c1a17bf74" },
|
|
||||||
"which-key.nvim": { "branch": "main", "commit": "5224c261825263f46f6771f1b644cae33cd06995" }
|
|
||||||
}
|
}
|
||||||
85
nvim/.config/nvim/lua/core/keymaps.lua
Normal file
85
nvim/.config/nvim/lua/core/keymaps.lua
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
-----------------------------------------------------------
|
||||||
|
-- Keymaps of Neovim and installed plugins
|
||||||
|
-----------------------------------------------------------
|
||||||
|
|
||||||
|
local map = vim.api.nvim_set_keymap
|
||||||
|
local default_opts = { noremap = true, silent = true }
|
||||||
|
|
||||||
|
-- Fast saving with <leader> and s
|
||||||
|
-- map('n', '<leader>s', ':w<CR>', default_opts)
|
||||||
|
-- map('n', '<leader>a', ':w|:luafile %<CR>', default_opts)
|
||||||
|
-- map('n', '<leader>aa', ':w|:luafile %<CR> |:Lazy<CR>', default_opts)
|
||||||
|
-- map('i', '<leader>s', '<C-c>:w<CR>', default_opts)
|
||||||
|
-- Python Script that saves the file & moves Todos to my Todolist.
|
||||||
|
-- map('n', '<leader>sd', ':w|:! python3 ~/Documents/Northpass/Scripts/TodoMD/todo.py %<CR>', default_opts)
|
||||||
|
|
||||||
|
-- Neovim Tab Navgation via Vem-Tabline
|
||||||
|
map('n', '<leader>t', ':tabnew<CR>', default_opts)
|
||||||
|
map('n', '<leader>e', ':bnext<CR>', default_opts)
|
||||||
|
map('n', '<leader>w', ':bprev<CR>', default_opts)
|
||||||
|
map('n', '<leader>d', ':bdelete<CR>', default_opts)
|
||||||
|
map('n', '<leader>r', '<Plug>vem_move_buffer_right', default_opts)
|
||||||
|
map('n', '<leader>q', '<Plug>vem_move_buffer_left', default_opts)
|
||||||
|
|
||||||
|
-- Nvim-Tree
|
||||||
|
map('n', '<leader>v', ':NvimTreeToggle<CR>', default_opts)
|
||||||
|
|
||||||
|
-- Nvim Sidebar
|
||||||
|
map('n', '<leader>n', ':SidebarNvimToggle<CR>', default_opts)
|
||||||
|
map('n', '<leader>q', ':SidebarNvimUpdate<CR>', default_opts)
|
||||||
|
|
||||||
|
-- Telescope
|
||||||
|
map('n', '<leader>ff', ':Telescope find_files<CR>', default_opts)
|
||||||
|
map('n', '<leader>fg', ':Telescope live_grep<CR>', default_opts)
|
||||||
|
map('n', '<leader>fb', ':Telescope buffers<CR>', default_opts)
|
||||||
|
map('n', '<leader>fe', ':Telescope file_browser<CR>', default_opts)
|
||||||
|
map('n', '<leader>fk', ':Telescope keymaps<CR>', default_opts)
|
||||||
|
map('n', '<leader>fa', ':Telescope adjacent<CR>', default_opts)
|
||||||
|
map('n', '<leader>cb', ':Telescope current_buffer_fuzzy_find<CR>', default_opts)
|
||||||
|
|
||||||
|
-- Formatting
|
||||||
|
map('n', '<leader>b', ':! black %<CR>', default_opts)
|
||||||
|
map('n', '<leader>m', ':! markdownlint -f %<CR>', default_opts)
|
||||||
|
|
||||||
|
-- Terminal
|
||||||
|
map('n', '<C-t>', ':ToggleTerm direction=float<CR>', default_opts)
|
||||||
|
map('t', '<C-n>', '<C-\\><C-n><CR>', default_opts) -- Exit Insert Mode Faster
|
||||||
|
|
||||||
|
------------------------------------------------
|
||||||
|
-- Old Keymaps from Nvim-Mapper (Sunsetted)
|
||||||
|
------------------------------------------------
|
||||||
|
--[[
|
||||||
|
-- Macros for Todo Trouble
|
||||||
|
M('n', '<C-t>', "@t<CR>", default_opts,
|
||||||
|
"Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line"
|
||||||
|
)
|
||||||
|
|
||||||
|
M('n', '<C-s>', "@s<CR>", default_opts,
|
||||||
|
"Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line"
|
||||||
|
)
|
||||||
|
|
||||||
|
M('n', '<C-f>', "@f<CR>", default_opts,
|
||||||
|
"Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. "
|
||||||
|
)
|
||||||
|
|
||||||
|
M( 'n', '<C-x>', "@c<CR>", default_opts,
|
||||||
|
"Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line."
|
||||||
|
)
|
||||||
|
|
||||||
|
M('n', '<C-r>', "@w<CR>", default_opts,
|
||||||
|
"Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line."
|
||||||
|
)
|
||||||
|
|
||||||
|
M('n', '<leader>ce', ":TodoTrouble keywords=TODO<CR>", default_opts,
|
||||||
|
"Show Todo Tags", "show_todos", "Show Todo Tags."
|
||||||
|
)
|
||||||
|
|
||||||
|
M('n', '<leader>cf', ":TodoTrouble keywords=FEAT<CR>", default_opts,
|
||||||
|
"Show Feature Tags", "show_features", "Show Feature Requests."
|
||||||
|
)
|
||||||
|
|
||||||
|
M('n', '<leader>cq', ":TodoTrouble keywords=ERROR, WARN<CR>", default_opts,
|
||||||
|
"Show Warning Tags", "show_warnings", "Show Errors Tags."
|
||||||
|
)
|
||||||
|
|
||||||
|
--]]
|
||||||
40
nvim/.config/nvim/lua/settings/init.lua → nvim/.config/nvim/lua/core/settings.lua
Executable file → Normal file
40
nvim/.config/nvim/lua/settings/init.lua → nvim/.config/nvim/lua/core/settings.lua
Executable file → Normal file
@ -1,3 +1,4 @@
|
|||||||
|
-----------------------------------------------------------
|
||||||
-- General Neovim settings and configuration
|
-- General Neovim settings and configuration
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
|
|
||||||
@ -27,22 +28,24 @@ g.markdown_folding = 1
|
|||||||
opt.spell=true
|
opt.spell=true
|
||||||
opt.spelllang = 'en_us'
|
opt.spelllang = 'en_us'
|
||||||
cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
|
cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
|
||||||
vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta})
|
--vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta})
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
-- Neovim UI
|
-- Neovim UI
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
opt.number = true -- Show line number
|
opt.number = true -- Show line number
|
||||||
opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor.
|
opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor.
|
||||||
opt.showmatch = true -- Highlight matching parenthesis
|
opt.showmatch = true -- Highlight matching parenthesis
|
||||||
opt.foldmethod = 'syntax' -- Enable folding (default 'foldmarker')
|
opt.foldmethod = "syntax" -- Enable folding (default 'foldmarker')
|
||||||
opt.colorcolumn = '120' -- Line length marker at 80 columns
|
opt.colorcolumn = '99'
|
||||||
opt.textwidth = 120
|
opt.textwidth = 100
|
||||||
|
-- opt.cc = '+1,+2,+3' -- Line length marker at 80 columns
|
||||||
|
-- opt.tw = 120
|
||||||
opt.splitright = true -- Vertical split to the right
|
opt.splitright = true -- Vertical split to the right
|
||||||
opt.splitbelow = true -- Horizontal split to the bottom
|
opt.splitbelow = true -- Horizontal split to the bottom
|
||||||
opt.ignorecase = true -- Ignore case letters when search
|
opt.ignorecase = true -- Ignore case letters when search
|
||||||
opt.smartcase = true -- Ignore lowercase for the whole pattern
|
opt.smartcase = true -- Ignore lowercase for the whole pattern
|
||||||
opt.linebreak = true -- Wrap on word boundary
|
opt.linebreak = true -- Wrap on word boundary
|
||||||
opt.signcolumn = 'yes:2' -- Signs column always on, minimum 2.
|
opt.signcolumn = 'yes:1' -- Signs column always on, minimum 2.
|
||||||
opt.wrap = true
|
opt.wrap = true
|
||||||
|
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
@ -56,12 +59,13 @@ opt.synmaxcol = 240 -- Max column for syntax highlight
|
|||||||
-- Colorscheme
|
-- Colorscheme
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
opt.termguicolors = true -- Enable 24-bit RGB colors
|
opt.termguicolors = true -- Enable 24-bit RGB colors
|
||||||
|
cmd[[colorscheme dracula]]
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
-- Tabs, indent
|
-- Tabs, indent
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
opt.expandtab = true -- Use spaces instead of tabs
|
opt.expandtab = true -- Use spaces instead of tabs
|
||||||
opt.shiftwidth = 1 -- Shift 4 spaces when tab
|
opt.shiftwidth = 4 -- Shift 4 spaces when tab
|
||||||
opt.tabstop = 1 -- 1 tab == 4 spaces
|
opt.tabstop = 4 -- 1 tab == 4 spaces
|
||||||
opt.smartindent = true -- Autoindent new lines
|
opt.smartindent = true -- Autoindent new lines
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
-- Glow Settings
|
-- Glow Settings
|
||||||
@ -115,3 +119,25 @@ function _G.trim_trailing_whitespaces()
|
|||||||
fn.winrestview(current_view)
|
fn.winrestview(current_view)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- see https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-add-visual-studio-code-dark-theme-colors-to-the-menu
|
||||||
|
vim.cmd[[
|
||||||
|
highlight! link CmpItemMenu Comment
|
||||||
|
" gray
|
||||||
|
highlight! CmpItemAbbrDeprecated guibg=NONE gui=strikethrough guifg=#808080
|
||||||
|
" blue
|
||||||
|
highlight! CmpItemAbbrMatch guibg=NONE guifg=#569CD6
|
||||||
|
highlight! CmpItemAbbrMatchFuzzy guibg=NONE guifg=#569CD6
|
||||||
|
" light blue
|
||||||
|
highlight! CmpItemKindVariable guibg=NONE guifg=#9CDCFE
|
||||||
|
highlight! CmpItemKindInterface guibg=NONE guifg=#9CDCFE
|
||||||
|
highlight! CmpItemKindText guibg=NONE guifg=#9CDCFE
|
||||||
|
" pink
|
||||||
|
highlight! CmpItemKindFunction guibg=NONE guifg=#C586C0
|
||||||
|
highlight! CmpItemKindMethod guibg=NONE guifg=#C586C0
|
||||||
|
" front
|
||||||
|
highlight! CmpItemKindKeyword guibg=NONE guifg=#D4D4D4
|
||||||
|
highlight! CmpItemKindProperty guibg=NONE guifg=#D4D4D4
|
||||||
|
highlight! CmpItemKindUnit guibg=NONE guifg=#D4D4D4
|
||||||
|
]]
|
||||||
|
|
||||||
7
nvim/.config/nvim/lua/custom_snippets/markdown.json
Normal file
7
nvim/.config/nvim/lua/custom_snippets/markdown.json
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"todays-date": {
|
||||||
|
"prefix": "today",
|
||||||
|
"body": ["${CURRENT_MONTH}-${CURRENT_DATE}-${CURRENT_YEAR}"],
|
||||||
|
"description": "Put the date in (Y-m-D) format"
|
||||||
|
}
|
||||||
|
}
|
||||||
10
nvim/.config/nvim/lua/custom_snippets/package.json
Normal file
10
nvim/.config/nvim/lua/custom_snippets/package.json
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"contributes": {
|
||||||
|
"snippets": [
|
||||||
|
{
|
||||||
|
"language": "markdown",
|
||||||
|
"path": "./markdown.json"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,126 +0,0 @@
|
|||||||
-----------------------------------------------------------
|
|
||||||
|
|
||||||
-- Keymaps of Neovim and installed plugins
|
|
||||||
-----------------------------------------------------------
|
|
||||||
|
|
||||||
local map = vim.api.nvim_set_keymap
|
|
||||||
local default_opts = { noremap = true, silent = true }
|
|
||||||
|
|
||||||
-- Fast saving with <leader> and s
|
|
||||||
map('n', '<leader>s', ':w<CR>', default_opts)
|
|
||||||
map('n', '<leader>a', ':w|:luafile %<CR>', default_opts)
|
|
||||||
map('n', '<leader>aa', ':w|:luafile %<CR> |:PackerSync<CR>', default_opts)
|
|
||||||
map('i', '<leader>s', '<C-c>:w<CR>', default_opts)
|
|
||||||
-- Python Script that saves the file & moves Todos to my Todolist.
|
|
||||||
map('n', '<leader>sd', ':w|:! python3 ~/Documents/Northpass/Scripts/TodoMD/todo.py %<CR>', default_opts)
|
|
||||||
|
|
||||||
-- Neovim Tab Navgation via Vem-Tabline
|
|
||||||
map('n', '<leader>t', ':tabnew<CR>', default_opts)
|
|
||||||
map('n', '<leader>e', ':bnext<CR>', default_opts)
|
|
||||||
map('n', '<leader>w', ':bprev<CR>', default_opts)
|
|
||||||
map('n', '<leader>d', ':bdelete<CR>', default_opts)
|
|
||||||
map('n', '<leader>r', '<Plug>vem_move_buffer_right', default_opts)
|
|
||||||
map('n', '<leader>q', '<Plug>vem_move_buffer_left', default_opts)
|
|
||||||
|
|
||||||
-----------------------------------------------------------
|
|
||||||
|
|
||||||
-- Applications and Plugins shortcuts
|
|
||||||
-----------------------------------------------------------
|
|
||||||
|
|
||||||
-----------------------------------------------------------
|
|
||||||
|
|
||||||
-- Telescope Keymaps
|
|
||||||
-----------------------------------------------------------
|
|
||||||
|
|
||||||
-- For Neovim >= 0.7.0
|
|
||||||
Mapper = require("nvim-mapper")
|
|
||||||
local M = Mapper.map
|
|
||||||
local default_opts = {noremap=true, silent=true}
|
|
||||||
|
|
||||||
-- Sidebar
|
|
||||||
M('n', '<leader>n', ':SidebarNvimToggle<CR>', default_opts,
|
|
||||||
"Sidebar Toggle", "sidebar-toggle", "Open or Close Sidebar"
|
|
||||||
)
|
|
||||||
M('n', '<leader>q', ':SidebarNvimUpdate<CR>', default_opts,
|
|
||||||
"Sidebar Update", "sidebar-update", "Refresh the Sidebar"
|
|
||||||
)
|
|
||||||
|
|
||||||
--[[ Sidebar Resize
|
|
||||||
M('n', '<leader>=', ':SidebarNvimResize +1<CR>', default_opts,
|
|
||||||
"Sidebar +1", "sidebar-plus1", "Sidebar Bigger by one"
|
|
||||||
)
|
|
||||||
M('n', '<leader>-', ':SidebarNvimResize -1<CR>', default_opts,
|
|
||||||
"Sidebar -1", "sidebar-minus1", "Sidebar Smaller by one"
|
|
||||||
)
|
|
||||||
M('n', '<leader>==', ':SidebarNvimResize +10<CR>', default_opts,
|
|
||||||
"Sidebar +10", "sidebar-plus10", "Sidebar Bigger by 10"
|
|
||||||
)
|
|
||||||
M('n', '<leader>--', ':SidebarNvimResize -10<CR>', default_opts,
|
|
||||||
"Sidebar -10", "sidebar-minus10", "Sidebar Smaller by 10"
|
|
||||||
)--]]
|
|
||||||
|
|
||||||
-- Lazy Git
|
|
||||||
M('n', '<leader>lg', ":LazyGit<CR>", default_opts,
|
|
||||||
"Lazy Git", "lazy-git", "Show Lazy Git"
|
|
||||||
)
|
|
||||||
|
|
||||||
-- Markdown Preview Toggle
|
|
||||||
M('n', '<leader>P', ":MarkdownPreview<CR>", default_opts,
|
|
||||||
"Markdown Preview", "md_preview", "Display Markdown preview in browser"
|
|
||||||
)
|
|
||||||
|
|
||||||
-- Telescope Options
|
|
||||||
M('n', '<leader>ff', ':Telescope find_files<CR>', default_opts,
|
|
||||||
"Find Files", "find-files", "Find Files in Telescope pop-up"
|
|
||||||
)
|
|
||||||
M('n', '<leader>fg', ':Telescope live_grep<CR>', default_opts,
|
|
||||||
"Live Grep", "live-grep", "Grep Files in Telescope pop-up"
|
|
||||||
)
|
|
||||||
M('n', '<leader>fb', ':Telescope buffers<CR>', default_opts,
|
|
||||||
"Buffers", "buffers", "See Buffers in Telescope pop-up"
|
|
||||||
)
|
|
||||||
M('n', '<leader>fe', ":Telescope file_browser<CR>", default_opts,
|
|
||||||
"Telescope Files", "telescope-file-browser", "Find files and directories in telescope"
|
|
||||||
)
|
|
||||||
|
|
||||||
M('n', '<C-t>', "@t<CR>", default_opts,
|
|
||||||
"Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line"
|
|
||||||
)
|
|
||||||
|
|
||||||
M('n', '<C-s>', "@s<CR>", default_opts,
|
|
||||||
"Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line"
|
|
||||||
)
|
|
||||||
|
|
||||||
M('n', '<C-f>', "@f<CR>", default_opts,
|
|
||||||
"Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. "
|
|
||||||
)
|
|
||||||
|
|
||||||
M( 'n', '<C-x>', "@c<CR>", default_opts,
|
|
||||||
"Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line."
|
|
||||||
)
|
|
||||||
|
|
||||||
M('n', '<C-r>', "@w<CR>", default_opts,
|
|
||||||
"Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line."
|
|
||||||
)
|
|
||||||
|
|
||||||
M('n', '<leader>ce', ":TodoTrouble keywords=TODO<CR> | :resize +10<CR>", default_opts,
|
|
||||||
"Show Todo Tags", "show_todos", "Show Todo Tags."
|
|
||||||
)
|
|
||||||
|
|
||||||
M('n', '<leader>cf', ":TodoTrouble keywords=FEAT<CR>", default_opts,
|
|
||||||
"Show Feature Tags", "show_features", "Show Feature Requests."
|
|
||||||
)
|
|
||||||
|
|
||||||
M('n', '<leader>cq', ":TodoTrouble keywords=ERROR, WARN<CR>", default_opts,
|
|
||||||
"Show Warning Tags", "show_warnings", "Show Errors Tags."
|
|
||||||
)
|
|
||||||
|
|
||||||
M('n', '<leader>b', ":! black %<CR>", default_opts,
|
|
||||||
"Black Formatting", "black_current_file", "Use Black Formatting on Current File."
|
|
||||||
)
|
|
||||||
M('n', '<leader>m', ":! markdownlint -f %<CR>", default_opts,
|
|
||||||
"Markdownlint", "md_lint_format", "Use mdlint Formatting on Current File."
|
|
||||||
)
|
|
||||||
M('n', '<leader>r30', ":resize 30<CR>", default_opts,
|
|
||||||
"Resize30", "resize_30", "Resize Window to #30"
|
|
||||||
)
|
|
||||||
@ -4,7 +4,7 @@
|
|||||||
return {
|
return {
|
||||||
"goolord/alpha-nvim",
|
"goolord/alpha-nvim",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
'kyazdani42/nvim-web-devicons',
|
'nvim-tree/nvim-web-devicons',
|
||||||
},
|
},
|
||||||
config = function ()
|
config = function ()
|
||||||
local alpha = require'alpha'
|
local alpha = require'alpha'
|
||||||
|
|||||||
16
nvim/.config/nvim/lua/plugins/distant.lua
Normal file
16
nvim/.config/nvim/lua/plugins/distant.lua
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
return
|
||||||
|
{
|
||||||
|
'chipsenkbeil/distant.nvim',
|
||||||
|
branch = 'v0.2',
|
||||||
|
config = function()
|
||||||
|
require('distant').setup {
|
||||||
|
-- Applies Chip's personal settings to every machine you connect to
|
||||||
|
--
|
||||||
|
-- 1. Ensures that distant servers terminate with no connections
|
||||||
|
-- 2. Provides navigation bindings for remote directories
|
||||||
|
-- 3. Provides keybinding to jump into a remote file's parent directory
|
||||||
|
['*'] = require('distant.settings').chip_default()
|
||||||
|
}
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
27
nvim/.config/nvim/lua/plugins/hover.lua
Normal file
27
nvim/.config/nvim/lua/plugins/hover.lua
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
return {
|
||||||
|
"lewis6991/hover.nvim",
|
||||||
|
config = function()
|
||||||
|
require("hover").setup {
|
||||||
|
init = function()
|
||||||
|
require("hover.providers.lsp")
|
||||||
|
-- require('hover.providers.gh')
|
||||||
|
-- require('hover.providers.gh_user')
|
||||||
|
-- require('hover.providers.jira')
|
||||||
|
require('hover.providers.man')
|
||||||
|
require('hover.providers.dictionary')
|
||||||
|
end,
|
||||||
|
preview_opts = {
|
||||||
|
border = nil
|
||||||
|
},
|
||||||
|
-- Whether the contents of a currently open hover window should be moved
|
||||||
|
-- to a :h preview-window when pressing the hover keymap.
|
||||||
|
preview_window = false,
|
||||||
|
title = true
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Setup keymaps
|
||||||
|
vim.keymap.set("n", "K", require("hover").hover, {desc = "hover.nvim"})
|
||||||
|
vim.keymap.set("n", "gK", require("hover").hover_select, {desc = "hover.nvim (select)"})
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
@ -1,48 +1,148 @@
|
|||||||
return {
|
return {
|
||||||
|
|
||||||
----------------------------------------------------------------
|
----------------------------------------------------------------
|
||||||
-- LSP and Autocomplete Plugins
|
-- LSP and Autocomplete Plugins
|
||||||
-- They should be pulled first!
|
-- They should be pulled first!
|
||||||
-----------------------------------------------------------------
|
-----------------------------------------------------------------
|
||||||
|
|
||||||
-- Manage all your Keymaps!
|
{'williamboman/mason.nvim',
|
||||||
|
config = function() require("mason").setup({
|
||||||
|
ui = {
|
||||||
|
icons = {
|
||||||
|
package_installed = "✓",
|
||||||
|
package_pending = "➜",
|
||||||
|
package_uninstalled = "✗"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{ 'williamboman/mason-lspconfig.nvim',
|
||||||
|
config = function() require("mason-lspconfig").setup{} end,
|
||||||
|
},
|
||||||
|
{ 'neovim/nvim-lspconfig' },
|
||||||
{
|
{
|
||||||
"gregorias/nvim-mapper",
|
'hinell/lsp-timeout.nvim',
|
||||||
config = function() require("nvim-mapper").setup{} end,
|
dependencies={ "neovim/nvim-lspconfig" }
|
||||||
before = "telescope.nvim"
|
},
|
||||||
|
{
|
||||||
|
'L3MON4D3/LuaSnip', version = "2.*",
|
||||||
|
build = "make install_jsregexp",
|
||||||
|
dependencies = { "friendly-snippets" },
|
||||||
|
config = function()
|
||||||
|
require("luasnip").setup({
|
||||||
|
history = true,
|
||||||
|
delete_check_events = "TextChanged",
|
||||||
|
})
|
||||||
|
require("luasnip.loaders.from_vscode").lazy_load()
|
||||||
|
require("luasnip.loaders.from_vscode").load({
|
||||||
|
paths = {
|
||||||
|
"~/.dotfiles/nvim/.config/nvim/lua/custom_snippets/" }
|
||||||
|
})
|
||||||
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Neovim Autocomplete with LSP
|
{"ellisonleao/glow.nvim", config = function() require("glow").setup() end },
|
||||||
|
|
||||||
|
'saadparwaiz1/cmp_luasnip',
|
||||||
|
'hrsh7th/cmp-nvim-lsp-signature-help',
|
||||||
|
'lukas-reineke/cmp-under-comparator',
|
||||||
|
|
||||||
{
|
{
|
||||||
'L3MON4D3/LuaSnip', tag = "v1.1.0",
|
'asiryk/auto-hlsearch.nvim',
|
||||||
wants = { "friendly-snippets", "vim-snippets" },
|
version = "1.1.0",
|
||||||
|
config = function() require("auto-hlsearch").setup{} end,
|
||||||
},
|
},
|
||||||
|
|
||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
-- General Functionality
|
-- General Functionality
|
||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
'kdheepak/lazygit.nvim',
|
|
||||||
|
{ 'MaximilianLloyd/adjacent.nvim' },
|
||||||
|
{ 'stevearc/vim-arduino'},
|
||||||
|
{ 'sindrets/diffview.nvim' },
|
||||||
|
{ 'skwee357/nvim-prose' },
|
||||||
|
{
|
||||||
|
'nacro90/numb.nvim',
|
||||||
|
config = function() require('numb').setup{
|
||||||
|
show_cursorline = false,
|
||||||
|
show_numbers = false, -- Enable 'number' for the window while peeking
|
||||||
|
hide_relativenumbers = false, -- Enable turning off 'relativenumber' for the window while peeking
|
||||||
|
number_only = true, -- Peek only when the command is only a number instead of when it starts with a number
|
||||||
|
centered_peeking = true,
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'nvim-lualine/lualine.nvim',
|
||||||
|
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||||
|
config = function() require('lualine').setup({
|
||||||
|
options = {
|
||||||
|
theme = 'material',
|
||||||
|
always_divide_middle = false,
|
||||||
|
},
|
||||||
|
sections = {
|
||||||
|
lualine_x = { "encoding", { "fileformat", symbols = { unix = "" } }, "filetype" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
|
-- Nvim Tree File Manager on the Left
|
||||||
|
{
|
||||||
|
"nvim-tree/nvim-tree.lua",
|
||||||
|
version = "*",
|
||||||
|
lazy = false,
|
||||||
|
dependencies = {
|
||||||
|
"nvim-tree/nvim-web-devicons",
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
require("nvim-tree").setup({
|
||||||
|
sort_by = "case_sensitive",
|
||||||
|
view = {
|
||||||
|
width = 30,
|
||||||
|
},
|
||||||
|
renderer = {
|
||||||
|
group_empty = true,
|
||||||
|
},
|
||||||
|
filters = {
|
||||||
|
dotfiles = true,
|
||||||
|
},
|
||||||
|
diagnostics = {
|
||||||
|
enable = true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
-- Tmux Navigation
|
-- Tmux Navigation
|
||||||
{
|
{
|
||||||
"aserowy/tmux.nvim",
|
"aserowy/tmux.nvim",
|
||||||
config = function() require("tmux").setup() end
|
config = function() require("tmux").setup() end
|
||||||
},
|
},
|
||||||
-- Find & Search LSP Tags
|
{
|
||||||
'liuchengxu/vista.vim',
|
"roobert/f-string-toggle.nvim",
|
||||||
|
config = function()
|
||||||
|
require("f-string-toggle").setup{
|
||||||
|
key_binding = "<leader>g"
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
-- Snippets
|
-- Snippets
|
||||||
'rafamadriz/friendly-snippets',
|
'rafamadriz/friendly-snippets',
|
||||||
|
|
||||||
-- Rename and Work with Buffer & Tabs
|
-- Rename and Work with Buffer & Tabs
|
||||||
'pacha/vem-tabline',
|
-- 'pacha/vem-tabline',
|
||||||
|
{'romgrk/barbar.nvim',
|
||||||
|
dependencies = 'nvim-tree/nvim-web-devicons',
|
||||||
|
version = '^1.0.0', -- optional: only update when a new 1.x version is released
|
||||||
|
},
|
||||||
|
|
||||||
-- Nvim Tree File Manager on the Left
|
|
||||||
'nvim-tree/nvim-tree.lua',
|
|
||||||
|
|
||||||
-- Trouble Shows Errors with Files.
|
-- Trouble Shows Errors with Files.
|
||||||
{
|
{
|
||||||
"folke/trouble.nvim",
|
"folke/trouble.nvim",
|
||||||
dependencies = { 'kyazdani42/nvim-web-devicons' },
|
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||||
config = function()
|
config = function()
|
||||||
require("trouble").setup {
|
require("trouble").setup {
|
||||||
}
|
}
|
||||||
@ -57,11 +157,24 @@ return {
|
|||||||
}
|
}
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
|
"hrsh7th/nvim-cmp", -- optional, for completion
|
||||||
|
|
||||||
-- Top Right Notify Pop Up
|
-- Top Right Notify Pop Up
|
||||||
'rcarriga/nvim-notify',
|
'rcarriga/nvim-notify',
|
||||||
|
{'akinsho/toggleterm.nvim', version = "*", opts = {
|
||||||
|
direction = 'float',
|
||||||
|
}},
|
||||||
|
|
||||||
-- echasnovski Mini Modules (Selected)
|
------------------------------------------------------------
|
||||||
|
-- echasnovski's Minis get a section of their own...
|
||||||
|
------------------------------------------------------------
|
||||||
|
|
||||||
|
{
|
||||||
|
'echasnovski/mini.comment', version = '*',
|
||||||
|
config = function()
|
||||||
|
require('mini.comment').setup()
|
||||||
|
end
|
||||||
|
},
|
||||||
{
|
{
|
||||||
'echasnovski/mini.move',
|
'echasnovski/mini.move',
|
||||||
config = function()
|
config = function()
|
||||||
@ -110,29 +223,29 @@ return {
|
|||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
|
|
||||||
{
|
{
|
||||||
'jakewvincent/mkdnflow.nvim',
|
"iamcco/markdown-preview.nvim",
|
||||||
|
build = "cd app && npm install",
|
||||||
|
ft = "markdown",
|
||||||
|
lazy = true,
|
||||||
|
keys = { { "gm", "<cmd>MarkdownPreviewToggle<cr>", desc = "Markdown Preview" } },
|
||||||
config = function()
|
config = function()
|
||||||
require('mkdnflow').setup({
|
vim.g.mkdp_auto_close = true
|
||||||
mappings = {
|
vim.g.mkdp_open_to_the_world = false
|
||||||
MkdnToggleToDo = {{'i', 'n'}, '<C-Space>'},
|
vim.g.mkdp_open_ip = "127.0.0.1"
|
||||||
MkdnNewListItem = {{'i'}, '<CR>'},
|
vim.g.mkdp_port = "8888"
|
||||||
MkdnEnter = {{'n'}, '<CR>'},
|
vim.g.mkdp_browser = ""
|
||||||
MkdnTableNextCell = false,
|
vim.g.mkdp_echo_preview_url = true
|
||||||
MkdnTab = {{'i',}, '<Tab>'},
|
vim.g.mkdp_page_title = "${name}"
|
||||||
MkdnSTab = {{'i'}, '<S-Tab>'},
|
end,
|
||||||
MkdnFollowLink = {'n', '<leader>p'}
|
|
||||||
},
|
},
|
||||||
wrap = true
|
--[[
|
||||||
})
|
{ 'toppair/peek.nvim',
|
||||||
|
build = 'deno task --quiet build:fast',
|
||||||
|
config = function()
|
||||||
|
require('peek').setup()
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
|
]]--
|
||||||
{ "iamcco/markdown-preview.nvim", build = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = {
|
|
||||||
"markdown" } end, ft = { "markdown" }, },
|
|
||||||
|
|
||||||
-- Prettier Plugin for Neovim specifically
|
|
||||||
'MunifTanjim/prettier.nvim',
|
|
||||||
|
|
||||||
-- DAP (Debug adaptor Protocol)
|
-- DAP (Debug adaptor Protocol)
|
||||||
'mfussenegger/nvim-dap',
|
'mfussenegger/nvim-dap',
|
||||||
|
|
||||||
@ -149,28 +262,45 @@ return {
|
|||||||
'sidebar-nvim/sidebar.nvim',
|
'sidebar-nvim/sidebar.nvim',
|
||||||
config = function()
|
config = function()
|
||||||
require("sidebar-nvim").setup({
|
require("sidebar-nvim").setup({
|
||||||
|
side = "right",
|
||||||
sections = {
|
sections = {
|
||||||
"symbols",
|
|
||||||
"git",
|
"git",
|
||||||
|
"symbols",
|
||||||
"diagnostics",
|
"diagnostics",
|
||||||
"todos",
|
|
||||||
},
|
},
|
||||||
initial_width = 45,
|
|
||||||
hide_statusline = true,
|
|
||||||
todos = {
|
todos = {
|
||||||
initially_closed = false, -- whether the groups should be initially closed on start. You can manually open/close groups later.
|
initially_closed = false, -- whether the groups should be initially closed on start. You can manually open/close groups later.
|
||||||
}
|
},
|
||||||
|
diagnostics = {
|
||||||
|
icon = "",
|
||||||
|
},
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
'rcarriga/nvim-dap-ui', dependencies = {"mfussenegger/nvim-dap"}
|
||||||
|
},
|
||||||
|
|
||||||
---------------------------------------------------------
|
---------------------------------------------------------
|
||||||
-- Text, Icons, Symbols
|
-- Text, Icons, Symbols
|
||||||
----------------------------------------------------------
|
----------------------------------------------------------
|
||||||
'lukas-reineke/indent-blankline.nvim',
|
|
||||||
|
{
|
||||||
'simrat39/symbols-outline.nvim',
|
'simrat39/symbols-outline.nvim',
|
||||||
-- 'nvim-tree/nvim-web-devicons',
|
config = function()
|
||||||
'folke/lsp-colors.nvim',
|
require('symbols-outline').setup()
|
||||||
|
end
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"j-hui/fidget.nvim",
|
||||||
|
tag = "legacy",
|
||||||
|
event = "LspAttach",
|
||||||
|
opts = {
|
||||||
|
-- options
|
||||||
|
},
|
||||||
|
},
|
||||||
|
'lukas-reineke/indent-blankline.nvim',
|
||||||
'karb94/neoscroll.nvim',
|
'karb94/neoscroll.nvim',
|
||||||
|
|
||||||
-- Allow Popups for Telescope etc
|
-- Allow Popups for Telescope etc
|
||||||
@ -191,10 +321,11 @@ return {
|
|||||||
-- signs = false, -- configure signs for some keywords individually
|
-- signs = false, -- configure signs for some keywords individually
|
||||||
},
|
},
|
||||||
DONE = { icon = " ", color = "info" },
|
DONE = { icon = " ", color = "info" },
|
||||||
|
IN_PROG = { icon = "", color = "default" },
|
||||||
FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } },
|
FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } },
|
||||||
WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } },
|
WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } },
|
||||||
TODO = { icon = " ", color = "hint", alt = { "TASK", "TBD" } },
|
TODO = { icon = " ", color = "hint", alt = { "TASK", "TBD" } },
|
||||||
NOTE = { icon = " ", color = "hint", alt = { "INFO" } },
|
RISK = { icon = " ", color = "hint", alt = { "RISK" } },
|
||||||
SENG = { icon = " ", color = "test", alt = { "SOLUTIONS", "SE", "WORKAROUND" } },
|
SENG = { icon = " ", color = "test", alt = { "SOLUTIONS", "SE", "WORKAROUND" } },
|
||||||
},
|
},
|
||||||
highlight = {
|
highlight = {
|
||||||
@ -222,11 +353,11 @@ return {
|
|||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
-- Various Color Schemes, Dashboard, etc
|
-- Various Color Schemes, Dashboard, etc
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
'tanvirtin/monokai.nvim',
|
|
||||||
'gbprod/nord.nvim',
|
|
||||||
'Mofiqul/dracula.nvim',
|
'Mofiqul/dracula.nvim',
|
||||||
'lunarvim/colorschemes',
|
'ray-x/starry.nvim',
|
||||||
'rose-pine/neovim',
|
'rose-pine/neovim',
|
||||||
|
'EdenEast/nightfox.nvim',
|
||||||
'catppuccin/nvim',
|
'catppuccin/nvim',
|
||||||
{
|
{
|
||||||
"folke/tokyonight.nvim",
|
"folke/tokyonight.nvim",
|
||||||
@ -234,17 +365,49 @@ return {
|
|||||||
priority = 1000, -- make sure to load this before all the other start plugins
|
priority = 1000, -- make sure to load this before all the other start plugins
|
||||||
config = function()
|
config = function()
|
||||||
-- load the colorscheme here
|
-- load the colorscheme here
|
||||||
vim.cmd([[colorscheme tokyonight]])
|
-- vim.cmd([[colorscheme tokyonight]])
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{ "bluz71/vim-moonfly-colors", name = "moonfly", lazy = true, priority = 1000 },
|
||||||
|
'Bekaboo/deadcolumn.nvim',
|
||||||
{
|
{
|
||||||
'feline-nvim/feline.nvim',
|
"dustypomerleau/tol.nvim",
|
||||||
dependencies = { 'kyazdani42/nvim-web-devicons' },
|
lazy = false, -- load the colorscheme at startup
|
||||||
|
priority = 1000, -- load colorscheme first
|
||||||
|
config = true,
|
||||||
},
|
},
|
||||||
'ellisonleao/glow.nvim',
|
-- {
|
||||||
-- Plugin that causes your code to crumble >:)
|
-- "wookayin/semshi",
|
||||||
-- 'eandrju/cellular-automaton.nvim',
|
-- ft = "python",
|
||||||
|
-- build = ":UpdateRemotePlugins",
|
||||||
|
-- config = function()
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiLocal", { ctermfg=209, fg="#80aa9e" } )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiGlobal", { ctermfg=214, fg="#d3869b" } )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiImported", { ctermfg=214, fg="#8bba7f", cterm=bold, gui=bold } )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiParameter", { ctermfg=75, fg="#8bba7f" } )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiParameterUnused", { ctermfg=117, fg="#34381b", cterm=underline, gui=underline} )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiFree", { ctermfg=218, fg="#e9b143"} )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiBuiltin", { ctermfg=207, fg="#f2594b"} )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiAttribute", { ctermfg=49, fg="#3b4439"} )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiSelf", { ctermfg=249, fg="#db4740"} )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiUnresolved", { ctermfg=226, fg="#f28534", cterm=underline, gui=underline} )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiSelected", { ctermfg=231, fg="#ffffff", ctermbg=161, bg="#4c3432"} )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiErrorSign", { ctermfg=231, fg="#ffffff", ctermbg=160, bg="#402120"} )
|
||||||
|
-- vim.api.nvim_set_hl(0, "semshiErrorChar", { ctermfg=231, fg="#ffffff", ctermbg=160, bg="#402120"} )
|
||||||
|
-- vim.cmd([[sign define semshiError text=E> texthl=semshiErrorSign]])
|
||||||
|
-- end
|
||||||
|
-- },
|
||||||
|
|
||||||
-- Wakatime Tracking
|
-- Wakatime Tracking
|
||||||
'wakatime/vim-wakatime'
|
'wakatime/vim-wakatime',
|
||||||
}
|
|
||||||
|
----------------------------------------------
|
||||||
|
--- Custom Plugins and Tests
|
||||||
|
----------------------------------------------
|
||||||
|
{
|
||||||
|
dir = '/Users/normrasmussen/Documents/Projects/tasksPlugin.nvim/',
|
||||||
|
dev = true,
|
||||||
|
name = "Mkdn Tasks (DEV)",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
30
nvim/.config/nvim/lua/plugins/mason-null-ls.lua
Normal file
30
nvim/.config/nvim/lua/plugins/mason-null-ls.lua
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
return {
|
||||||
|
"jay-babu/mason-null-ls.nvim",
|
||||||
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
|
dependencies = {
|
||||||
|
"williamboman/mason.nvim",
|
||||||
|
"jose-elias-alvarez/null-ls.nvim",
|
||||||
|
},
|
||||||
|
config = function ()
|
||||||
|
require("mason-null-ls").setup({
|
||||||
|
ensure_installed = nil,
|
||||||
|
automatic_installation = true,
|
||||||
|
})
|
||||||
|
local null_ls = require'null-ls'
|
||||||
|
null_ls.setup({
|
||||||
|
debug = true,
|
||||||
|
sources = {
|
||||||
|
null_ls.builtins.diagnostics.markdownlint.with({
|
||||||
|
extra_args = { "--disable", "MD024", "MD013", "--" }}),
|
||||||
|
null_ls.builtins.formatting.black,
|
||||||
|
null_ls.builtins.completion.luasnip,
|
||||||
|
null_ls.builtins.code_actions.gitsigns,
|
||||||
|
null_ls.builtins.diagnostics.pylint.with({
|
||||||
|
diagnostics_postprocess = function(diagnostic)
|
||||||
|
diagnostic.code = diagnostic.message_id
|
||||||
|
end,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
@ -1,22 +0,0 @@
|
|||||||
return {
|
|
||||||
-- Easy Way to install Language Servers
|
|
||||||
{ 'williamboman/mason.nvim',
|
|
||||||
},
|
|
||||||
'williamboman/mason-lspconfig.nvim',
|
|
||||||
'neovim/nvim-lspconfig',
|
|
||||||
|
|
||||||
config = function()
|
|
||||||
require("mason").setup()
|
|
||||||
local lsp_installer = require("mason-lspconfig").setup({
|
|
||||||
automatic_instalsation = true,
|
|
||||||
ui = {
|
|
||||||
icons = {
|
|
||||||
server_installed = "✓",
|
|
||||||
server_pending = "➜",
|
|
||||||
server_uninstalled = "✗"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
}
|
|
||||||
20
nvim/.config/nvim/lua/plugins/mkdnflow.lua
Normal file
20
nvim/.config/nvim/lua/plugins/mkdnflow.lua
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
return {
|
||||||
|
'jakewvincent/mkdnflow.nvim',
|
||||||
|
config = function()
|
||||||
|
require('mkdnflow').setup({
|
||||||
|
mappings = {
|
||||||
|
MkdnToggleToDo = {{'i', 'n'}, '<C-Space>'},
|
||||||
|
MkdnNewListItem = {{'i'}, '<CR>'},
|
||||||
|
MkdnEnter = {{'n'}, '<CR>'},
|
||||||
|
MkdnTableNextCell = false,
|
||||||
|
MkdnTab = {{'i',}, '<Tab>'},
|
||||||
|
MkdnSTab = {{'i'}, '<S-Tab>'},
|
||||||
|
MkdnFollowLink = {{'n'}, '<leader>p'}
|
||||||
|
},
|
||||||
|
links = {
|
||||||
|
name_is_source = true,
|
||||||
|
conceal = true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
}
|
||||||
@ -1,20 +0,0 @@
|
|||||||
return {
|
|
||||||
'jose-elias-alvarez/null-ls.nvim',
|
|
||||||
dependencies = {
|
|
||||||
'nvim-lua/plenary.nvim',
|
|
||||||
},
|
|
||||||
config = function ()
|
|
||||||
local null_ls = require'null-ls'
|
|
||||||
null_ls.setup({
|
|
||||||
debug = true,
|
|
||||||
sources = {
|
|
||||||
null_ls.builtins.completion.spell,
|
|
||||||
null_ls.builtins.diagnostics.codespell,
|
|
||||||
null_ls.builtins.diagnostics.markdownlint.with({ extra_args = { "--disable", "MD013", "MD024", "--" }
|
|
||||||
,}),
|
|
||||||
null_ls.builtins.diagnostics.pycodestyle.with({ extra_args = { "--max-line-length=150" }}),
|
|
||||||
null_ls.builtins.formatting.black.with({ extra_args = { "--fast" }}),
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end
|
|
||||||
}
|
|
||||||
@ -8,6 +8,7 @@ return {
|
|||||||
'hrsh7th/cmp-buffer',
|
'hrsh7th/cmp-buffer',
|
||||||
'hrsh7th/cmp-cmdline',
|
'hrsh7th/cmp-cmdline',
|
||||||
'hrsh7th/nvim-cmp',
|
'hrsh7th/nvim-cmp',
|
||||||
|
'hrsh7th/cmp-calc',
|
||||||
'saadparwaiz1/cmp_luasnip',
|
'saadparwaiz1/cmp_luasnip',
|
||||||
'hrsh7th/cmp-nvim-lsp-signature-help',
|
'hrsh7th/cmp-nvim-lsp-signature-help',
|
||||||
'f3fora/cmp-spell',
|
'f3fora/cmp-spell',
|
||||||
@ -22,18 +23,35 @@ return {
|
|||||||
if not luasnip_status_ok then
|
if not luasnip_status_ok then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
--cmp.setup {
|
|
||||||
|
require("luasnip.loaders.from_vscode").lazy_load()
|
||||||
|
|
||||||
|
cmp.setup({
|
||||||
-- Load snippet support
|
-- Load snippet support
|
||||||
--snippet = {
|
snippet = {
|
||||||
-- expand = function(args)
|
expand = function(args)
|
||||||
-- luasnip.lsp_expand(args.body)
|
require('luasnip').lsp_expand(args.body)
|
||||||
-- },
|
end
|
||||||
|
},
|
||||||
|
|
||||||
-- Completion settings
|
-- Completion settings
|
||||||
completion = {
|
completion = {
|
||||||
--completeopt = 'menu,menuone,noselect'
|
--completeopt = 'menu,menuone,noselect'
|
||||||
keyword_length = 2
|
keyword_length = 1
|
||||||
|
},
|
||||||
|
window = {
|
||||||
|
completion = {
|
||||||
|
winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None",
|
||||||
|
col_offset = -3,
|
||||||
|
side_padding = 0,
|
||||||
|
border = 'rounded',
|
||||||
|
scrollbar = '+',
|
||||||
|
},
|
||||||
|
documentation = {
|
||||||
|
border = 'rounded',
|
||||||
|
scrollbar = '|',
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
-- Key mapping
|
-- Key mapping
|
||||||
mapping = {
|
mapping = {
|
||||||
@ -68,16 +86,47 @@ return {
|
|||||||
else
|
else
|
||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end
|
end,
|
||||||
}
|
},
|
||||||
|
|
||||||
-- Load sources, see: https://github.com/topics/nvim-cmp
|
|
||||||
sources = {
|
sources = {
|
||||||
{ name = 'nvim-lsp' },
|
{ name = 'nvim_lsp', },
|
||||||
{ name = 'luasnip' },
|
{ name = 'luasnip', },
|
||||||
{ name = 'path' },
|
{ name = 'path' },
|
||||||
|
{ name = 'calc' },
|
||||||
|
{ name = 'nvim_lsp_signature_help' },
|
||||||
{ name = 'buffer' },
|
{ name = 'buffer' },
|
||||||
{ name = 'zsh' },
|
},
|
||||||
|
formatting = {
|
||||||
|
fields = {'menu', 'abbr', 'kind'},
|
||||||
|
format = function(entry, item)
|
||||||
|
local menu_icon = {
|
||||||
|
nvim_lsp = 'λ',
|
||||||
|
luasnip = '⋗',
|
||||||
|
buffer = 'Ω',
|
||||||
|
path = '',
|
||||||
|
calc = '',
|
||||||
|
nvim_lsp_signature_help = '',
|
||||||
|
}
|
||||||
|
item.menu = menu_icon[entry.source.name]
|
||||||
|
return item
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
sorting = {
|
||||||
|
comparators = {
|
||||||
|
cmp.config.compare.offset,
|
||||||
|
cmp.config.compare.exact,
|
||||||
|
cmp.config.compare.score,
|
||||||
|
cmp.config.compare.recently_used,
|
||||||
|
require("cmp-under-comparator").under,
|
||||||
|
cmp.config.compare.kind,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
-- Set up lspconfig.
|
||||||
|
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||||
|
-- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
|
||||||
|
require'lspconfig'.pyright.setup {
|
||||||
|
capabilities = capabilities
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|||||||
73
nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua
Normal file
73
nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
return {
|
||||||
|
'neovim/nvim-lspconfig',
|
||||||
|
config = function()
|
||||||
|
-- Setup language servers.
|
||||||
|
local lspconfig = require('lspconfig')
|
||||||
|
lspconfig.pyright.setup {}
|
||||||
|
lspconfig.pylsp.setup {}
|
||||||
|
-- Server-specific settings. See `:help lspconfig-setup`
|
||||||
|
settings = {
|
||||||
|
['pyright'] = {
|
||||||
|
cmd = {"pyright-langserver", "--stdio"},
|
||||||
|
root_dir = function(fname)
|
||||||
|
local root_files = {
|
||||||
|
'pyproject.toml',
|
||||||
|
'setup.py',
|
||||||
|
'setup.cfg',
|
||||||
|
'requirements.txt',
|
||||||
|
'Pipfile',
|
||||||
|
}
|
||||||
|
return util.root_pattern(unpack(root_files))(fname) or util.find_git_ancestor(fname)
|
||||||
|
end,
|
||||||
|
settings = {
|
||||||
|
pylsp = {
|
||||||
|
configurationSources = {"pylint"},
|
||||||
|
plugins = {
|
||||||
|
pylint = { enabled = true },
|
||||||
|
flake8 = { enabled = false },
|
||||||
|
pycodestyle = { enabled = false },
|
||||||
|
pyflakes = { enabled = false },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
-- Global mappings.
|
||||||
|
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
|
||||||
|
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
|
||||||
|
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
|
||||||
|
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
|
||||||
|
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
|
||||||
|
|
||||||
|
-- Use LspAttach autocommand to only map the following keys
|
||||||
|
-- after the language server attaches to the current buffer
|
||||||
|
vim.api.nvim_create_autocmd('LspAttach', {
|
||||||
|
group = vim.api.nvim_create_augroup('UserLspConfig', {}),
|
||||||
|
callback = function(ev)
|
||||||
|
-- Enable completion triggered by <c-x><c-o>
|
||||||
|
vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
|
||||||
|
|
||||||
|
-- Buffer local mappings.
|
||||||
|
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||||
|
local opts = { buffer = ev.buf }
|
||||||
|
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
|
||||||
|
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
|
||||||
|
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
|
||||||
|
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
|
||||||
|
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
|
||||||
|
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
|
||||||
|
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
|
||||||
|
vim.keymap.set('n', '<space>wl', function()
|
||||||
|
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||||
|
end, opts)
|
||||||
|
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
|
||||||
|
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
|
||||||
|
vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
|
||||||
|
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
|
||||||
|
vim.keymap.set('n', '<space>f', function()
|
||||||
|
vim.lsp.buf.format { async = true }
|
||||||
|
end, opts)
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
@ -4,21 +4,23 @@
|
|||||||
--end
|
--end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
-- Treesitter interface
|
|
||||||
'nvim-treesitter/nvim-treesitter',
|
'nvim-treesitter/nvim-treesitter',
|
||||||
--build = ":TSUpdate"
|
build = ":TSUpdate",
|
||||||
config = function ()
|
config = function ()
|
||||||
require('nvim-treesitter.install').update({ with_sync = true })
|
local configs = require("nvim-treesitter.configs")
|
||||||
|
configs.setup({
|
||||||
|
-- require('nvim-treesitter.install').update({ with_sync = true })
|
||||||
-- A list of parser names, or "all"
|
-- A list of parser names, or "all"
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
'bash', 'css', 'html', 'javascript', 'json', 'lua', 'python',
|
'bash', 'css', 'html', 'javascript', 'json', 'lua', 'python',
|
||||||
'vim', 'yaml', 'typescript', 'markdown',
|
'vim', 'yaml', 'typescript', 'markdown',
|
||||||
}
|
},
|
||||||
sync_install = true
|
sync_install = true,
|
||||||
highlight = {
|
highlight = {
|
||||||
-- `false` will disable the whole extension
|
|
||||||
enable = true,
|
enable = true,
|
||||||
additional_vim_regex_highlighting = true,
|
additional_vim_regex_highlighting = true,
|
||||||
}
|
},
|
||||||
|
indent = { enable = true },
|
||||||
|
})
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
'nvim-telescope/telescope.nvim', tag = '0.1.0',
|
'nvim-telescope/telescope.nvim', tag = '0.1.1',
|
||||||
dependencies = {
|
dependencies = {
|
||||||
'nvim-lua/plenary.nvim',
|
'nvim-lua/plenary.nvim',
|
||||||
'nvim-telescope/telescope-live-grep-args.nvim',
|
'nvim-telescope/telescope-live-grep-args.nvim',
|
||||||
@ -114,13 +114,13 @@ return {
|
|||||||
preview = {
|
preview = {
|
||||||
treesitter = {
|
treesitter = {
|
||||||
enable = {
|
enable = {
|
||||||
'css', 'dockerfile', 'elixir', 'erlang', 'fish',
|
'css', 'dockerfile', 'elixir', 'erlang', 'zsh',
|
||||||
'html', 'http', 'javascript', 'json', 'lua', 'php',
|
'html', 'http', 'javascript', 'json', 'lua', 'php',
|
||||||
'python', 'regex', 'ruby', 'rust', 'scss', 'svelte',
|
'python', 'regex', 'ruby', 'rust', 'scss',
|
||||||
'typescript', 'vue', 'yaml', 'markdown', 'bash', 'c',
|
'typescript', 'yaml', 'markdown', 'bash', 'c',
|
||||||
'cmake', 'comment', 'cpp', 'dart', 'go', 'jsdoc',
|
'cmake', 'comment', 'cpp', 'dart', 'go', 'jsdoc',
|
||||||
'json5', 'jsonc', 'llvm', 'make', 'ninja', 'prisma',
|
'json5', 'jsonc', 'llvm', 'make', 'ninja',
|
||||||
'proto', 'pug', 'swift', 'todotxt', 'toml', 'tsx',
|
'todotxt', 'toml', 'help'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -138,7 +138,8 @@ return {
|
|||||||
["<C-y>"] = fb_actions.copy,
|
["<C-y>"] = fb_actions.copy,
|
||||||
["<C-r>"] = fb_actions.rename,
|
["<C-r>"] = fb_actions.rename,
|
||||||
["<C-w>"] = fb_actions.goto_cwd,
|
["<C-w>"] = fb_actions.goto_cwd,
|
||||||
["<C-o>"] = fb_actions.open
|
["<C-o>"] = fb_actions.open,
|
||||||
|
["<C-d>"] = fb_actions.remove,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -151,9 +152,9 @@ return {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
require("telescope").load_extension "file_browser"
|
require("telescope").load_extension "file_browser"
|
||||||
require("telescope").load_extension "mapper"
|
|
||||||
require("telescope").load_extension "live_grep_args"
|
require("telescope").load_extension "live_grep_args"
|
||||||
require("telescope").load_extension "fzf"
|
require("telescope").load_extension "fzf"
|
||||||
|
require("telescope").load_extension "adjacent"
|
||||||
end
|
end
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
|||||||
@ -286,3 +286,56 @@ repo
|
|||||||
Unific
|
Unific
|
||||||
AIIM
|
AIIM
|
||||||
FOMO
|
FOMO
|
||||||
|
Async
|
||||||
|
zendesk
|
||||||
|
centre
|
||||||
|
centres
|
||||||
|
consisently
|
||||||
|
LiveStorm
|
||||||
|
represneted
|
||||||
|
Jagannatha
|
||||||
|
Q2
|
||||||
|
Gainsight
|
||||||
|
unlinked
|
||||||
|
Gainsight's
|
||||||
|
RevOps
|
||||||
|
Heraly
|
||||||
|
Cherrill
|
||||||
|
LeanData
|
||||||
|
nitty
|
||||||
|
Planhat
|
||||||
|
Toothman
|
||||||
|
event
|
||||||
|
event
|
||||||
|
MJ
|
||||||
|
Wix
|
||||||
|
cateogries
|
||||||
|
cateogries
|
||||||
|
Glassdoor
|
||||||
|
accomodate
|
||||||
|
Ines
|
||||||
|
distrcits
|
||||||
|
suggstions
|
||||||
|
Chek's
|
||||||
|
COO
|
||||||
|
nginx's
|
||||||
|
nginx
|
||||||
|
config
|
||||||
|
javascript
|
||||||
|
subdomain
|
||||||
|
Moodle
|
||||||
|
MSP
|
||||||
|
moodle
|
||||||
|
Faux
|
||||||
|
repos
|
||||||
|
Github
|
||||||
|
Gitea
|
||||||
|
AppDaemon
|
||||||
|
AppDaemon's
|
||||||
|
birdnet
|
||||||
|
HomeAssistant
|
||||||
|
MQTT
|
||||||
|
BirdNET
|
||||||
|
reseller
|
||||||
|
Ece
|
||||||
|
accredation
|
||||||
|
|||||||
Binary file not shown.
@ -1,74 +0,0 @@
|
|||||||
# ~/.config/starship.toml
|
|
||||||
|
|
||||||
format = """
|
|
||||||
$character\
|
|
||||||
$directory\
|
|
||||||
$username\
|
|
||||||
$hostname\
|
|
||||||
$python\
|
|
||||||
$os\
|
|
||||||
$shell\
|
|
||||||
$fill\
|
|
||||||
$git_branch$git_commit$git_state$git_status
|
|
||||||
[>... ](fg:purple)
|
|
||||||
"""
|
|
||||||
|
|
||||||
#right_format = "$memory_usage$git_metrics"
|
|
||||||
scan_timeout = 10
|
|
||||||
add_newline = false
|
|
||||||
palette = 'dracula'
|
|
||||||
|
|
||||||
[character]
|
|
||||||
error_symbol = '[\(ಠ_ಠ\)](fg:red)'
|
|
||||||
success_symbol = '[¯\\_\(ツ\)_/¯](fg:green)'
|
|
||||||
|
|
||||||
[directory]
|
|
||||||
truncation_length = 8
|
|
||||||
|
|
||||||
[fill]
|
|
||||||
symbol = '-'
|
|
||||||
style = 'bold grey'
|
|
||||||
|
|
||||||
[python]
|
|
||||||
format = '$symbol ($virtualenv)($style)'
|
|
||||||
|
|
||||||
[git_branch]
|
|
||||||
symbol = '🌱 '
|
|
||||||
truncation_length = 4
|
|
||||||
truncation_symbol = ''
|
|
||||||
always_show_remote = true
|
|
||||||
format = '[$symbol$branch(:$remote_branch)]($style) '
|
|
||||||
|
|
||||||
[git_status]
|
|
||||||
style = 'bold white'
|
|
||||||
#conflicted = '🏳'
|
|
||||||
#ahead = '🏎💨'
|
|
||||||
#behind = '😰'
|
|
||||||
#diverged = '😵'
|
|
||||||
#up_to_date = grey'✓'
|
|
||||||
#untracked = '🤷'
|
|
||||||
#stashed = '📦'
|
|
||||||
#modified = '📝'
|
|
||||||
staged = '[++\($count\)](green)'
|
|
||||||
#renamed = '👅'
|
|
||||||
#deleted = '🗑'
|
|
||||||
|
|
||||||
[memory_usage]
|
|
||||||
disabled = false
|
|
||||||
format = ' $symbol [${ram_pct}](${style})'
|
|
||||||
threshold = -1
|
|
||||||
symbol = '🧙'
|
|
||||||
style = 'bold green'
|
|
||||||
|
|
||||||
[palettes.dracula]
|
|
||||||
black = '#282a36'
|
|
||||||
grey ='#44475a'
|
|
||||||
white = '#f8f8f2'
|
|
||||||
blue ='#6272a4'
|
|
||||||
cyan = '#8be9fd'
|
|
||||||
green = '#50fa7b'
|
|
||||||
orange = '#ffb86c'
|
|
||||||
pink = '#ff79c6'
|
|
||||||
purple = '#bd93f9'
|
|
||||||
red = '#ff5555'
|
|
||||||
yellow = '#f1fa8c'
|
|
||||||
Submodule tmux/.config/tmux/plugins/tmux updated: a966029b99...79068c40b3
Submodule tmux/.config/tmux/plugins/tmux-autoreload deleted from e98aa3b74c
Submodule tmux/.config/tmux/plugins/tmux-colortag deleted from 72ef7174f6
Submodule tmux/.config/tmux/plugins/tmux-continuum updated: fc2f31d795...3e4bc35da4
Submodule tmux/.config/tmux/plugins/tmux-fuzzback deleted from 6031244ae0
Submodule tmux/.config/tmux/plugins/tmux-net-speed deleted from 58abb61597
Submodule tmux/.config/tmux/plugins/tmux-network-bandwidth deleted from 63c6b3283d
Submodule tmux/.config/tmux/plugins/tmux-nova deleted from 7bd3bceb99
Submodule tmux/.config/tmux/plugins/tmux-open-nvim deleted from 2f4818d0d2
Submodule tmux/.config/tmux/plugins/tmux-peacock deleted from b9bce7e817
Submodule tmux/.config/tmux/plugins/tmux-resurrect updated: 027960ad25...cff343cf9e
Submodule tmux/.config/tmux/plugins/tmux-sensible updated: 5d089e418e...25cb91f42d
Submodule tmux/.config/tmux/plugins/tmux-sidebar deleted from aacbdb45bc
Submodule tmux/.config/tmux/plugins/tmux-ssh-status deleted from 5d786c676f
Submodule tmux/.config/tmux/plugins/tmux-themepack deleted from 7c59902f64
Submodule tmux/.config/tmux/plugins/tmux-weather deleted from 28a5fbe75b
Submodule tmux/.config/tmux/plugins/tokyo-night-tmux deleted from 26617ca796
Submodule tmux/.config/tmux/plugins/tpm updated: b699a7e01c...99469c4a9b
Submodule tmux/.config/tmux/plugins/vim-tmux-navigator updated: 9ca5bfe5bd...cdd66d6a37
@ -1,3 +1,9 @@
|
|||||||
|
set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin"
|
||||||
|
set-window-option -g mode-keys vi
|
||||||
|
#set-option default-terminal "screen-256color"
|
||||||
|
set-option default-terminal "tmux-256color"
|
||||||
|
set-option -a terminal-overrides ",*256col*:RGB"
|
||||||
|
|
||||||
# Standard Plugins
|
# Standard Plugins
|
||||||
set -g @plugin 'tmux-plugins/tpm'
|
set -g @plugin 'tmux-plugins/tpm'
|
||||||
set -g @plugin 'tmux-plugins/tmux-sensible'
|
set -g @plugin 'tmux-plugins/tmux-sensible'
|
||||||
@ -6,16 +12,8 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
|
|||||||
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
||||||
set -g @plugin 'tmux-plugins/tmux-continuum'
|
set -g @plugin 'tmux-plugins/tmux-continuum'
|
||||||
|
|
||||||
# synchronize panes toggle - literally typing at the same time in both panes!
|
|
||||||
# unbind C-s
|
|
||||||
# bind C-y set-window-option synchronize-panes
|
|
||||||
|
|
||||||
# Search your Scrollback using fzf
|
# Search your Scrollback using fzf
|
||||||
set -g @plugin 'roosta/tmux-fuzzback'
|
# set -g @plugin 'roosta/tmux-fuzzback'
|
||||||
|
|
||||||
# Open files in Neovim from another pane
|
|
||||||
# Might not work on ZSH. Commenting out for now.
|
|
||||||
# set -g @plugin 'trevarj/tmux-open-nvim'
|
|
||||||
|
|
||||||
# Allow Focus Events
|
# Allow Focus Events
|
||||||
set -g focus-events on
|
set -g focus-events on
|
||||||
@ -23,62 +21,37 @@ set -g focus-events on
|
|||||||
# enable mouse support
|
# enable mouse support
|
||||||
set-option -g mouse on
|
set-option -g mouse on
|
||||||
|
|
||||||
|
# Open Pane in same working directory
|
||||||
|
# Set the control character to Ctrl+Spacebar (instead of Ctrl+B)
|
||||||
|
set -g prefix C-b
|
||||||
|
unbind-key C-space
|
||||||
|
bind-key C-b send-prefix
|
||||||
|
|
||||||
|
# Set new panes to open in current directory
|
||||||
|
bind c new-window -c "#{pane_current_path}"
|
||||||
|
bind '"' split-window -c "#{pane_current_path}"
|
||||||
|
bind % split-window -h -c "#{pane_current_path}"
|
||||||
|
|
||||||
# Vim-Tmux-Navigator plugin/
|
# Vim-Tmux-Navigator plugin/
|
||||||
set -g @plugin 'christoomey/vim-tmux-navigator'
|
set -g @plugin 'christoomey/vim-tmux-navigator'
|
||||||
|
|
||||||
# Navigating Vim & Tmux Panes
|
|
||||||
# Smart pane switching with awareness of Vim splits.
|
|
||||||
#is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
|
|
||||||
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
|
|
||||||
#bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
|
|
||||||
#bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
|
|
||||||
#bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
|
|
||||||
#bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
|
|
||||||
#tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
|
|
||||||
#if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
|
|
||||||
# "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
|
|
||||||
#if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
|
|
||||||
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
|
|
||||||
|
|
||||||
#bind-key -T copy-mode-vi 'C-h' select-pane -L
|
|
||||||
#bind-key -T copy-mode-vi 'C-j' select-pane -D
|
|
||||||
#bind-key -T copy-mode-vi 'C-k' select-pane -U
|
|
||||||
#bind-key -T copy-mode-vi 'C-l' select-pane -R
|
|
||||||
#bind-key -T copy-mode-vi 'C-\' select-pane -l
|
|
||||||
|
|
||||||
# Themes
|
|
||||||
# set -g @plugin 'o0th/tmux-nova'
|
|
||||||
#set -g @plugin "janoamaral/tokyo-night-tmux"
|
|
||||||
|
|
||||||
# Dracula
|
# Dracula
|
||||||
set -g @plugin 'dracula/tmux'
|
set -g @plugin 'dracula/tmux'
|
||||||
set -g @dracula-plugins "git weather network-ping cpu-usage time"
|
set -g @dracula-plugins "git network-ping cpu-usage time"
|
||||||
|
|
||||||
set -g @dracula-show-location false
|
|
||||||
set -g @dracula-fixed-location "Parsippany, NJ"
|
|
||||||
set -g @dracula-show-powerline true
|
set -g @dracula-show-powerline true
|
||||||
set -g @dracula-show-flags true
|
set -g @dracula-show-flags true
|
||||||
set -g @dracula-show-left-icon window
|
set -g @dracula-show-left-icon window
|
||||||
set -g @dracula-border-contrast true
|
set -g @dracula-border-contrast true
|
||||||
|
set -g @dracula-ping-server "google.com"
|
||||||
|
|
||||||
set -g @dracula-ping-server "overras.duckdns.org"
|
|
||||||
set -g @dracula-ping-rate 5
|
set -g @dracula-ping-rate 5
|
||||||
|
|
||||||
set -g @dracula-cpu-usage-label " "
|
set -g @dracula-cpu-usage-label " "
|
||||||
set -g @dracula-cpu-usage-colors "pink dark_gray"
|
set -g @dracula-cpu-usage-colors "pink dark_gray"
|
||||||
|
|
||||||
set -g @dracula-git-show-current-symbol ✓
|
set -g @dracula-git-show-current-symbol ✓
|
||||||
set -g @dracula-git-show-diff-symbol !
|
set -g @dracula-git-show-diff-symbol !
|
||||||
set -g @dracula-git-no-repo-message ⊚
|
set -g @dracula-git-no-repo-message ⊚
|
||||||
|
|
||||||
set -g @dracula-show-timezone false
|
set -g @dracula-show-timezone false
|
||||||
set -g @dracula-military-time true
|
set -g @dracula-military-time true
|
||||||
|
|
||||||
|
|
||||||
run-shell ~/clone/path/continuum.tmux
|
|
||||||
|
|
||||||
# Autoreload tmux.conf
|
|
||||||
set-option -g @plugin 'b0o/tmux-autoreload'
|
|
||||||
# Initiazlie TMUX plugin manager - kept at bottom of file
|
# Initiazlie TMUX plugin manager - kept at bottom of file
|
||||||
run '~/.config/tmux/plugins/tpm/tpm'
|
run '~/.dotfiles/tmux/.config/tmux/plugins/tpm/tpm'
|
||||||
|
|||||||
@ -1,24 +0,0 @@
|
|||||||
# /Users/normrasmussen/.config/tmuxinator/NvimTemplates.yml
|
|
||||||
|
|
||||||
name: Northpass
|
|
||||||
root: ~/
|
|
||||||
windows:
|
|
||||||
- notes:
|
|
||||||
root: ~/Documents/Work/CustomerNotes
|
|
||||||
panes:
|
|
||||||
- nvim
|
|
||||||
- templates:
|
|
||||||
root: ~/Documents/Work/Custom_Templates/customer_templates/
|
|
||||||
panes:
|
|
||||||
- nvim
|
|
||||||
- scripts:
|
|
||||||
root: ~/Documents/Work/Scripts
|
|
||||||
layout: main-horizontal
|
|
||||||
panes:
|
|
||||||
- nvim
|
|
||||||
- pyenv activate np_scripts
|
|
||||||
- dots:
|
|
||||||
root: ~/.config/nvim/
|
|
||||||
panes:
|
|
||||||
- nvim
|
|
||||||
- tut-tut: tut
|
|
||||||
55
tmuxp/Work.yaml
Normal file
55
tmuxp/Work.yaml
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
session_name: Work
|
||||||
|
windows:
|
||||||
|
- layout: ba3e,151x53,0,0,1
|
||||||
|
options: {}
|
||||||
|
panes:
|
||||||
|
- focus: 'true'
|
||||||
|
shell_command: zsh
|
||||||
|
start_directory: /Users/normrasmussen/Documents/Work
|
||||||
|
window_name: notes
|
||||||
|
- layout: c1ff,149x54,0,0,2
|
||||||
|
options: {}
|
||||||
|
panes:
|
||||||
|
- focus: 'true'
|
||||||
|
shell_command: zsh
|
||||||
|
start_directory: /Users/normrasmussen/Documents/Work/Custom_Templates
|
||||||
|
window_name: templates
|
||||||
|
- layout: ba40,151x53,0,0,3
|
||||||
|
options: {}
|
||||||
|
panes:
|
||||||
|
- focus: 'true'
|
||||||
|
shell_command: nvim
|
||||||
|
start_directory: /Users/normrasmussen/Documents/Work/Scripts
|
||||||
|
window_name: scripts
|
||||||
|
- layout: e469,177x53,0,0[177x42,0,0,4,177x10,0,43,5]
|
||||||
|
options: {}
|
||||||
|
panes:
|
||||||
|
- focus: 'true'
|
||||||
|
shell_command:
|
||||||
|
- cd /Users/normrasmussen/.dotfiles
|
||||||
|
- nvim
|
||||||
|
- shell_command:
|
||||||
|
- cd /Users/normrasmussen
|
||||||
|
- zsh
|
||||||
|
window_name: dots
|
||||||
|
- focus: 'true'
|
||||||
|
layout: 5cf6,171x53,0,0[171x36,0,0,7,171x16,0,37{85x16,0,37,14,85x16,86,37,16}]
|
||||||
|
options: {}
|
||||||
|
panes:
|
||||||
|
- shell_command:
|
||||||
|
- cd /Users/normrasmussen/Documents/Projects/hugo_blog/rsmsn_blog
|
||||||
|
- nvim
|
||||||
|
- focus: 'true'
|
||||||
|
shell_command:
|
||||||
|
- cd /Users/normrasmussen/Desktop
|
||||||
|
- shell_command:
|
||||||
|
- cd /Users/normrasmussen/Documents/Projects/hugo_blog/rsmsn_blog
|
||||||
|
- zsh
|
||||||
|
window_name: hugo
|
||||||
|
- layout: 5d96,171x53,0,0,17
|
||||||
|
options: {}
|
||||||
|
panes:
|
||||||
|
- focus: 'true'
|
||||||
|
shell_command: zsh
|
||||||
|
start_directory: /Users/normrasmussen
|
||||||
|
window_name: zsh
|
||||||
65
zsh/.zshrc
Normal file
65
zsh/.zshrc
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||||
|
# Initialization code that may require console input (password prompts, [y/n]
|
||||||
|
# confirmations, etc.) must go above this block; everything else may go below.
|
||||||
|
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||||
|
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||||
|
fi
|
||||||
|
|
||||||
|
export LC_ALL=en_US.UTF-8
|
||||||
|
export LANG=en_US.UTF-8
|
||||||
|
# autoload -Uz compinit; compinit; _comp_options+=(globdots);
|
||||||
|
|
||||||
|
# User configuration
|
||||||
|
export DOT="~/.dotfiles"
|
||||||
|
alias vim='vim -S ~/.vimrc'
|
||||||
|
alias nvim='nvim'
|
||||||
|
alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew'
|
||||||
|
|
||||||
|
export EDITOR="$VISUAL"
|
||||||
|
export VISUAL='nvim'
|
||||||
|
export PYTHONPATH="/opt/homebrew/bin/python3:$PYTHONPATH"
|
||||||
|
export PYENV_ROOT="$HOME/.pyenv"
|
||||||
|
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
|
||||||
|
eval "$(pyenv init -)"
|
||||||
|
eval "$(pyenv virtualenv-init -)"
|
||||||
|
|
||||||
|
# Function to Correctly Source $VIRTUAL_ENV for Neovim
|
||||||
|
function nvimvenv {
|
||||||
|
if [[ -e "$VIRTUAL_ENV" && -f "$VIRTUAL_ENV/bin/activate" ]]; then
|
||||||
|
source "$VIRTUAL_ENV/bin/activate"
|
||||||
|
command nvim "$@"
|
||||||
|
deactivate
|
||||||
|
else
|
||||||
|
command nvim "$@"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
alias nvim=nvimvenv
|
||||||
|
# alias nvim-minimal="NVIM_APPNAME=Minivim nvim"
|
||||||
|
# alias nvim-arduino="NVIM_APPNAME=Arduino nvim"
|
||||||
|
|
||||||
|
#function nvims() {
|
||||||
|
# items=("Main" "Minivim" "Arduinvim")
|
||||||
|
# config=$(printf "%s\n" "${items[@]}" | fzf --prompt=" Neovim Config " --height=~50% --layout=reverse --border --exit-0)
|
||||||
|
# if [[ -z $config ]]; then
|
||||||
|
# echo "Nothing selected"
|
||||||
|
# return 0
|
||||||
|
# elif [[ $config == "Main" ]]; then
|
||||||
|
# config=""
|
||||||
|
# fi
|
||||||
|
# NVIM_APPNAME=$config nvim $@
|
||||||
|
#}
|
||||||
|
#bindkey -s ^a "nvims\n"
|
||||||
|
|
||||||
|
# source /Users/normrasmussen/.docker/init-zsh.sh || true # Added by Docker Desktop
|
||||||
|
export PATH="$PATH:$HOME/.rvm/bin"
|
||||||
|
|
||||||
|
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||||
|
export PATH="/opt/homebrew/sbin:$PATH"
|
||||||
|
export PATH="/opt/homebrew/bin:$PATH"
|
||||||
|
source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme
|
||||||
|
|
||||||
|
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||||
|
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||||
|
source ~/.dotfiles/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
source ~/.dotfiles/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||||
8
zsh/.zshrc.minimal
Normal file
8
zsh/.zshrc.minimal
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
export LC_ALL=en_US.UTF-8
|
||||||
|
export LANG=en_US.UTF-8
|
||||||
|
|
||||||
|
# User configuration
|
||||||
|
export DOT="~/.dotfiles"
|
||||||
|
alias vim='vim -S ~/.vimrc'
|
||||||
|
alias nvim='nvim'
|
||||||
|
source ~/.dotfiles/zsh/.zshrc
|
||||||
1
zsh/zsh-autosuggestions
Submodule
1
zsh/zsh-autosuggestions
Submodule
Submodule zsh/zsh-autosuggestions added at c3d4e576c9
1
zsh/zsh-syntax-highlighting
Submodule
1
zsh/zsh-syntax-highlighting
Submodule
Submodule zsh/zsh-syntax-highlighting added at 143b25eb98
15
zsh_issues.md
Normal file
15
zsh_issues.md
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
---
|
||||||
|
title: "Test"
|
||||||
|
date: 2023-09-12T17:19:08Z
|
||||||
|
draft: false
|
||||||
|
---
|
||||||
|
|
||||||
|
Yesterday, I could not get my ZSH shell to work at all. As I kept trying things, I was getting all these weird errors. I started posting about this on Mastodon too.
|
||||||
|
|
||||||
|
[Mastodon Thread](https://fosstodon.org/@notnorm/111047573608738701) where I kept asking myself - no responses!
|
||||||
|
|
||||||
|
Finally, I realized the issue. And that was the [Starship](https://www.starship.rs) cross-shell prompt. Turns out, it was making everything really really slow.
|
||||||
|
|
||||||
|
I finally got it fixed by doing the following:
|
||||||
|
* Delete everything from `~/.zsh_sessions/` and `~/.zsh_history`.
|
||||||
|
* Do not use `source ~/.zshrc` and definitely don't use it in your `zshrc` file! Instead of `source` use `exec zsh`
|
||||||
Reference in New Issue
Block a user