Compare commits
16 Commits
backup-mas
...
delete
| Author | SHA1 | Date | |
|---|---|---|---|
| 3c344bc893 | |||
| 2f6161a917 | |||
| b1d3afc7d8 | |||
| dc4a294bc7 | |||
| d4d1d5ef23 | |||
| 00a84209f8 | |||
| bfd35215c7 | |||
| 2dbad0ebdf | |||
| 699304de12 | |||
| 54583572b8 | |||
| ebbf7b99ae | |||
| 458f46cef4 | |||
| e4ca0941d5 | |||
| 4069c13d0d | |||
| b3413957d3 | |||
| 86f495c878 |
@ -3,7 +3,7 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"--filteer=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
@ -12,12 +12,11 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
vim.g.mapleader = ','
|
||||
vim.g.localmapleader = ','
|
||||
vim.opt.textwidth = 85
|
||||
--- vim.opt.textwidth = 85
|
||||
vim.opt.colorcolumn = '+2'
|
||||
|
||||
require('lazy').setup('plugins')
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
-- General Neovim settings and configuration
|
||||
-----------------------------------------------------------
|
||||
@ -45,7 +44,7 @@ opt.shell = "/bin/zsh"
|
||||
opt.updatetime = 200
|
||||
opt.cursorline = true
|
||||
g.markdown_folding = 1
|
||||
-- opt.spell=true
|
||||
opt.spell=true
|
||||
opt.spelllang = 'en_us'
|
||||
cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
|
||||
vim.api.nvim_set_hl(0, "ColorColumn", {guibg=DarkOrchid1})
|
||||
@ -78,10 +77,10 @@ opt.termguicolors = true -- Enable 24-bit RGB colors
|
||||
-----------------------------------------------------------
|
||||
-- Tabs, indent
|
||||
-----------------------------------------------------------
|
||||
opt.expandtab = true -- Use spaces instead of tabs
|
||||
opt.shiftwidth = 4 -- Shift 4 spaces when tab
|
||||
opt.tabstop = 4 -- 1 tab == 4 spaces
|
||||
opt.smartindent = true -- Autoindent new lines
|
||||
g.expandtab = true -- Use spaces instead of tabs
|
||||
g.shiftwidth = 2 -- Shift 4 spaces when tab
|
||||
g.tabstop = 1 -- 1 tab == 4 spaces
|
||||
g.smartindent = true -- Autoindent new lines
|
||||
-----------------------------------------------------------
|
||||
-- Glow Settings
|
||||
-----------------------------------------------------------
|
||||
@ -90,15 +89,19 @@ g.glow_border = 'rounded'
|
||||
g.glow_width = 120
|
||||
g.glow_use_pager = true
|
||||
g.glow_style = 'dark'
|
||||
|
||||
-----------------------------------------------------------
|
||||
-- MKDX Settings, mkdx#settings.
|
||||
-- AutoCmd and Additional Function Settings.
|
||||
-----------------------------------------------------------
|
||||
-- 2 spaces for selected filetypes
|
||||
cmd [[
|
||||
autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=8 noexpandtab
|
||||
]]
|
||||
|
||||
vim.cmd [[
|
||||
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 = {
|
||||
"netrw",
|
||||
"netrwPlugin",
|
||||
@ -122,11 +125,10 @@ local disabled_built_ins = {
|
||||
|
||||
for _, plugin in pairs(disabled_built_ins) do
|
||||
vim.g["loaded_" .. plugin] = 1
|
||||
end
|
||||
|
||||
--[[
|
||||
Deletes all trailing whitespaces in a file if it's not binary nor a diff.
|
||||
end
|
||||
]]--
|
||||
|
||||
-- Deletes all trailing whitespaces in a file if it's not binary nor a diff.
|
||||
function _G.trim_trailing_whitespaces()
|
||||
if not o.binary and o.filetype ~= 'diff' then
|
||||
local current_view = fn.winsaveview()
|
||||
@ -135,6 +137,13 @@ function _G.trim_trailing_whitespaces()
|
||||
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
|
||||
--[[vim.cmd[[
|
||||
highlight! link CmpItemMenu Comment
|
||||
@ -155,7 +164,7 @@ end
|
||||
highlight! CmpItemKindProperty guibg=NONE guifg=#D4D4D4
|
||||
highlight! CmpItemKindUnit guibg=NONE guifg=#D4D4D4
|
||||
]]
|
||||
--]]
|
||||
--]]
|
||||
|
||||
require('core/keymaps')
|
||||
vim.cmd[[colorscheme moonlight]]
|
||||
vim.cmd[[colorscheme tol]]
|
||||
|
||||
@ -1,75 +1,78 @@
|
||||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
|
||||
"adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" },
|
||||
"alpha-nvim": { "branch": "main", "commit": "5f211a1597b06be24b1600d72a62b94cab1e2df9" },
|
||||
"alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" },
|
||||
"auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" },
|
||||
"barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
|
||||
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
|
||||
"cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
|
||||
"cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||
"deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" },
|
||||
"distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" },
|
||||
"dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" },
|
||||
"f-string-toggle.nvim": { "branch": "main", "commit": "383ca5c08ed001f7c1632ba752c14e7bb88ce6ed" },
|
||||
"feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "44adf808ace6cb65a3353bd61fa585a2d8fe0db3" },
|
||||
"f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" },
|
||||
"glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" },
|
||||
"headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
|
||||
"lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" },
|
||||
"hover.nvim": { "branch": "main", "commit": "a173256a9dba938e876ceb4bb5d2742f8866e349" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "8a7b48f5823cc924f815129192288ec2e2b9288f" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "9788a19ec0b4036028e78aec702634b4b89d3470" },
|
||||
"lsp-timeout.nvim": { "branch": "main", "commit": "9a28c3fe10a5db856f5e5ac505afcfe79b49934e" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "09be3766669bfbabbe2863c624749d8da392c916" },
|
||||
"mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
|
||||
"mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" },
|
||||
"mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
|
||||
"mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
|
||||
"mini.fuzzy": { "branch": "stable", "commit": "295763d73cbf580c27a4419364c47b09fc82e0f4" },
|
||||
"mini.move": { "branch": "main", "commit": "3afd39873eb9171684e554a214c055482444a47d" },
|
||||
"mini.pairs": { "branch": "stable", "commit": "963b800d0524eadd297199207011b98684205ada" },
|
||||
"mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" },
|
||||
"mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" },
|
||||
"mkdnflow.nvim": { "branch": "main", "commit": "a728a3533bb57502fdfd6fdb4e5839fc87430edc" },
|
||||
"moonfly": { "branch": "master", "commit": "1e81cbb88a34c41572fde43cd633bd6d60727274" },
|
||||
"neorg": { "branch": "main", "commit": "064f8f65dd32f4fe728e76acfa3e4e153b121147" },
|
||||
"neorg-templates": { "branch": "main", "commit": "1078ced1f995cc053cdb10b51bd5e5dd5d76f78a" },
|
||||
"mini.move": { "branch": "main", "commit": "b3bca8e493f8d1da343ff1be06c21a47e2fde1c0" },
|
||||
"mini.pairs": { "branch": "stable", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" },
|
||||
"mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
|
||||
"mini.trailspace": { "branch": "main", "commit": "e8c144ee11f6a827ac9c5732f20aefbbd7b26035" },
|
||||
"mkdnflow.nvim": { "branch": "main", "commit": "f7e513a521f5926df034cf40ddd54b43ba73a013" },
|
||||
"moonfly": { "branch": "master", "commit": "5d7aff3545cd3f365215bf86a3f188b65ab9b90c" },
|
||||
"neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" },
|
||||
"neovim": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" },
|
||||
"nightfox.nvim": { "branch": "main", "commit": "a48f6d9a0273101df76eb25d2f5477baa277f935" },
|
||||
"nightfox.nvim": { "branch": "main", "commit": "6a6076bd678f825ffbe16ec97807793c3167f1a7" },
|
||||
"null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
|
||||
"numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
|
||||
"nvim": { "branch": "main", "commit": "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
|
||||
"nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" },
|
||||
"nvim": { "branch": "main", "commit": "dcef0a062de380885193fb0f919217d58b979753" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" },
|
||||
"nvim-dap": { "branch": "master", "commit": "92dc531eea2c9a3ef504a5c8ac0decd1fa59a6a3" },
|
||||
"nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" },
|
||||
"nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "00741206c2df9c4b538055def19b99790f0c95c8" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "691d73287a94e8ed82a383df82aabfe77ab4bcaa" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" },
|
||||
"nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
|
||||
"nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "40b9b887d090d5da89a84689b4ca0304a9649f62" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "4a68f0778c05083cc458a3a144205cfc41474439" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
||||
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
||||
"pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" },
|
||||
"sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" },
|
||||
"starry.nvim": { "branch": "master", "commit": "f189b1026ef11ab61185a4bb35baf72106a624de" },
|
||||
"starry.nvim": { "branch": "master", "commit": "ee585b622455deace2b59d2f846c713805f69100" },
|
||||
"symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
|
||||
"telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
|
||||
"telescope-file-browser.nvim": { "branch": "master", "commit": "6e51d0cd6447cf2525412220ff0a2885eef9039c" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
|
||||
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
|
||||
"tmux.nvim": { "branch": "main", "commit": "cb12b31a6b8aea1b39e4735ed70f7c73c2a938b0" },
|
||||
"tmux.nvim": { "branch": "main", "commit": "673782b74a6055d430d3f5148a033edd99e5519f" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "faee9d60428afc7857e0927fdc18daa6c409fa64" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "531b04704fc9ff994d8b9c0720428fdc3c7d49d1" },
|
||||
"tol.nvim": { "branch": "main", "commit": "5ce76f5173a8331c4ed0b89941f5465a1a3732b3" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
|
||||
"vim-arduino": { "branch": "master", "commit": "111db616db21d4f925691f1517792953f7671647" },
|
||||
"vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }
|
||||
"vim-wakatime": { "branch": "master", "commit": "945a441b83e48c7bafdd227ef8e2eb826f72ab90" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
|
||||
}
|
||||
BIN
nvim/.config/nvim/lua/.DS_Store
vendored
BIN
nvim/.config/nvim/lua/.DS_Store
vendored
Binary file not shown.
@ -6,12 +6,12 @@ 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)
|
||||
-- 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)
|
||||
-- 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)
|
||||
@ -35,11 +35,16 @@ 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)
|
||||
------------------------------------------------
|
||||
|
||||
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"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
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
|
||||
}
|
||||
|
||||
@ -12,19 +12,33 @@ return {
|
||||
package_pending = "➜",
|
||||
package_uninstalled = "✗"
|
||||
}
|
||||
}
|
||||
})
|
||||
end,
|
||||
},
|
||||
{ 'williamboman/mason-lspconfig.nvim',
|
||||
config = function() require("mason-lspconfig").setup{} end,
|
||||
}
|
||||
})
|
||||
end,
|
||||
},
|
||||
{ 'neovim/nvim-lspconfig' },
|
||||
|
||||
{
|
||||
'L3MON4D3/LuaSnip', version = "2.0.0",
|
||||
{ 'williamboman/mason-lspconfig.nvim',
|
||||
config = function() require("mason-lspconfig").setup{} end,
|
||||
},
|
||||
{ 'neovim/nvim-lspconfig' },
|
||||
{
|
||||
'hinell/lsp-timeout.nvim',
|
||||
dependencies={ "neovim/nvim-lspconfig" }
|
||||
},
|
||||
{
|
||||
'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,
|
||||
},
|
||||
|
||||
{"ellisonleao/glow.nvim", config = function() require("glow").setup() end },
|
||||
@ -46,6 +60,7 @@ return {
|
||||
{ 'MaximilianLloyd/adjacent.nvim' },
|
||||
{ 'stevearc/vim-arduino'},
|
||||
{ 'sindrets/diffview.nvim' },
|
||||
{ 'skwee357/nvim-prose' },
|
||||
{
|
||||
'nacro90/numb.nvim',
|
||||
config = function() require('numb').setup{
|
||||
@ -60,9 +75,16 @@ return {
|
||||
{
|
||||
'nvim-lualine/lualine.nvim',
|
||||
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
config = function() require('lualine').setup{
|
||||
options = { theme = 'palenight' }
|
||||
} end,
|
||||
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
|
||||
@ -74,7 +96,21 @@ return {
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
},
|
||||
config = function()
|
||||
require("nvim-tree").setup {}
|
||||
require("nvim-tree").setup({
|
||||
sort_by = "case_sensitive",
|
||||
view = {
|
||||
width = 30,
|
||||
},
|
||||
renderer = {
|
||||
group_empty = true,
|
||||
},
|
||||
filters = {
|
||||
dotfiles = true,
|
||||
},
|
||||
diagnostics = {
|
||||
enable = true,
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
@ -125,7 +161,9 @@ return {
|
||||
|
||||
-- Top Right Notify Pop Up
|
||||
'rcarriga/nvim-notify',
|
||||
{'akinsho/toggleterm.nvim', version = "*", opts = {--[[ things you want to change go here]]}},
|
||||
{'akinsho/toggleterm.nvim', version = "*", opts = {
|
||||
direction = 'float',
|
||||
}},
|
||||
|
||||
------------------------------------------------------------
|
||||
-- echasnovski's Minis get a section of their own...
|
||||
@ -229,8 +267,6 @@ return {
|
||||
"git",
|
||||
"symbols",
|
||||
"diagnostics",
|
||||
"files",
|
||||
"todos",
|
||||
},
|
||||
todos = {
|
||||
initially_closed = false, -- whether the groups should be initially closed on start. You can manually open/close groups later.
|
||||
@ -247,7 +283,6 @@ return {
|
||||
},
|
||||
|
||||
---------------------------------------------------------
|
||||
|
||||
-- Text, Icons, Symbols
|
||||
----------------------------------------------------------
|
||||
|
||||
@ -257,10 +292,15 @@ return {
|
||||
require('symbols-outline').setup()
|
||||
end
|
||||
},
|
||||
|
||||
{
|
||||
"j-hui/fidget.nvim",
|
||||
tag = "legacy",
|
||||
event = "LspAttach",
|
||||
opts = {
|
||||
-- options
|
||||
},
|
||||
},
|
||||
'lukas-reineke/indent-blankline.nvim',
|
||||
'folke/lsp-colors.nvim',
|
||||
'Mofiqul/dracula.nvim',
|
||||
'karb94/neoscroll.nvim',
|
||||
|
||||
-- Allow Popups for Telescope etc
|
||||
@ -311,12 +351,11 @@ return {
|
||||
},
|
||||
|
||||
-----------------------------------------------------------
|
||||
|
||||
-- Various Color Schemes, Dashboard, etc
|
||||
-----------------------------------------------------------
|
||||
|
||||
{'ray-x/starry.nvim', setup=function()
|
||||
end},
|
||||
'Mofiqul/dracula.nvim',
|
||||
'ray-x/starry.nvim',
|
||||
'rose-pine/neovim',
|
||||
'EdenEast/nightfox.nvim',
|
||||
'catppuccin/nvim',
|
||||
@ -331,24 +370,33 @@ return {
|
||||
},
|
||||
{ "bluz71/vim-moonfly-colors", name = "moonfly", lazy = true, priority = 1000 },
|
||||
'Bekaboo/deadcolumn.nvim',
|
||||
-- {
|
||||
-- 'm4xshen/smartcolumn.nvim',
|
||||
-- config = function()
|
||||
-- require("smartcolumn").setup{
|
||||
-- config = {
|
||||
-- colorcolumn = "100",
|
||||
-- disabled_filetypes = { "help" },
|
||||
-- custom_colorcolumn = {},
|
||||
-- },
|
||||
-- }
|
||||
-- end
|
||||
-- },
|
||||
{
|
||||
'feline-nvim/feline.nvim',
|
||||
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
},
|
||||
-- Plugin that causes your code to crumble >:)
|
||||
-- 'eandrju/cellular-automaton.nvim',
|
||||
"dustypomerleau/tol.nvim",
|
||||
lazy = false, -- load the colorscheme at startup
|
||||
priority = 1000, -- load colorscheme first
|
||||
config = true,
|
||||
},
|
||||
-- {
|
||||
-- "wookayin/semshi",
|
||||
-- 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/vim-wakatime',
|
||||
|
||||
@ -14,15 +14,16 @@ return {
|
||||
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", "MD024", "MD013", "--" }
|
||||
,}),
|
||||
null_ls.builtins.diagnostics.markdownlint.with({
|
||||
extra_args = { "--disable", "MD024", "MD013", "--" }}),
|
||||
null_ls.builtins.formatting.black,
|
||||
null_ls.builtins.diagnostics.ruff,
|
||||
-- null_ls.builtins.diagnostics.pylama,
|
||||
-- null_ls.builtins.diagnostics.pylint,
|
||||
-- null_ls.builtins.diagnostics.pycodestyle,
|
||||
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
|
||||
|
||||
@ -15,27 +15,6 @@ return {
|
||||
name_is_source = true,
|
||||
conceal = true,
|
||||
},
|
||||
new_file_template = {
|
||||
use_template = true,
|
||||
template = [[
|
||||
# {{ title }}
|
||||
* Date: {{ date }}
|
||||
* Customer: {{ customer }}
|
||||
|
||||
## Meeting Notes:]],
|
||||
placeholders = {
|
||||
before = {
|
||||
date = function()
|
||||
return os.date("%A, %B %d, %Y") -- Wednesday, March 1, 2023
|
||||
end
|
||||
},
|
||||
after = {
|
||||
customer = function()
|
||||
return vim.fn.expand('%:p:h:t')
|
||||
end
|
||||
}
|
||||
}
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
return {
|
||||
"nvim-neorg/neorg",
|
||||
build = ":Neorg sync-parsers",
|
||||
dependencies = {
|
||||
{ "nvim-lua/plenary.nvim",
|
||||
"pysan3/neorg-templates", dependencies = { "L3MON4D3/LuaSnip" },
|
||||
},
|
||||
},
|
||||
config = function()
|
||||
require("neorg").setup {
|
||||
load = {
|
||||
["core.defaults"] = {},
|
||||
["core.concealer"] = {},
|
||||
["core.integrations.nvim-cmp"] = {},
|
||||
["core.integrations.treesitter"] = {},
|
||||
["core.highlights"] = {},
|
||||
["core.export"] = {},
|
||||
["core.mode"] = {},
|
||||
["core.itero"] = {},
|
||||
["core.keybinds"] = {
|
||||
config = {
|
||||
hook = function(keybinds)
|
||||
keybinds.remap_key("norg", "n", "<M-CR>", "<S-tab>")
|
||||
end,
|
||||
}
|
||||
},
|
||||
["core.completion"] = {
|
||||
config = {
|
||||
engine = "nvim-cmp"
|
||||
},
|
||||
},
|
||||
["core.dirman"] = {
|
||||
config = {
|
||||
workspaces = {
|
||||
customer_notes = "~/Documents/Work/Customer_Notes/",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
end,
|
||||
}
|
||||
@ -8,6 +8,7 @@ return {
|
||||
'hrsh7th/cmp-buffer',
|
||||
'hrsh7th/cmp-cmdline',
|
||||
'hrsh7th/nvim-cmp',
|
||||
'hrsh7th/cmp-calc',
|
||||
'saadparwaiz1/cmp_luasnip',
|
||||
'hrsh7th/cmp-nvim-lsp-signature-help',
|
||||
'f3fora/cmp-spell',
|
||||
@ -29,14 +30,27 @@ return {
|
||||
-- Load snippet support
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
luasnip.lsp_expand(args.body)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end
|
||||
},
|
||||
|
||||
-- Completion settings
|
||||
completion = {
|
||||
--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
|
||||
@ -75,12 +89,12 @@ return {
|
||||
end,
|
||||
},
|
||||
sources = {
|
||||
{ name = 'nvim-lsp', keyword_length = 1 },
|
||||
{ name = 'luasnip', keyword_length=2 },
|
||||
{ name = 'nvim_lsp', },
|
||||
{ name = 'luasnip', },
|
||||
{ name = 'path' },
|
||||
{ name = 'calc' },
|
||||
{ name = 'nvim_lsp_signature_help' },
|
||||
{ name = 'buffer', keyword_length = 3 },
|
||||
{ name = 'neorg' },
|
||||
{ name = 'buffer' },
|
||||
},
|
||||
formatting = {
|
||||
fields = {'menu', 'abbr', 'kind'},
|
||||
@ -90,6 +104,8 @@ return {
|
||||
luasnip = '⋗',
|
||||
buffer = 'Ω',
|
||||
path = '',
|
||||
calc = '',
|
||||
nvim_lsp_signature_help = '',
|
||||
}
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
@ -105,6 +121,12 @@ return {
|
||||
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
|
||||
}
|
||||
|
||||
@ -1,51 +1,73 @@
|
||||
return {
|
||||
'neovim/nvim-lspconfig',
|
||||
config = function()
|
||||
-- Mappings.
|
||||
-- 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
|
||||
local opts = { noremap=true, silent=true }
|
||||
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
|
||||
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
|
||||
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 an on_attach function to only map the following keys
|
||||
-- Use LspAttach autocommand to only map the following keys
|
||||
-- after the language server attaches to the current buffer
|
||||
local on_attach = function(client, bufnr)
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
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'
|
||||
|
||||
-- Mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
local bufopts = { noremap=true, silent=true, buffer=bufnr }
|
||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
|
||||
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, bufopts)
|
||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
|
||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
|
||||
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
||||
vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
|
||||
end
|
||||
|
||||
local lsp_flags = {
|
||||
-- This is the default in Nvim 0.7+
|
||||
debounce_text_changes = 150,
|
||||
}
|
||||
require('lspconfig')['pyright'].setup{
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
}
|
||||
require('lspconfig')['tsserver'].setup{
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
}
|
||||
-- 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
|
||||
|
||||
return {
|
||||
-- Treesitter interface
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
--build = ":TSUpdate"
|
||||
config = function ()
|
||||
require('nvim-treesitter.install').update({ with_sync = true })
|
||||
build = ":TSUpdate",
|
||||
config = function ()
|
||||
local configs = require("nvim-treesitter.configs")
|
||||
configs.setup({
|
||||
-- require('nvim-treesitter.install').update({ with_sync = true })
|
||||
-- A list of parser names, or "all"
|
||||
ensure_installed = {
|
||||
'bash', 'css', 'html', 'javascript', 'json', 'lua', 'python',
|
||||
'vim', 'yaml', 'typescript', 'markdown',
|
||||
}
|
||||
sync_install = true
|
||||
highlight = {
|
||||
-- `false` will disable the whole extension
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = true,
|
||||
}
|
||||
ensure_installed = {
|
||||
'bash', 'css', 'html', 'javascript', 'json', 'lua', 'python',
|
||||
'vim', 'yaml', 'typescript', 'markdown',
|
||||
},
|
||||
sync_install = true,
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = true,
|
||||
},
|
||||
indent = { enable = true },
|
||||
})
|
||||
end
|
||||
}
|
||||
|
||||
16
nvim/.config/nvim/lua/plugins/pulse.lua
Normal file
16
nvim/.config/nvim/lua/plugins/pulse.lua
Normal file
@ -0,0 +1,16 @@
|
||||
return {
|
||||
'linguini1/pulse.nvim',
|
||||
version = "*",
|
||||
config = function()
|
||||
|
||||
local pulse = require("pulse")
|
||||
|
||||
pulse.setup({level = vim.log.levels.DEBUG})
|
||||
|
||||
pulse.add("Send Krista Message", {
|
||||
interval = 60,
|
||||
message = "Tell Krista that you Love Her!",
|
||||
enabled = True,
|
||||
})
|
||||
end
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
[[--return {
|
||||
"folke/styler.nvim",
|
||||
config = function()
|
||||
require("styler").setup({
|
||||
themes = {
|
||||
markdown = { colorscheme = "tokyonight-storm" },
|
||||
python = { colorscheme = "dracula" },
|
||||
html = { colorscheme = "carbonfox" },
|
||||
help = { colorscheme = "catppuccin-mocha", background = "dark" },
|
||||
css = { colorscheme = "carbonfox" },
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
--]]
|
||||
@ -155,6 +155,7 @@ return {
|
||||
require("telescope").load_extension "live_grep_args"
|
||||
require("telescope").load_extension "fzf"
|
||||
require("telescope").load_extension "adjacent"
|
||||
require("telescope").load_extension "pulse"
|
||||
end
|
||||
|
||||
}}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -318,3 +318,24 @@ 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,70 +0,0 @@
|
||||
# ~/.config/starship.toml
|
||||
|
||||
format = """
|
||||
$character\
|
||||
$directory\
|
||||
$python\
|
||||
$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 = 3
|
||||
|
||||
[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 = '✓'
|
||||
#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'
|
||||
@ -1,5 +1,8 @@
|
||||
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
|
||||
set -g @plugin 'tmux-plugins/tpm'
|
||||
@ -40,7 +43,7 @@ set -g @dracula-show-powerline true
|
||||
set -g @dracula-show-flags true
|
||||
set -g @dracula-show-left-icon window
|
||||
set -g @dracula-border-contrast true
|
||||
set -g @dracula-ping-server "overras.duckdns.org"
|
||||
set -g @dracula-ping-server "google.com"
|
||||
set -g @dracula-ping-rate 5
|
||||
set -g @dracula-cpu-usage-label " "
|
||||
set -g @dracula-cpu-usage-colors "pink dark_gray"
|
||||
@ -50,8 +53,5 @@ set -g @dracula-git-no-repo-message ⊚
|
||||
set -g @dracula-show-timezone false
|
||||
set -g @dracula-military-time true
|
||||
|
||||
#run-shell ~/.dotfiles/tmux/.config/tmux/plugins/tmux-continuum/continuum.tmux
|
||||
|
||||
# Initiazlie TMUX plugin manager - kept at bottom of file
|
||||
# run '~/.config/tmux/plugins/tpm/tpm'
|
||||
run '~/.dotfiles/tmux/.config/tmux/plugins/tpm/tpm'
|
||||
|
||||
@ -1,54 +1,55 @@
|
||||
session_name: Northpass
|
||||
session_name: Work
|
||||
windows:
|
||||
- layout: c39e,229x45,0,0,1
|
||||
- layout: ba3e,151x53,0,0,1
|
||||
options: {}
|
||||
panes:
|
||||
- focus: 'true'
|
||||
shell_command: zsh
|
||||
start_directory: /Users/normrasmussen/Documents/Work
|
||||
window_name: notes
|
||||
- focus: 'true'
|
||||
layout: c39f,229x45,0,0,2
|
||||
- layout: c1ff,149x54,0,0,2
|
||||
options: {}
|
||||
panes:
|
||||
- focus: 'true'
|
||||
shell_command: Python
|
||||
start_directory: /Users/normrasmussen/.dotfiles/tmuxp
|
||||
shell_command: zsh
|
||||
start_directory: /Users/normrasmussen/Documents/Work/Custom_Templates
|
||||
window_name: templates
|
||||
- layout: 40b3,229x45,0,0[229x42,0,0,3,229x2,0,43,4]
|
||||
- layout: ba40,151x53,0,0,3
|
||||
options: {}
|
||||
panes:
|
||||
- focus: 'true'
|
||||
shell_command:
|
||||
- cd /Users/normrasmussen/Documents/Work/Scripts/GoogleScripts/Luminate_API_Exam
|
||||
- zsh
|
||||
- shell_command:
|
||||
- cd /Users/normrasmussen/Documents/Work/Scripts/API_Tests
|
||||
- zsh
|
||||
shell_command: nvim
|
||||
start_directory: /Users/normrasmussen/Documents/Work/Scripts
|
||||
window_name: scripts
|
||||
- layout: c3c2,196x45,0,0,5
|
||||
options: {}
|
||||
panes:
|
||||
- focus: 'true'
|
||||
shell_command: zsh
|
||||
start_directory: /Users/normrasmussen/.dotfiles
|
||||
window_name: dots
|
||||
- layout: 60a9,229x45,0,0[229x42,0,0,6,229x2,0,43,18]
|
||||
options: {}
|
||||
panes:
|
||||
- focus: 'true'
|
||||
shell_command: zsh
|
||||
- zsh
|
||||
start_directory: /Users/normrasmussen/Documents/Projects/nginx_docs
|
||||
window_name: nginx
|
||||
- layout: 0ceb,229x45,0,0{115x45,0,0,11,113x45,116,0,14}
|
||||
- layout: e469,177x53,0,0[177x42,0,0,4,177x10,0,43,5]
|
||||
options: {}
|
||||
panes:
|
||||
- focus: 'true'
|
||||
shell_command:
|
||||
- cd /Users/normrasmussen/Documents/Projects
|
||||
- zsh
|
||||
- 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
|
||||
|
||||
46
zsh/.zshrc
46
zsh/.zshrc
@ -1,26 +1,15 @@
|
||||
# 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
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
# export ZSH="$HOME/.oh-my-zsh"
|
||||
export LC_ALL=en_US.UTF-8
|
||||
export LANG=en_US.UTF-8
|
||||
|
||||
plugins=(
|
||||
zsh-autosuggestions,
|
||||
git,
|
||||
wakatime,
|
||||
brew,
|
||||
npm,
|
||||
z,
|
||||
zsh-syntax-highlighting,
|
||||
vi-mode,
|
||||
)
|
||||
|
||||
# Zsh Autosuggestion Config
|
||||
source ~/.dotfiles/zsh/zsh-autosuggestions/
|
||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#ff00ff,bg=cyan,bold,underline"
|
||||
# autoload -Uz compinit; compinit; _comp_options+=(globdots);
|
||||
|
||||
# User configuration
|
||||
|
||||
export DOT="~/.dotfiles"
|
||||
alias vim='vim -S ~/.vimrc'
|
||||
alias nvim='nvim'
|
||||
@ -32,7 +21,20 @@ 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"
|
||||
|
||||
@ -50,10 +52,14 @@ eval "$(pyenv init -)"
|
||||
#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"
|
||||
eval "$(starship init zsh)"
|
||||
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
|
||||
Submodule zsh/zsh-autosuggestions updated: 9908eb49a3...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