diff --git a/Minivim/.config/Minivim/data/.DS_Store b/Minivim/.config/Minivim/data/.DS_Store new file mode 100644 index 0000000..e56a20e Binary files /dev/null and b/Minivim/.config/Minivim/data/.DS_Store differ diff --git a/Minivim/.config/Minivim/data/lsp_servers/bash.lua b/Minivim/.config/Minivim/data/lsp_servers/bash.lua new file mode 100644 index 0000000..4011d9a --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/bash.lua @@ -0,0 +1,6 @@ +local lsp_config = require('nvim-lspconfig') +local on_attach = require('lsp/on_attach') + +lsp_config.bashls.setup({ + on_attach = on_attach +}) diff --git a/Minivim/.config/Minivim/data/lsp_servers/css.lua b/Minivim/.config/Minivim/data/lsp_servers/css.lua new file mode 100644 index 0000000..78aad55 --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/css.lua @@ -0,0 +1,21 @@ +local lsp_config = require('nvim-lspconfig') +local on_attach = require('lsp/on_attach') + +lsp_config.cssls.setup({ + filetypes = { 'css', 'sass', 'scss' }, + settings = { + css = { + validate = true + }, + sass = { + validate = true + }, + scss = { + validate = true + } + }, + on_attach = function(client) + client.resolved_capabilities.document_formatting = false + on_attach(client) + end +}) diff --git a/Minivim/.config/Minivim/data/lsp_servers/html.lua b/Minivim/.config/Minivim/data/lsp_servers/html.lua new file mode 100644 index 0000000..92b35a4 --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/html.lua @@ -0,0 +1,9 @@ +local lsp_config = require('plugins/nvim-lspconfig') +local on_attach = require('lsp/on_attach') + +lsp_config.html.setup({ + on_attach = function(client) + client.resolved_capabilities.document_formatting = false + on_attach(client) + end +}) diff --git a/Minivim/.config/Minivim/data/lsp_servers/init.lua b/Minivim/.config/Minivim/data/lsp_servers/init.lua new file mode 100644 index 0000000..91b4a8c --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/init.lua @@ -0,0 +1,37 @@ +vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, + { + underline = true, + virtual_text = { + prefix = "●", + spacing = 2, + }, + update_in_insert = true, + severity_sort = true, + } +) + +vim.fn.sign_define("LspDiagnosticsSignError", { + text = "✖", + numhl = "LspDiagnosticsDefaultError", +}) +vim.fn.sign_define("LspDiagnosticsSignWarning", { + text = "▲", + numhl = "LspDiagnosticsDefaultWarning", +}) +vim.fn.sign_define("LspDiagnosticsSignInformation", { + text = "●", + numhl = "LspDiagnosticsDefaultInformation", +}) +vim.fn.sign_define("LspDiagnosticsSignHint", { + text = "✱", + numhl = "LspDiagnosticsDefaultHint", +}) + +require "lsp/bash" +require "lsp/css" +require "lsp/html" +require "lsp/json" +require "lsp/typescript" +require "lsp/vim" +require "lsp/vim" diff --git a/Minivim/.config/Minivim/data/lsp_servers/json.lua b/Minivim/.config/Minivim/data/lsp_servers/json.lua new file mode 100644 index 0000000..2e65e73 --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/json.lua @@ -0,0 +1,9 @@ +local lsp_config = require('plugins/nvim-lspconfig') +local on_attach = require('lsp/on_attach') + +lsp_config.jsonls.setup({ + on_attach = function(client) + client.resolved_capabilities.document_formatting = false + on_attach(client) + end +}) diff --git a/Minivim/.config/Minivim/data/lsp_servers/lua.lua b/Minivim/.config/Minivim/data/lsp_servers/lua.lua new file mode 100644 index 0000000..c5c9a0c --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/lua.lua @@ -0,0 +1,29 @@ +local lsp_config = require('nvim-lspconfig') +local on_attach = require('lsp/on_attach') + +lsp_config.sumneko_lua.setup({ + on_attach = on_attach, + settings = { + Lua = { + runtime = { + version = 'LuaJIT', + }, + diagnostics = { + enable = true, + globals = { + "vim", + "describe", + "it", + "before_each", + "after_each" + } + }, + workspace = { + library = { + [vim.fn.expand('$VIMRUNTIME/lua')] = true, + [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true + }, + }, + } + } +}) diff --git a/Minivim/.config/Minivim/data/lsp_servers/prosemd.lua b/Minivim/.config/Minivim/data/lsp_servers/prosemd.lua new file mode 100644 index 0000000..93a4fb2 --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/prosemd.lua @@ -0,0 +1,16 @@ +local lsp_configs = require('plugins/nvim-lspconfig') + +lsp_configs.prosemd = { + default_config = { + -- Update the path to prosemd-lsp + cmd = { "/usr/local/bin/prosemd-lsp", "--stdio" }, + filetypes = { "markdown" }, + root_dir = function(fname) + return lsp_util.find_git_ancestor(fname) or vim.fn.getcwd() + end, + settings = {}, + } +} + +-- Use your attach function here +lsp.prosemd.setup{ on_attach = on_attach } diff --git a/Minivim/.config/Minivim/data/lsp_servers/theme_check.lua b/Minivim/.config/Minivim/data/lsp_servers/theme_check.lua new file mode 100644 index 0000000..260c416 --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/theme_check.lua @@ -0,0 +1,9 @@ +local lsp_config = require('plugins/nvim-lspconfig') +local on_attach = require('lsp/on_attach') + +lsp_config.tsserver.setup({ + on_attach = function(client) + client.resolved_capabilities.document_formatting = false + on_attach(client) + end +}) diff --git a/Minivim/.config/Minivim/data/lsp_servers/typescript.lua b/Minivim/.config/Minivim/data/lsp_servers/typescript.lua new file mode 100644 index 0000000..a19f53e --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/typescript.lua @@ -0,0 +1,9 @@ +local lsp_config = require('nvim-lspconfig') +local on_attach = require('lsp/on_attach') + +lsp_config.tsserver.setup({ + on_attach = function(client) + client.resolved_capabilities.document_formatting = false + on_attach(client) + end +}) diff --git a/Minivim/.config/Minivim/data/lsp_servers/vim.lua b/Minivim/.config/Minivim/data/lsp_servers/vim.lua new file mode 100644 index 0000000..83ffc55 --- /dev/null +++ b/Minivim/.config/Minivim/data/lsp_servers/vim.lua @@ -0,0 +1,6 @@ +local lsp_config = require('nvim-lspconfig') +local on_attach = require('lsp/on_attach') + +lsp_config.vimls.setup({ + on_attach = on_attach +}) diff --git a/Minivim/.config/Minivim/git-sim_media/images/git-sim-commit_01-25-23_21-57-35.jpg b/Minivim/.config/Minivim/git-sim_media/images/git-sim-commit_01-25-23_21-57-35.jpg new file mode 100644 index 0000000..92eaca5 Binary files /dev/null and b/Minivim/.config/Minivim/git-sim_media/images/git-sim-commit_01-25-23_21-57-35.jpg differ diff --git a/Minivim/.config/Minivim/git-sim_media/texts/3bed7bee5fe42828.svg b/Minivim/.config/Minivim/git-sim_media/texts/3bed7bee5fe42828.svg new file mode 100644 index 0000000..9a60155 --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/3bed7bee5fe42828.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/46c35ae919141cc2.svg b/Minivim/.config/Minivim/git-sim_media/texts/46c35ae919141cc2.svg new file mode 100644 index 0000000..03afa90 --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/46c35ae919141cc2.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/5a6f0f06eb6a1abb.svg b/Minivim/.config/Minivim/git-sim_media/texts/5a6f0f06eb6a1abb.svg new file mode 100644 index 0000000..818004c --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/5a6f0f06eb6a1abb.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/642cbb1c7323e76e.svg b/Minivim/.config/Minivim/git-sim_media/texts/642cbb1c7323e76e.svg new file mode 100644 index 0000000..9031d13 --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/642cbb1c7323e76e.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/681ce5f174caeabc.svg b/Minivim/.config/Minivim/git-sim_media/texts/681ce5f174caeabc.svg new file mode 100644 index 0000000..051360c --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/681ce5f174caeabc.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/6f00958f534de993.svg b/Minivim/.config/Minivim/git-sim_media/texts/6f00958f534de993.svg new file mode 100644 index 0000000..6dca218 --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/6f00958f534de993.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/80bbc0773fb10e54.svg b/Minivim/.config/Minivim/git-sim_media/texts/80bbc0773fb10e54.svg new file mode 100644 index 0000000..d370c6f --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/80bbc0773fb10e54.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/8b0da23037d9f0e8.svg b/Minivim/.config/Minivim/git-sim_media/texts/8b0da23037d9f0e8.svg new file mode 100644 index 0000000..cc2b642 --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/8b0da23037d9f0e8.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/8df45b86b51cd32f.svg b/Minivim/.config/Minivim/git-sim_media/texts/8df45b86b51cd32f.svg new file mode 100644 index 0000000..ac0e587 --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/8df45b86b51cd32f.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/9b9b19c2a3d0710b.svg b/Minivim/.config/Minivim/git-sim_media/texts/9b9b19c2a3d0710b.svg new file mode 100644 index 0000000..0c77e8a --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/9b9b19c2a3d0710b.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/b38e922aa28be0da.svg b/Minivim/.config/Minivim/git-sim_media/texts/b38e922aa28be0da.svg new file mode 100644 index 0000000..b2e0c97 --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/b38e922aa28be0da.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/ce81cb859f00de63.svg b/Minivim/.config/Minivim/git-sim_media/texts/ce81cb859f00de63.svg new file mode 100644 index 0000000..8ad763e --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/ce81cb859f00de63.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/d5cbfecb417a84e6.svg b/Minivim/.config/Minivim/git-sim_media/texts/d5cbfecb417a84e6.svg new file mode 100644 index 0000000..f7d2d14 --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/d5cbfecb417a84e6.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/dd04ffabe02505eb.svg b/Minivim/.config/Minivim/git-sim_media/texts/dd04ffabe02505eb.svg new file mode 100644 index 0000000..efcae9a --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/dd04ffabe02505eb.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/texts/eb86629d54dd331d.svg b/Minivim/.config/Minivim/git-sim_media/texts/eb86629d54dd331d.svg new file mode 100644 index 0000000..c849fae --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/texts/eb86629d54dd331d.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Minivim/.config/Minivim/git-sim_media/videos/1080p60/GitSim.mp4 b/Minivim/.config/Minivim/git-sim_media/videos/1080p60/GitSim.mp4 new file mode 100644 index 0000000..0bfd1bb Binary files /dev/null and b/Minivim/.config/Minivim/git-sim_media/videos/1080p60/GitSim.mp4 differ diff --git a/Minivim/.config/Minivim/git-sim_media/videos/1080p60/partial_movie_files/GitSim/3168721105_51972775_2708716386.mp4 b/Minivim/.config/Minivim/git-sim_media/videos/1080p60/partial_movie_files/GitSim/3168721105_51972775_2708716386.mp4 new file mode 100644 index 0000000..39ee5f0 Binary files /dev/null and b/Minivim/.config/Minivim/git-sim_media/videos/1080p60/partial_movie_files/GitSim/3168721105_51972775_2708716386.mp4 differ diff --git a/Minivim/.config/Minivim/git-sim_media/videos/1080p60/partial_movie_files/GitSim/partial_movie_file_list.txt b/Minivim/.config/Minivim/git-sim_media/videos/1080p60/partial_movie_files/GitSim/partial_movie_file_list.txt new file mode 100644 index 0000000..0558034 --- /dev/null +++ b/Minivim/.config/Minivim/git-sim_media/videos/1080p60/partial_movie_files/GitSim/partial_movie_file_list.txt @@ -0,0 +1,2 @@ +# This file is used internally by FFMPEG. +file 'file:/Users/normrasmussen/.config/nvim/git-sim_media/videos/1080p60/partial_movie_files/GitSim/3168721105_51972775_2708716386.mp4' diff --git a/Minivim/.config/Minivim/init.lua b/Minivim/.config/Minivim/init.lua new file mode 100755 index 0000000..5f6dc5a --- /dev/null +++ b/Minivim/.config/Minivim/init.lua @@ -0,0 +1,159 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +vim.g.mapleader = ',' +vim.g.localmapleader = ',' + +require('lazy').setup('plugins') +require('keymaps') + +-- General Neovim settings and configuration +----------------------------------------------------------- + +----------------------------------------------------------- +-- Neovim API aliases +----------------------------------------------------------- +local fn = vim.fn -- Call Vim functions +local cmd = vim.cmd -- Execute Vim commands +local exec = vim.api.nvim_exec -- Execute Vimscript +local g = vim.g -- Global variables +local opt = vim.opt -- Set options (global/buffer/windows-scoped) +local o = vim.o + +----------------------------------------------------------- +-- General +----------------------------------------------------------- +g.mapleader = ',' -- Change leader to a comma +opt.mouse = 'a' -- Enable mouse support +opt.clipboard = 'unnamedplus' -- Copy/paste to system clipboard +opt.swapfile = false -- Don't use swapfile +opt.shadafile = "NONE" +opt.shadafile = "" +opt.shell = "/bin/zsh" +opt.updatetime = 200 +opt.cursorline = true +g.markdown_folding = 1 +opt.spell=true +opt.spelllang = 'en_us' +cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]] +-- vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta}) +----------------------------------------------------------- +-- Neovim UI +----------------------------------------------------------- +opt.number = true -- Show line number +opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor. +opt.showmatch = true -- Highlight matching parenthesis +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.splitbelow = true -- Horizontal split to the bottom +opt.ignorecase = true -- Ignore case letters when search +opt.smartcase = true -- Ignore lowercase for the whole pattern +opt.linebreak = true -- Wrap on word boundary +opt.signcolumn = 'yes:2' -- Signs column always on, minimum 2. +opt.wrap = true + +----------------------------------------------------------- +-- Memory, CPU +----------------------------------------------------------- +opt.hidden = true -- Enable background buffers +opt.history = 100 -- Remember N lines in historma:y +opt.lazyredraw = true -- Faster scrolling +opt.synmaxcol = 240 -- Max column for syntax highlight +----------------------------------------------------------- +-- Colorscheme +----------------------------------------------------------- +opt.termguicolors = true -- Enable 24-bit RGB colors +cmd[[colorscheme dracula]] +----------------------------------------------------------- +-- Tabs, indent +----------------------------------------------------------- +opt.expandtab = true -- Use spaces instead of tabs +opt.shiftwidth = 1 -- Shift 4 spaces when tab +opt.tabstop = 1 -- 1 tab == 4 spaces +opt.smartindent = true -- Autoindent new lines +----------------------------------------------------------- +-- Glow Settings +----------------------------------------------------------- +g.glow_binary_path = '/bin' +g.glow_border = 'rounded' +g.glow_width = 120 +g.glow_use_pager = true +g.glow_style = 'dark' +----------------------------------------------------------- +-- MKDX Settings, mkdx#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 +]] + + +local disabled_built_ins = { + "netrw", + "netrwPlugin", + "netrwSettings", + "netrwFileHandlers", + "gzip", + "zip", + "zipPlugin", + "tar", + "tarPlugin", + "getscript", + "getscriptPlugin", + "vimball", + "vimballPlugin", + "2html_plugin", + "logipat", + "rrhelper", + "spellfile_plugin", + "matchit" +} + +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. +]]-- +function _G.trim_trailing_whitespaces() + if not o.binary and o.filetype ~= 'diff' then + local current_view = fn.winsaveview() + cmd([[keeppatterns %s/\s\+$//e]]) + fn.winrestview(current_view) + 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 + ]] + diff --git a/Minivim/.config/Minivim/lazy-lock.json b/Minivim/.config/Minivim/lazy-lock.json new file mode 100644 index 0000000..b39c040 --- /dev/null +++ b/Minivim/.config/Minivim/lazy-lock.json @@ -0,0 +1,60 @@ +{ + "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, + "alpha-nvim": { "branch": "main", "commit": "9e33db324b8bb7a147bce9ea5496686ee859461d" }, + "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" }, + "barbar.nvim": { "branch": "master", "commit": "b8ca6076f75e49cca1fa0288c080f3d10ec2152c" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" }, + "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" }, + "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" }, + "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, + "friendly-snippets": { "branch": "main", "commit": "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74" }, + "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" }, + "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, + "lazy.nvim": { "branch": "main", "commit": "6b2311a46a3808e366bb251270f4cc04afb421ed" }, + "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, + "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" }, + "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" }, + "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" }, + "moonfly": { "branch": "master", "commit": "8f2b6b97ae5ba1090229c4eb842cbc912d7ffb65" }, + "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, + "nightfox.nvim": { "branch": "main", "commit": "77aa7458d2b725c2d9ff55a18befe1b891ac473e" }, + "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" }, + "nvim": { "branch": "main", "commit": "2df7036c5c303c9184869936e40ca18935e4afcb" }, + "nvim-cmp": { "branch": "main", "commit": "09ff53ff579cfa3368f8051b0dbe88406891aabe" }, + "nvim-dap": { "branch": "master", "commit": "7c1d47cf7188fc31acdf951f9eee22da9d479152" }, + "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, + "nvim-lspconfig": { "branch": "master", "commit": "179803f537807fff5b5961a2b3efd9e7ddac54a2" }, + "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" }, + "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, + "nvim-tree.lua": { "branch": "master", "commit": "f5d970d4506f385b29534252d8c15a782fa53034" }, + "nvim-treesitter": { "branch": "master", "commit": "7be9ebd06abe2ed836abd3e91acb0b243ddcafba" }, + "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, + "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" }, + "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, + "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" }, + "starry.nvim": { "branch": "master", "commit": "9c4f8669acb302300e1495d4b1f1e618524a48f4" }, + "styler.nvim": { "branch": "main", "commit": "58d0d12191adee41fce7ef20d46d1203efa0d11e" }, + "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "fc70589a93d7bb42f4671ad75c8628a29995bcbe" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, + "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" }, + "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, + "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, + "tokyonight.nvim": { "branch": "main", "commit": "161114bd39b990995e08dbf941f6821afbdcd666" }, + "trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" }, + "vim-wakatime": { "branch": "master", "commit": "018fa9a80c27ccf2a8967b9e27890372e5c2fb4f" }, + "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" } +} \ No newline at end of file diff --git a/Minivim/.config/Minivim/lua/.DS_Store b/Minivim/.config/Minivim/lua/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/Minivim/.config/Minivim/lua/.DS_Store differ diff --git a/Minivim/.config/Minivim/lua/interface/popup.lua b/Minivim/.config/Minivim/lua/interface/popup.lua new file mode 100644 index 0000000..a34bd26 --- /dev/null +++ b/Minivim/.config/Minivim/lua/interface/popup.lua @@ -0,0 +1,64 @@ +local Popup = {} + +--- Create a new floating window +-- @param config The configuration passed to vim.api.nvim_open_win +-- @param win_opts The options registered with vim.api.nvim_win_set_option +-- @param buf_opts The options registered with vim.api.nvim_buf_set_option +-- @return A new popup +function Popup:new(opts) + opts = opts or {} + opts.layout = opts.layout or {} + opts.win_opts = opts.win_opts or {} + opts.buf_opts = opts.buf_opts or {} + + Popup.__index = Popup + + local editor_layout = { + height = vim.o.lines - vim.o.cmdheight - 2, -- Add margin for status and buffer line + width = vim.o.columns, + } + local popup_layout = { + relative = "editor", + height = math.floor(editor_layout.height * 0.9), + width = math.floor(editor_layout.width * 0.8), + style = "minimal", + border = "rounded", + } + popup_layout.row = math.floor((editor_layout.height - popup_layout.height) / 2) + popup_layout.col = math.floor((editor_layout.width - popup_layout.width) / 2) + + local obj = { + buffer = im.api.nvim_create_buf(false, true), + layout = vim.tbl_deep_extend("force", popup_layout, opts.layout), + win_opts = opts.win_opts, + buf_opts = opts.buf_opts, + } + + setmetatable(obj, Popup) + + return obj +end + +--- Display the popup with the provided content +-- @param content_provider A function accepting the popup's layout and returning the content to display +function Popup:display(content_provider) + self.win_id = vim.api.nvim_open_win(self.buffer, true, self.layout) + vim.api.nvim_command( + string.format("autocmd BufHidden,BufLeave ++once lua pcall(vim.api.nvim_win_close, %d, true)", self.win_id) + ) + + local lines = content_provider(self.layout) + vim.api.nvim_buf_set_lines(self.bufnr or 0, 0, -1, false, lines) + + -- window options + for key, value in pairs(self.win_opts) do + vim.api.nvim_win_set_option(self.win_id or 0, key, value) + end + + -- buffer options + for key, value in pairs(self.buf_opts) do + vim.api.nvim_buf_set_option(self.buffer, key, value) + end +end + +return Popup diff --git a/Minivim/.config/Minivim/lua/interface/text.lua b/Minivim/.config/Minivim/lua/interface/text.lua new file mode 100644 index 0000000..03e706e --- /dev/null +++ b/Minivim/.config/Minivim/lua/interface/text.lua @@ -0,0 +1,95 @@ +local M = {} + +local function max_len_line(lines) + local max_len = 0 + + for _, line in ipairs(lines) do + local line_len = line:len() + if line_len > max_len then + max_len = line_len + end + end + + return max_len +end + +--- Left align lines relatively to the parent container +-- @param container The container where lines will be displayed +-- @param lines The text to align +-- @param alignment The alignment value, range: [0-1] +function M.align_left(container, lines, alignment) + local max_len = max_len_line(lines) + local indent_amount = math.ceil(math.max(container.width - max_len, 0) * alignment) + return M.shift_right(lines, indent_amount) +end + +--- Center align lines relatively to the parent container +-- @param container The container where lines will be displayed +-- @param lines The text to align +-- @param alignment The alignment value, range: [0-1] +function M.align_center(container, lines, alignment) + local output = {} + local max_len = max_len_line(lines) + + for _, line in ipairs(lines) do + local padding = string.rep(" ", (math.max(container.width, max_len) - line:len()) * alignment) + table.insert(output, padding .. line) + end + + return output +end + +--- Shift lines by a given amount +-- @params lines The lines the shift +-- @param amount The amount of spaces to add +function M.shift_right(lines, amount) + local output = {} + local padding = string.rep(" ", amount) + + for _, line in ipairs(lines) do + table.insert(output, padding .. line) + end + + return output +end + +--- Pretty format tables +-- @param entries The table to format +-- @param col_count The number of column to span the table on +-- @param col_sep The separator between each column, default: " " +function M.format_table(entries, col_count, col_sep) + col_sep = col_sep or " " + + local col_rows = math.ceil(vim.tbl_count(entries) / col_count) + local cols = {} + local count = 0 + + for i, entry in ipairs(entries) do + if ((i - 1) % col_rows) == 0 then + table.insert(cols, {}) + count = count + 1 + end + table.insert(cols[count], entry) + end + + local col_max_len = {} + for _, col in ipairs(cols) do + table.insert(col_max_len, max_len_line(col)) + end + + local output = {} + for i, col in ipairs(cols) do + for j, entry in ipairs(col) do + if not output[j] then + output[j] = entry + else + local padding = string.rep(" ", col_max_len[i - 1] - cols[i - 1][j]:len()) + output[j] = output[j] .. padding .. col_sep .. entry + end + end + end + + return output +end + +return M diff --git a/Minivim/.config/Minivim/lua/keymaps.lua b/Minivim/.config/Minivim/lua/keymaps.lua new file mode 100644 index 0000000..257d76d --- /dev/null +++ b/Minivim/.config/Minivim/lua/keymaps.lua @@ -0,0 +1,126 @@ +----------------------------------------------------------- + +-- Keymaps of Neovim and installed plugins +----------------------------------------------------------- + +local map = vim.api.nvim_set_keymap +local default_opts = { noremap = true, silent = true } + +-- Fast saving with and s +map('n', 's', ':w', default_opts) +map('n', 'a', ':w|:luafile %', default_opts) +map('n', 'aa', ':w|:luafile % |:PackerSync', default_opts) +map('i', 's', ':w', default_opts) +-- Python Script that saves the file & moves Todos to my Todolist. +map('n', 'sd', ':w|:! python3 ~/Documents/Northpass/Scripts/TodoMD/todo.py %', default_opts) + +-- Neovim Tab Navgation via Vem-Tabline +map('n', 't', ':tabnew', default_opts) +map('n', 'e', ':bnext', default_opts) +map('n', 'w', ':bprev', default_opts) +map('n', 'd', ':bdelete', default_opts) +map('n', 'r', 'vem_move_buffer_right', default_opts) +map('n', 'q', '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', 'n', ':SidebarNvimToggle', default_opts, + "Sidebar Toggle", "sidebar-toggle", "Open or Close Sidebar" +) +M('n', 'q', ':SidebarNvimUpdate', default_opts, + "Sidebar Update", "sidebar-update", "Refresh the Sidebar" +) + +--[[ Sidebar Resize +M('n', '=', ':SidebarNvimResize +1', default_opts, + "Sidebar +1", "sidebar-plus1", "Sidebar Bigger by one" +) +M('n', '-', ':SidebarNvimResize -1', default_opts, + "Sidebar -1", "sidebar-minus1", "Sidebar Smaller by one" +) +M('n', '==', ':SidebarNvimResize +10', default_opts, + "Sidebar +10", "sidebar-plus10", "Sidebar Bigger by 10" +) +M('n', '--', ':SidebarNvimResize -10', default_opts, + "Sidebar -10", "sidebar-minus10", "Sidebar Smaller by 10" +)--]] + +-- Lazy Git +M('n', 'lg', ":LazyGit", default_opts, + "Lazy Git", "lazy-git", "Show Lazy Git" +) + +-- Markdown Preview Toggle +M('n', 'P', ":MarkdownPreview", default_opts, + "Markdown Preview", "md_preview", "Display Markdown preview in browser" +) + +-- Telescope Options +M('n', 'ff', ':Telescope find_files', default_opts, + "Find Files", "find-files", "Find Files in Telescope pop-up" +) +M('n', 'fg', ':Telescope live_grep', default_opts, + "Live Grep", "live-grep", "Grep Files in Telescope pop-up" +) +M('n', 'fb', ':Telescope buffers', default_opts, + "Buffers", "buffers", "See Buffers in Telescope pop-up" +) +M('n', 'fe', ":Telescope file_browser", default_opts, + "Telescope Files", "telescope-file-browser", "Find files and directories in telescope" +) + +M('n', '', "@t", default_opts, + "Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line" +) + +M('n', '', "@s", default_opts, + "Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line" +) + +M('n', '', "@f", default_opts, + "Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. " +) + +M( 'n', '', "@c", default_opts, + "Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line." + ) + +M('n', '', "@w", default_opts, + "Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line." + ) + +M('n', 'ce', ":TodoTrouble keywords=TODO | :resize +10", default_opts, + "Show Todo Tags", "show_todos", "Show Todo Tags." + ) + +M('n', 'cf', ":TodoTrouble keywords=FEAT", default_opts, + "Show Feature Tags", "show_features", "Show Feature Requests." + ) + +M('n', 'cq', ":TodoTrouble keywords=ERROR, WARN", default_opts, + "Show Warning Tags", "show_warnings", "Show Errors Tags." + ) + +M('n', 'b', ":! black %", default_opts, + "Black Formatting", "black_current_file", "Use Black Formatting on Current File." +) +M('n', 'm', ":! markdownlint -f %", default_opts, + "Markdownlint", "md_lint_format", "Use mdlint Formatting on Current File." +) +M('n', 'r30', ":resize 30", default_opts, + "Resize30", "resize_30", "Resize Window to #30" +) diff --git a/Minivim/.config/Minivim/lua/plugins/alpha.lua b/Minivim/.config/Minivim/lua/plugins/alpha.lua new file mode 100644 index 0000000..c509026 --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/alpha.lua @@ -0,0 +1,74 @@ +----------------------------------------------------------- +-- startify configuration file +----------------------------------------------------------- +return { + "goolord/alpha-nvim", + dependencies = { + 'nvim-tree/nvim-web-devicons', + }, + config = function () + local alpha = require'alpha' + local startify = require'alpha.themes.startify' + + startify.section.header.val = { + " ", + " █████ █████ ██████ █████ ███ ", + "░░███ ░░███ ░░██████ ░░███ ░███ ", + " ░███ ░███ ██████ █████ ████ ░███░███ ░███ ██████ ████████ █████████████ ░███ ", + " ░███████████ ███░░███░░███ ░███ ░███░░███░███ ███░░███░░███░░███░░███░░███░░███░███ ", + " ░███░░░░░███ ░███████ ░███ ░███ ░███ ░░██████ ░███ ░███ ░███ ░░░ ░███ ░███ ░███░███ ", + " ░███ ░███ ░███░░░ ░███ ░███ ░███ ░░█████ ░███ ░███ ░███ ░███ ░███ ░███░░░ ", + " █████ █████░░██████ ░░███████ █████ ░░█████░░██████ █████ █████░███ ████████ ", + "░░░░░ ░░░░░ ░░░░░░ ░░░░░███ ░░░░░ ░░░░░ ░░░░░░ ░░░░░ ░░░░░ ░░░ ░░░░░░░░ ", + " ███ ░███ ", + " ░░██████ ", + " ░░░░░░ ", + } + + + --[[ startify.section.mru.val = { + { type = "text", + val = findtodos, + opts = { + position = "left", + hl = {{"hl_group", 0, -2}} + } + } + }--]] + startify.section.mru_cwd.val = { { type = "padding", val = 0 } } + + -- Devicons - Not sure what this doe + startify.nvim_web_devicons.enabled = false + startify.nvim_web_devicons.highlight = false + startify.nvim_web_devicons.highlight = 'Number' + + -- Top Menu + startify.section.top_buttons.val = { + startify.button('e', ' New file', ':ene startinsert'), + startify.button('f', ' Find file', ':Telescope file_browser'), + startify.button('s', '⋅Find Word', ':Telescope live_grep'), + startify.button('t', '& Todo List', ':TodoTrouble keywords=TODO'), + startify.button('r', ' ' .. ' Recent files', ':Telescope oldfiles '), + startify.button('u', ' Show plugins', ':Lazy'), + startify.button('q', ' Quit', ':qa'), + } + + -- Bottom Menu + startify.section.bottom_buttons.val = { + -- Show Empty Space + } + +--[[ local function footer() + local version = vim.version() + local print_version = "v" .. version.major .. '.' .. version.minor .. '.' .. version.patch + local datetime = os.date('%Y/%m/%d %H:%M:%S') + return print_version .. ' ' .. datetime + end + --]] + + startify.section.footer.val = { + + } + alpha.setup(startify.config) + end + } diff --git a/Minivim/.config/Minivim/lua/plugins/distant.lua b/Minivim/.config/Minivim/lua/plugins/distant.lua new file mode 100644 index 0000000..fb6e7b7 --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/distant.lua @@ -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 +} + diff --git a/Minivim/.config/Minivim/lua/plugins/gitsigns.lua b/Minivim/.config/Minivim/lua/plugins/gitsigns.lua new file mode 100644 index 0000000..a109509 --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/gitsigns.lua @@ -0,0 +1,48 @@ +return -- Signs for Git Status Information + { + 'lewis6991/gitsigns.nvim', + config = function() + require('gitsigns').setup { + signs = { + add = {hl = 'GitSignsAdd' , text = '│', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'}, + change = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, + delete = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, + topdelete = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, + changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, + }, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + interval = 1000, + follow_files = true + }, + attach_to_untracked = true, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + ignore_whitespace = false, + }, + current_line_blame_formatter = ', - ', + sign_priority = 1, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, + preview_config = { + -- Options passed to nvim_open_win + border = 'double', + style = 'normal', + relative = 'cursor', + row = 0, + col = 2 + }, + yadm = { + enable = false + }, + } + end +} + diff --git a/Minivim/.config/Minivim/lua/plugins/headlines.lua b/Minivim/.config/Minivim/lua/plugins/headlines.lua new file mode 100644 index 0000000..a0b9a99 --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/headlines.lua @@ -0,0 +1,38 @@ +return { + 'lukas-reineke/headlines.nvim', + } + --[[ config = function() + require("headlines").setup { + markdown = { + query = vim.treesitter.parse_query( + "markdown", + [[ + (atx_heading [ + (atx_h1_marker) + (atx_h2_marker) + (atx_h3_marker) + (atx_h4_marker) + (atx_h5_marker) + (atx_h6_marker) + ] @headline) + + (thematic_break) @dash + + (fenced_code_block) @codeblock + + (block_quote_marker) @quote + (block_quote (paragraph (inline (block_continuation) @quote))) + + ), + headline_highlights = { "Headline" }, + codeblock_highlight = "CodeBlock", + dash_highlight = "Dash", + dash_string = "-", + quote_highlight = "Quote", + quote_string = "┃", + fat_headlines = true, + }, +} +end +} +--]] diff --git a/Minivim/.config/Minivim/lua/plugins/init.lua b/Minivim/.config/Minivim/lua/plugins/init.lua new file mode 100755 index 0000000..0907f02 --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/init.lua @@ -0,0 +1,227 @@ +return { +---------------------------------------------------------------- +-- LSP and Autocomplete Plugins +-- They should be pulled first! +----------------------------------------------------------------- + +{'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' }, + + -- Manage all your Keymaps! + { + "gregorias/nvim-mapper", + config = function() require("nvim-mapper").setup{} end, + before = "telescope.nvim" + }, + + { + 'L3MON4D3/LuaSnip', version = "1.2.1", + dependencies = { "friendly-snippets" }, + }, + 'saadparwaiz1/cmp_luasnip', + 'hrsh7th/cmp-nvim-lsp-signature-help', + { + 'asiryk/auto-hlsearch.nvim', + version = "1.1.0", + config = function() require("auto-hlsearch").setup{} end, + }, + +------------------------------------------------------------ +-- General Functionality +------------------------------------------------------------ + + { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() require('lualine').setup{ + options = { theme = 'palenight' } + } end, +}, + -- Tmux Navigation + { + "aserowy/tmux.nvim", + config = function() require("tmux").setup() end + }, + + -- Snippets + 'rafamadriz/friendly-snippets', + + -- Rename and Work with Buffer & Tabs +-- '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. + { + "folke/trouble.nvim", + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require("trouble").setup { + } + end + }, + +-- Which Key + { + "folke/which-key.nvim", + config = function() + require("which-key").setup { + } + end + }, + "hrsh7th/nvim-cmp", -- optional, for completion + +-- Top Right Notify Pop Up + 'rcarriga/nvim-notify', + +-- echasnovski Mini Modules (Selected) + { + 'echasnovski/mini.comment', version = '*', + config = function() + require('mini.comment').setup() + end + }, + { + 'echasnovski/mini.move', + config = function() + require('mini.move').setup({ + mappings = { + left = '', + right = '', + down = '', + up = '', + + line_left = '', + line_right = '', + line_down = '', + line_up = '', + } + }) + end + }, + { + 'echasnovski/mini.trailspace', + config = function() + require('mini.trailspace').setup() + end + }, + { + 'echasnovski/mini.surround', version = '*', + config = function() + require('mini.surround').setup() + end + }, + { + 'echasnovski/mini.pairs', branch = 'stable', + config = function() + require('mini.pairs').setup() + end + }, + { + 'echasnovski/mini.fuzzy', branch = 'stable', + config = function() + require('mini.fuzzy').setup() + end + }, + + -- DAP (Debug adaptor Protocol) + 'mfussenegger/nvim-dap', + + -- Sidebar + { + 'sidebar-nvim/sidebar.nvim', + config = function() + require("sidebar-nvim").setup({ + side = "right", + sections = { + "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. + }, + diagnostics = { + icon = "", + }, + }) + end +}, + +{ + 'rcarriga/nvim-dap-ui', dependencies = {"mfussenegger/nvim-dap"} +}, + +--------------------------------------------------------- +-- Text, Icons, Symbols +---------------------------------------------------------- + + { + 'simrat39/symbols-outline.nvim', + config = function() + require('symbols-outline').setup() + end + }, + + 'lukas-reineke/indent-blankline.nvim', + 'folke/lsp-colors.nvim', + 'karb94/neoscroll.nvim', + + -- Allow Popups for Telescope etc + 'nvim-lua/popup.nvim', + 'nvim-lua/plenary.nvim', + + -- Various telescopes + 'nvim-telescope/telescope-file-browser.nvim', + + { + 'nvim-telescope/telescope-fzf-native.nvim', + build = 'make' + }, + +----------------------------------------------------------- +-- Various Color Schemes, Dashboard, etc +----------------------------------------------------------- + + {'ray-x/starry.nvim', setup=function() + end}, + 'EdenEast/nightfox.nvim', + 'catppuccin/nvim', + { + "folke/tokyonight.nvim", + lazy = false, -- make sure we load this during startup if it is your main colorscheme + priority = 1000, -- make sure to load this before all the other start plugins + config = function() + end, + }, + { "bluz71/vim-moonfly-colors", name = "moonfly", lazy = true, priority = 1000 }, + 'Bekaboo/deadcolumn.nvim', + { + 'feline-nvim/feline.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + }, + +-- Wakatime Tracking + 'wakatime/vim-wakatime' + } diff --git a/Minivim/.config/Minivim/lua/plugins/null-ls.lua b/Minivim/.config/Minivim/lua/plugins/null-ls.lua new file mode 100644 index 0000000..f4c6ca8 --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/null-ls.lua @@ -0,0 +1,23 @@ +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.ruff, + -- null_ls.builtins.diagnostics.pylama, + null_ls.builtins.formatting.black, + -- null_ls.builtins.diagnostics.pylint, + null_ls.builtins.diagnostics.pycodestyle.with({ extra_args = { "--max-line-length=150" }}), + }, + }) + end +} diff --git a/Minivim/.config/Minivim/lua/plugins/nvim-cmp.lua b/Minivim/.config/Minivim/lua/plugins/nvim-cmp.lua new file mode 100644 index 0000000..ff47d29 --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/nvim-cmp.lua @@ -0,0 +1,91 @@ +return { + 'hrsh7th/nvim-cmp', + dependencies = { + 'neovim/nvim-lspconfig', + 'L3MON4D3/LuaSnip', + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-path', + 'hrsh7th/cmp-buffer', + 'hrsh7th/cmp-cmdline', + 'hrsh7th/nvim-cmp', + 'saadparwaiz1/cmp_luasnip', + 'hrsh7th/cmp-nvim-lsp-signature-help', + 'f3fora/cmp-spell', + }, + config = function () + local cmp_status_ok, cmp = pcall(require, 'cmp') + if not cmp_status_ok then + return + end + + local luasnip_status_ok, luasnip = pcall(require, 'luasnip') + if not luasnip_status_ok then + return + end + + require("luasnip.loaders.from_vscode").lazy_load() + + cmp.setup { + -- Load snippet support + --snippet = { + -- expand = function(args) + -- luasnip.lsp_expand(args.body) + -- }, + + -- Completion settings + completion = { + --completeopt = 'menu,menuone,noselect' + keyword_length = 2 + }, + + -- Key mapping + mapping = { + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [""] = cmp.mapping({ + i = cmp.mapping.abort(), + c = cmp.mapping.close(), + }), + [""] = cmp.config.disable, + [''] = cmp.mapping.confirm { + select = false, + }, + -- Tab mapping + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + -- Load sources, see: https://github.com/topics/nvim-cmp + sources = { + { name = 'nvim-lsp' }, + { name = 'luasnip' }, + { name = 'path' }, + -- { name = 'buffer' }, + -- { name = 'zsh' }, + } + } + end +} diff --git a/Minivim/.config/Minivim/lua/plugins/nvim-lspconfig.lua b/Minivim/.config/Minivim/lua/plugins/nvim-lspconfig.lua new file mode 100644 index 0000000..fafa3ca --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/nvim-lspconfig.lua @@ -0,0 +1,51 @@ +return { + 'neovim/nvim-lspconfig', + config = function() + -- Mappings. + -- See `:help vim.diagnostic.*` for documentation on any of the below functions + local opts = { noremap=true, silent=true } + vim.keymap.set('n', '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', 'q', vim.diagnostic.setloclist, opts) + + -- Use an on_attach function 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 + vim.api.nvim_buf_set_option(bufnr, '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', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', '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, + } + end +} diff --git a/Minivim/.config/Minivim/lua/plugins/nvim-treesitter.lua b/Minivim/.config/Minivim/lua/plugins/nvim-treesitter.lua new file mode 100644 index 0000000..ac3f910 --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/nvim-treesitter.lua @@ -0,0 +1,24 @@ +--local status_ok, nvim_treesitter = pcall(require, 'nvim-treesitter.configs') +--if not status_ok then +-- return +--end + +return { + -- Treesitter interface + 'nvim-treesitter/nvim-treesitter', + --build = ":TSUpdate" + config = function () + 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, + } + end + } diff --git a/Minivim/.config/Minivim/lua/plugins/styler.lua b/Minivim/.config/Minivim/lua/plugins/styler.lua new file mode 100644 index 0000000..ef952ca --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/styler.lua @@ -0,0 +1,14 @@ +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, +} diff --git a/Minivim/.config/Minivim/lua/plugins/telescope.lua b/Minivim/.config/Minivim/lua/plugins/telescope.lua new file mode 100644 index 0000000..58bee1f --- /dev/null +++ b/Minivim/.config/Minivim/lua/plugins/telescope.lua @@ -0,0 +1,161 @@ +return { + { + 'nvim-telescope/telescope.nvim', tag = '0.1.1', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-telescope/telescope-live-grep-args.nvim', + }, + + config = function () + local g = vim.g + local fb_actions = require "telescope".extensions.file_browser.actions + local themes = { + popup_list = { + theme = 'popup_list', + border = true, + preview = false, + prompt_title = false, + results_title = false, + sorting_strategy = 'ascending', + layout_strategy = 'center', + borderchars = { + prompt = { '─', '│', '─', '│', '┌', '┐', '┤', '└' }, + results = { '─', '│', '─', '│', '├', '┤', '┘', '└' }, + preview = { '─', '│', '─', '│', '┌', '┐', '┘', '└' }, + }, + }, + popup_extended = { + theme = 'popup_extended', + prompt_title = false, + results_title = false, + layout_strategy = 'center', + layout_config = { + width = 0.7, + height = 0.3, + mirror = true, + preview_cutoff = 1, + }, + borderchars = { + prompt = { '─', '│', ' ', '│', '┌', '┐', '│', '│' }, + results = { '─', '│', '─', '│', '├', '┤', '┘', '└' }, + preview = { '─', '│', '─', '│', '┌', '┐', '┘', '└' }, + }, + }, + command_pane = { + theme = 'command_pane', + preview = false, + prompt_title = false, + results_title = false, + sorting_strategy = 'descending', + layout_strategy = 'bottom_pane', + layout_config = { + height = 13, + preview_cutoff = 1, + prompt_position = 'bottom' + }, + }, + ivy_plus = { + theme = 'ivy_plus', + preview = false, + prompt_title = false, + results_title = false, + layout_strategy = 'bottom_pane', + layout_config = { + height = 13, + preview_cutoff = 120, + prompt_position = 'bottom' + }, + borderchars = { + prompt = { '─', '│', '─', '│', '┌', '┐', '┘', '└' }, + results = { '─', '│', '─', '│', '┌', '┬', '┴', '└' }, + preview = { '─', '│', ' ', ' ', '─', '┐', '│', ' ' }, + }, + }, + } + local telescope_installer = require('telescope').setup({ + defaults = { + border = true, + prompt_title = false, + results_title = false, + color_devicons = false, + layout_strategy = 'horizontal', + borderchars = { + prompt = { '─', '│', '─', '│', '┌', '┐', '┘', '└' }, + results = { '─', '│', '─', '│', '┌', '┐', '┘', '└' }, + preview = { '─', '│', '─', '│', '┌', '┐', '┘', '└' }, + }, + layout_config = { + bottom_pane = { + height = 20, + preview_cutoff = 120, + prompt_position = 'top' + }, + center = { + height = 0.4, + preview_cutoff = 40, + prompt_position = 'top', + width = 0.7 + }, + horizontal = { + prompt_position = 'top', + preview_cutoff = 40, + height = 0.9, + width = 0.8 + } + }, + sorting_strategy = 'ascending', + prompt_prefix = ' ', + selection_caret = ' → ', + entry_prefix = ' ', + file_ignore_patterns = {'node_modules'}, + path_display = { 'truncate' }, + results_title = false, + prompt_title =false, + preview = { + treesitter = { + enable = { + 'css', 'dockerfile', 'elixir', 'erlang', 'zsh', + 'html', 'http', 'javascript', 'json', 'lua', 'php', + 'python', 'regex', 'ruby', 'rust', 'scss', + 'typescript', 'yaml', 'markdown', 'bash', 'c', + 'cmake', 'comment', 'cpp', 'dart', 'go', 'jsdoc', + 'json5', 'jsonc', 'llvm', 'make', 'ninja', + 'todotxt', 'toml', 'help' + } + } + }, + mappings = { + i = { + [''] = require('telescope.actions').close, + }, + } + }, + extensions = { + file_browser = { + mappings = { + ["i"] = { + [""] = fb_actions.create, + [""] = fb_actions.copy, + [""] = fb_actions.rename, + [""] = fb_actions.goto_cwd, + [""] = fb_actions.open, + [""] = fb_actions.remove, + }, + }, + }, + fzf = { + fuzzy = true, -- false will only do exact matching + override_generic_sorter = true, -- override the generic sorter + override_file_sorter = true, -- override the file sorter + case_mode = 'smart_case', -- other options: 'ignore_case' or 'respect_case' + } + } + }) + require("telescope").load_extension "file_browser" + require("telescope").load_extension "mapper" + require("telescope").load_extension "live_grep_args" + require("telescope").load_extension "fzf" + end + + }} + diff --git a/Minivim/.config/Minivim/lua/settings/init.lua b/Minivim/.config/Minivim/lua/settings/init.lua new file mode 100755 index 0000000..3feea57 --- /dev/null +++ b/Minivim/.config/Minivim/lua/settings/init.lua @@ -0,0 +1,118 @@ +-- General Neovim settings and configuration +----------------------------------------------------------- + +----------------------------------------------------------- +-- Neovim API aliases +----------------------------------------------------------- +local fn = vim.fn -- Call Vim functions +local cmd = vim.cmd -- Execute Vim commands +local exec = vim.api.nvim_exec -- Execute Vimscript +local g = vim.g -- Global variables +local opt = vim.opt -- Set options (global/buffer/windows-scoped) +local o = vim.o + +----------------------------------------------------------- +-- General +----------------------------------------------------------- +g.mapleader = ',' -- Change leader to a comma +opt.mouse = 'a' -- Enable mouse support +opt.clipboard = 'unnamedplus' -- Copy/paste to system clipboard +opt.swapfile = false -- Don't use swapfile +opt.shadafile = "NONE" +opt.shadafile = "" +opt.shell = "/bin/zsh" +opt.updatetime = 200 +opt.cursorline = true +g.markdown_folding = 1 +opt.spell=true +opt.spelllang = 'en_us' +cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]] +vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta}) +o.showtabline = 2 +----------------------------------------------------------- +-- Neovim UI +----------------------------------------------------------- +opt.number = true -- Show line number +opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor. +opt.showmatch = true -- Highlight matching parenthesis +opt.foldmethod = 'syntax' -- Enable folding (default 'foldmarker') +opt.colorcolumn = '100' -- Line length marker at 80 columns +opt.textwidth = 100 +opt.splitright = true -- Vertical split to the right +opt.splitbelow = true -- Horizontal split to the bottom +opt.ignorecase = true -- Ignore case letters when search +opt.smartcase = true -- Ignore lowercase for the whole pattern +opt.linebreak = true -- Wrap on word boundary +opt.signcolumn = 'yes:2' -- Signs column always on, minimum 2. +opt.wrap = true + +----------------------------------------------------------- +-- Memory, CPU +----------------------------------------------------------- +opt.hidden = true -- Enable background buffers +opt.history = 100 -- Remember N lines in historma:y +opt.lazyredraw = true -- Faster scrolling +opt.synmaxcol = 240 -- Max column for syntax highlight +----------------------------------------------------------- +-- Colorscheme +----------------------------------------------------------- +opt.termguicolors = true -- Enable 24-bit RGB colors +----------------------------------------------------------- +-- Tabs, indent +----------------------------------------------------------- +opt.expandtab = true -- Use spaces instead of tabs +opt.shiftwidth = 1 -- Shift 4 spaces when tab +opt.tabstop = 1 -- 1 tab == 4 spaces +opt.smartindent = true -- Autoindent new lines +----------------------------------------------------------- +-- Glow Settings +----------------------------------------------------------- +g.glow_binary_path = '/bin' +g.glow_border = 'rounded' +g.glow_width = 100 +g.glow_use_pager = true +g.glow_style = 'light' +----------------------------------------------------------- +-- MKDX Settings, mkdx#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 +]] + + +local disabled_built_ins = { + "netrw", + "netrwPlugin", + "netrwSettings", + "netrwFileHandlers", + "gzip", + "zip", + "zipPlugin", + "tar", + "tarPlugin", + "getscript", + "getscriptPlugin", + "vimball", + "vimballPlugin", + "2html_plugin", + "logipat", + "rrhelper", + "spellfile_plugin", + "matchit" +} + +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. +]]-- +function _G.trim_trailing_whitespaces() + if not o.binary and o.filetype ~= 'diff' then + local current_view = fn.winsaveview() + cmd([[keeppatterns %s/\s\+$//e]]) + fn.winrestview(current_view) + end +end diff --git a/Minivim/.config/Minivim/plugin/packer_complied.lua b/Minivim/.config/Minivim/plugin/packer_complied.lua new file mode 100644 index 0000000..e69de29 diff --git a/Minivim/.config/Minivim/spell/en.utf-8.add b/Minivim/.config/Minivim/spell/en.utf-8.add new file mode 100644 index 0000000..67353c5 --- /dev/null +++ b/Minivim/.config/Minivim/spell/en.utf-8.add @@ -0,0 +1,311 @@ +recert +gravatar +TODO +gravatars +webhook +Neovim +accomplished +accomplished +Talkspace +Northpass +CEU +th +B2B +Integrations +NPP +CSV +BBHR +onboarding +Kai +scorms +QMC +trainings +cancelled +Ummey +Ummey's +prev +Kaitlyn +CYA +programmatically +Wistia +iOS +PPT +Kaitlyn's +OneTrust +JS +Analytics +KPI +param +UUID +Pipedrive +pipedrive +Lukasz +Bjorn +webhooks +trackable +Pipedrive's +boolean +Kaisa +SSO +XP +DW +Chołodecki +Łukasz +Kotkas +Patrycja +Q1 +Vidyard +badging +Flink +S3 +Unclickable +DataDog +wistia +https +https +wifi +autoplaying +tbd +G2 +SMEs +CSM +AEs +ZoomInfo's +linkedin +Enablement +enablement +DIY +Zoominfo +G2M +Carli +LevelJump +LMS +CMS +Lessonly +Katlin +nd +LT +EVP's +UX +Schoology +Pendo +Salesforce +ILTs +SFDC +ROI +NPS +roadmap +BigIdeasMath +Hubspot +analytics +SCORM +AWS +JnJ +DSAR +ons +Zapier +Accredible +LPs +Shopify +Callum +Chek +Chek +Chek +Chek +Chek +Chek +prereg +OpenAccess +Camila +SAP +SAP +Workato +Soner +Okta +Auth0 +flink +goflink +backfill +Marek +KJ +Canva +Customizable +GoFlink +Cami +auth +Litmos +infographic +Nino's +Flink's +Crowdin +Joonas +QBR +UID +versioning +GDPR +Edume +something +something +AppCues +appcues +Skuad +Skuid +COO +Nergis +pdf +FiveTran +BigQuery +COO +NDA +lifecycle +PALs +LTV +Articulate's +Comms +ILT +Mockup +iFrame +Froala +html +css +resize +customizable +OpenSesame +timestamp +comms +Audrius +Youtube +Omnisend +northpass +Omnisend's +url +Hoc +exisiting +subdomains +iFrame +iFrame +iFrame +gifs +webview +Skuid's +reachs +JJSV +Todos +Phaco +Garg +codeblock +Aleksandr +Sten +v10 +TOC +Nitty +KPIs +MAL +walmart +Segura +Luminate +gif +OneDrive +EOC +legistlation +todo +SCA +V2 +Rock22 +Figma +Foundational +Iorad +ish +Credly +Ritu +Kumar +Deeksha +Prajwal +Praveen +Rakesh +integrations +recomendations +personalization +SLAs +Devanathan +productize +accesss +devs +Sandipan +Kayla +discoverable +Trei +aways +Chronotype +zapier +WildHealth +dev +Shopify's +ProductIDs +Flupdates +availble +enrollees +automations +hoc +Baeligh +Moburley +Baeleigh +Gmail +WHAcademy +www +wildhealth +www +www +transformative +impactful +positivity +CSMs +Basecamp +PSRs +PSR +TSU +ChurnZero +Neste +SEO +oAuth +sso +learning +pre +Margus +pipedive +http +iFrame +learn +OM +duolingo +gamification +CIP +typeform +Trello +repo +Unific +AIIM +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 diff --git a/Minivim/.config/Minivim/spell/en.utf-8.add.spl b/Minivim/.config/Minivim/spell/en.utf-8.add.spl new file mode 100644 index 0000000..2575be9 Binary files /dev/null and b/Minivim/.config/Minivim/spell/en.utf-8.add.spl differ diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 59bed6b..b87516e 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,10 +1,10 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "alpha-nvim": { "branch": "main", "commit": "1838ae926e8d49fe5330d1498ee8289ae2c340bc" }, + "alpha-nvim": { "branch": "main", "commit": "9e33db324b8bb7a147bce9ea5496686ee859461d" }, "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" }, "barbar.nvim": { "branch": "master", "commit": "b8ca6076f75e49cca1fa0288c080f3d10ec2152c" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, + "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -13,39 +13,39 @@ "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" }, "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" }, "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, - "friendly-snippets": { "branch": "main", "commit": "9025d37189f26b6ca0b965a9e5eec3e69c37d2e9" }, - "gitsigns.nvim": { "branch": "main", "commit": "f868d82a36f7f7f5e110eb0a9659993984f59875" }, + "friendly-snippets": { "branch": "main", "commit": "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74" }, + "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" }, "glow.nvim": { "branch": "main", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" }, "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" }, "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, - "lazy.nvim": { "branch": "main", "commit": "f145e6f42a56306c5536e9efbfe41f7efbec285d" }, + "lazy.nvim": { "branch": "main", "commit": "678179543e0d27650c328d8659f2c2cab4d854ef" }, "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" }, "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" }, - "mini.comment": { "branch": "main", "commit": "9ead47cef4266efa5145808b838762c658b74f74" }, - "mini.fuzzy": { "branch": "stable", "commit": "cc1d65ce13a8441fd1095ba6d8e6827e99d9b5b7" }, + "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, + "mini.fuzzy": { "branch": "stable", "commit": "295763d73cbf580c27a4419364c47b09fc82e0f4" }, "mini.move": { "branch": "main", "commit": "3afd39873eb9171684e554a214c055482444a47d" }, - "mini.pairs": { "branch": "stable", "commit": "771c08bd313614c7e9a1904d277ac76eb226f674" }, - "mini.surround": { "branch": "main", "commit": "cc962bae0890217f8473390abc8cef988519d370" }, + "mini.pairs": { "branch": "stable", "commit": "963b800d0524eadd297199207011b98684205ada" }, + "mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" }, "mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" }, "mkdnflow.nvim": { "branch": "main", "commit": "5a9768fe09c614600fd2881f29c5cedf931f3e36" }, - "moonfly": { "branch": "master", "commit": "4c84a3be36155b32d24f99ebcc3fe8a02f3fe75f" }, + "moonfly": { "branch": "master", "commit": "8f2b6b97ae5ba1090229c4eb842cbc912d7ffb65" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, - "neovim": { "branch": "main", "commit": "15aac8c529bb38ac39fdb22f7be7f37c0e39dd0c" }, + "neovim": { "branch": "main", "commit": "6b7b38bbb3dac648dbf81f2728ce1101f476f920" }, "nightfox.nvim": { "branch": "main", "commit": "77aa7458d2b725c2d9ff55a18befe1b891ac473e" }, - "null-ls.nvim": { "branch": "main", "commit": "c89333e034a8daba654ebfcf9a4ec9f87765f01e" }, - "nvim": { "branch": "main", "commit": "233c4175780d9b4e39ae4fe4535c1e4c14bd76ed" }, - "nvim-cmp": { "branch": "main", "commit": "fc0f694af1a742ada77e5b1c91ff405c746f4a26" }, + "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" }, + "nvim": { "branch": "main", "commit": "2df7036c5c303c9184869936e40ca18935e4afcb" }, + "nvim-cmp": { "branch": "main", "commit": "09ff53ff579cfa3368f8051b0dbe88406891aabe" }, "nvim-dap": { "branch": "master", "commit": "7c1d47cf7188fc31acdf951f9eee22da9d479152" }, "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, - "nvim-lspconfig": { "branch": "master", "commit": "664de12a7816dfa348bb475607edfa4fe0122025" }, + "nvim-lspconfig": { "branch": "master", "commit": "08f1f347c718e945c3b1712ebb68c6834182cf3a" }, "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-tree.lua": { "branch": "master", "commit": "f5d970d4506f385b29534252d8c15a782fa53034" }, - "nvim-treesitter": { "branch": "master", "commit": "1b5a7334bb9862abafcf6676d2a2a6973d15ae3a" }, + "nvim-tree.lua": { "branch": "master", "commit": "034511714bacfadc5008e49f73fcef67e5613840" }, + "nvim-treesitter": { "branch": "master", "commit": "f9d701176cb9a3e206a4c690920a8993630c3ec8" }, "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, @@ -53,14 +53,15 @@ "starry.nvim": { "branch": "master", "commit": "9c4f8669acb302300e1495d4b1f1e618524a48f4" }, "styler.nvim": { "branch": "main", "commit": "58d0d12191adee41fce7ef20d46d1203efa0d11e" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "6cf29d5139601993343c4e70ee2d1f67959d9cc5" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "fc70589a93d7bb42f4671ad75c8628a29995bcbe" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, "tokyonight.nvim": { "branch": "main", "commit": "161114bd39b990995e08dbf941f6821afbdcd666" }, - "trouble.nvim": { "branch": "main", "commit": "23c1327b85bd51258f9f8bd8f77f024acef6de69" }, - "vim-wakatime": { "branch": "master", "commit": "02be9238319937e04afea73fd0fc7da5413ee041" }, + "trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" }, + "vim-arduino": { "branch": "master", "commit": "b2573b094ec301f2874b7ae3ec0e8806f8fb5e0e" }, + "vim-wakatime": { "branch": "master", "commit": "018fa9a80c27ccf2a8967b9e27890372e5c2fb4f" }, "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" } } \ No newline at end of file diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 3a48269..ea7c0c7 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -50,10 +50,11 @@ return { }, ------------------------------------------------------------ - -- General Functionality ------------------------------------------------------------ - + { + 'stevearc/vim-arduino' + }, { 'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons' }, diff --git a/tmux/.config/tmux/plugins/tmux-net-speed b/tmux/.config/tmux/plugins/tmux-net-speed deleted file mode 160000 index 58abb61..0000000 --- a/tmux/.config/tmux/plugins/tmux-net-speed +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58abb615971cb617821e2e7e41c660334f55a92d diff --git a/tmux/.config/tmux/plugins/tmux-network-bandwidth b/tmux/.config/tmux/plugins/tmux-network-bandwidth deleted file mode 160000 index 63c6b32..0000000 --- a/tmux/.config/tmux/plugins/tmux-network-bandwidth +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 63c6b3283d537d9b86489c13b99ba0c65e0edac8 diff --git a/tmux/.config/tmux/plugins/tmux-weather b/tmux/.config/tmux/plugins/tmux-weather deleted file mode 160000 index 28a5fbe..0000000 --- a/tmux/.config/tmux/plugins/tmux-weather +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 28a5fbe75bb25a408193d454304e28ddd75e9338 diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index 41352e0..b04fe9a 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -10,7 +10,7 @@ set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' # Search your Scrollback using fzf -set -g @plugin 'roosta/tmux-fuzzback' +# set -g @plugin 'roosta/tmux-fuzzback' # Allow Focus Events set -g focus-events on @@ -25,26 +25,21 @@ set -g @plugin 'christoomey/vim-tmux-navigator' set -g @plugin 'dracula/tmux' set -g @dracula-plugins "git weather 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-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-rate 5 - -set -g @dracula-cpu-usage-label " " -set -g @dracula-cpu-usage-colors "pink dark_gray" - -set -g @dracula-git-show-current-symbol ✓ -set -g @dracula-git-show-diff-symbol ! -set -g @dracula-git-no-repo-message ⊚ - -set -g @dracula-show-timezone false -set -g @dracula-military-time true +#set -g @dracula-show-location false +#set -g @dracula-fixed-location "Parsippany, NJ" +#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-rate 5 +#set -g @dracula-cpu-usage-label " " +#set -g @dracula-cpu-usage-colors "pink dark_gray" +#set -g @dracula-git-show-current-symbol ✓ +#set -g @dracula-git-show-diff-symbol ! +#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 diff --git a/zsh/.zshrc b/zsh/.zshrc index 583d2b9..b2fecce 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,6 +1,6 @@ # Path to your oh-my-zsh installation. -export ZSH="$HOME/.oh-my-zsh" +# export ZSH="$HOME/.oh-my-zsh" export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 @@ -8,6 +8,11 @@ plugins=( zsh-autosuggestions git wakatime + brew + npm + z + zsh-syntax-highlighting + vi-mode ) # User configuration @@ -15,8 +20,6 @@ plugins=( export DOT="~/.dotfiles" alias vim='vim -S ~/.vimrc' alias nvim='nvim' -alias cd2='cd .. && cd ..' -alias tt="docker exec -ti timetagger_timetagger_1 timetagger" alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew' export EDITOR="$VISUAL" @@ -26,7 +29,22 @@ export PYENV_ROOT="$HOME/.pyenv" command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" -test -e /Users/normrasmussen/.iterm2_shell_integration.zsh && source /Users/normrasmussen/.iterm2_shell_integration.zsh || true +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 @@ -36,7 +54,3 @@ export PATH="$PATH:$HOME/.rvm/bin" export PATH="/opt/homebrew/sbin:$PATH" eval "$(starship init zsh)" export PATH="/opt/homebrew/bin:$PATH" - -### MANAGED BY RANCHER DESKTOP START (DO NOT EDIT) -export PATH="/Users/normrasmussen/.rd/bin:$PATH" -### MANAGED BY RANCHER DESKTOP END (DO NOT EDIT)