From 8eb23777f48b3a1532c797a9b651ab0856f11f02 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Wed, 24 May 2023 16:55:53 -0400 Subject: [PATCH] Changed and removed some plugins --- nvim/.config/nvim/lazy-lock.json | 60 +++++++++++----------- nvim/.config/nvim/lua/plugins/init.lua | 70 +++++++++++--------------- zsh/.zshrc | 2 +- 3 files changed, 61 insertions(+), 71 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index a4a1fc9..958446d 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "alpha-nvim": { "branch": "main", "commit": "eaeb20d25b36880678141534479a0d99591be9a1" }, + "alpha-nvim": { "branch": "main", "commit": "1838ae926e8d49fe5330d1498ee8289ae2c340bc" }, "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" }, - "barbar.nvim": { "branch": "master", "commit": "31b4f706bcc41be7322ff5dbaee2654ca5ccc36c" }, + "barbar.nvim": { "branch": "master", "commit": "b8ca6076f75e49cca1fa0288c080f3d10ec2152c" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, @@ -12,21 +12,21 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "deadcolumn.nvim": { "branch": "master", "commit": "9be6f7e4fbcda0086ed5e7ee55df6493ffa4f02d" }, "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" }, - "dressing.nvim": { "branch": "master", "commit": "540d6e7115fb32b5035ddaf0c1a26cbffb855dac" }, + "dressing.nvim": { "branch": "master", "commit": "2f17eee4d7709dacfad2a28f35e2acfe9a6cb09d" }, "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, - "friendly-snippets": { "branch": "main", "commit": "10f741908e56ce47cf6b3440e3f04b4fdc0da2f2" }, - "gitsigns.nvim": { "branch": "main", "commit": "e5edefd9976039f5352e0c900f35206770b33a2d" }, + "friendly-snippets": { "branch": "main", "commit": "ef6547d2f586e08e071efeebac835e545f3015cc" }, + "gitsigns.nvim": { "branch": "main", "commit": "c18b7ca0b5b50596722f3a1572eb9b8eb520c0f1" }, "glow.nvim": { "branch": "main", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" }, "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" }, - "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, + "indent-blankline.nvim": { "branch": "master", "commit": "86d1b71c5c26168c3a3a9ff5f69e833889a09c1d" }, "jupynium.nvim": { "branch": "master", "commit": "f5faa4bca9d84afc81459727e445ea96139edde6" }, - "lazy.nvim": { "branch": "main", "commit": "9ac19880b677d08f416c5189ffc2dc023084a159" }, - "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, + "lazy.nvim": { "branch": "main", "commit": "761b8388af5bcb451e30d886163fcd129278e1d1" }, + "lazygit.nvim": { "branch": "main", "commit": "883c25d13eafd8b89b3cc116c712b19c9d2a755e" }, "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": "cec0e6dd534ade486b5eeb59ebcfa8d51c3e8c5e" }, - "mason.nvim": { "branch": "main", "commit": "057ac5ca159c83e302a55bd839a96ff1ea2396db" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c55d18f3947562e699d34d89681edbf9f0e250d3" }, + "mason.nvim": { "branch": "main", "commit": "08b2fd308e0107eab9f0b59d570b69089fd0b522" }, "mini.comment": { "branch": "main", "commit": "9ead47cef4266efa5145808b838762c658b74f74" }, "mini.fuzzy": { "branch": "stable", "commit": "cc1d65ce13a8441fd1095ba6d8e6827e99d9b5b7" }, "mini.move": { "branch": "main", "commit": "3afd39873eb9171684e554a214c055482444a47d" }, @@ -34,38 +34,38 @@ "mini.surround": { "branch": "main", "commit": "cc962bae0890217f8473390abc8cef988519d370" }, "mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" }, "mkdnflow.nvim": { "branch": "main", "commit": "5a9768fe09c614600fd2881f29c5cedf931f3e36" }, - "moonfly": { "branch": "master", "commit": "58e58e6d8c8214133fe0787ab16a9b35450e5df3" }, + "moonfly": { "branch": "master", "commit": "c4ae6851441edfe74f7fb46b0e8cc43f534b0aa5" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, "neovim": { "branch": "main", "commit": "2eace84d649d76d41dcd44a87a17f64c7c4a586d" }, - "nightfox.nvim": { "branch": "main", "commit": "a53ff3f99c3cf4e598c5febad367fd3cad341b90" }, - "null-ls.nvim": { "branch": "main", "commit": "71797bb303ac99a4435592e15068f127970513d7" }, - "nvim": { "branch": "main", "commit": "b2f566d43e04557b1b83065cae706d461de04e66" }, - "nvim-cmp": { "branch": "main", "commit": "935b4069ce73b60ba9075bf05ee6ab50ed3af1a9" }, - "nvim-dap": { "branch": "master", "commit": "6cedcb527e264c8f25e86afa8dae74c6692dee51" }, - "nvim-dap-python": { "branch": "master", "commit": "51ecb08dbff57fca8add396b93dc765aba262e0a" }, - "nvim-dap-ui": { "branch": "master", "commit": "078972d39338a49ec13fc43a44e235cc43189276" }, - "nvim-lspconfig": { "branch": "master", "commit": "5ba7ab746d814413c84ed98c0214c71cd28f130a" }, + "nightfox.nvim": { "branch": "main", "commit": "77aa7458d2b725c2d9ff55a18befe1b891ac473e" }, + "null-ls.nvim": { "branch": "main", "commit": "77e53bc3bac34cc273be8ed9eb9ab78bcf67fa48" }, + "nvim": { "branch": "main", "commit": "1d3eda15703ba70f57e94e6451db55914ff7017f" }, + "nvim-cmp": { "branch": "main", "commit": "3ac8d6cd29c74ff482d8ea47d45e5081bfc3f5ad" }, + "nvim-dap": { "branch": "master", "commit": "56118cee6af15cb9ddba9d080880949d8eeb0c9f" }, + "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, + "nvim-dap-ui": { "branch": "master", "commit": "4ce7b97dd8f50b4f672948a34bf8f3a56214fdb8" }, + "nvim-lspconfig": { "branch": "master", "commit": "570aae82f8c6bc15fb6e559ed7d5a3fd85374329" }, "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" }, - "nvim-notify": { "branch": "master", "commit": "159c6cf1be25a933f35e97499314c9faab55c98f" }, - "nvim-tree.lua": { "branch": "master", "commit": "270c95556cad96d18ca547d86ae65927334b108b" }, - "nvim-treesitter": { "branch": "master", "commit": "402f1b8d3b424bb2379fc2fde522cd782de68cf4" }, - "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" }, - "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, + "nvim-notify": { "branch": "master", "commit": "f3024b912073774111202f5fa6518b0cd2a74432" }, + "nvim-tree.lua": { "branch": "master", "commit": "9ef6c3cd8805d868d20106be09ce07f004e8232f" }, + "nvim-treesitter": { "branch": "master", "commit": "9bef7260449b4ed5e917eda87b6eca6853526329" }, + "nvim-web-devicons": { "branch": "master", "commit": "e283ab937e0197b37ec5d8013e49495193407324" }, + "plenary.nvim": { "branch": "master", "commit": "6aeb98daac98ade8346e107b3eef47c5eaf1ffdb" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "prettier.nvim": { "branch": "main", "commit": "08f7f08fae57fd970c7470d883c9127f172bd9e6" }, "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": "4054a5d0ab85475bf75df00cf10754d2e54b5532" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "6cf29d5139601993343c4e70ee2d1f67959d9cc5" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "terminal.nvim": { "branch": "master", "commit": "764b7c137512bcfba2e45cf3e25c08a9f4d3b733" }, "tmux.nvim": { "branch": "main", "commit": "57220071739c723c3a318e9d529d3e5045f503b8" }, - "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" }, - "tokyonight.nvim": { "branch": "main", "commit": "df13e3268a44f142999fa166572fe95a650a0b37" }, - "trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" }, - "vim-wakatime": { "branch": "master", "commit": "515dbcc2278a9279a19de838fa29fc5078e34e56" }, - "which-key.nvim": { "branch": "main", "commit": "af8f26bfbb61b5f722c9fbc72b296dc9db0bcfdc" } + "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, + "tokyonight.nvim": { "branch": "main", "commit": "d0baf68fa42d41994018b54f67fb42de942e0228" }, + "trouble.nvim": { "branch": "main", "commit": "5da13b5007eb2b952834186cd640a22c765b64cf" }, + "vim-wakatime": { "branch": "master", "commit": "02be9238319937e04afea73fd0fc7da5413ee041" }, + "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 2e4ba9a..3a48269 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -1,8 +1,10 @@ return { ---------------------------------------------------------------- + -- LSP and Autocomplete Plugins -- They should be pulled first! ----------------------------------------------------------------- + {'williamboman/mason.nvim', config = function() require("mason").setup({ ui = { @@ -48,9 +50,10 @@ return { }, ------------------------------------------------------------ + -- General Functionality ------------------------------------------------------------ - 'kdheepak/lazygit.nvim', + { 'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons' }, @@ -97,15 +100,7 @@ return { } end }, - { - "kiyoon/jupynium.nvim", - build = "pip3 install --user .", - -- build = "conda run --no-capture-output -n jupynium pip install .", - -- enabled = vim.fn.isdirectory(vim.fn.expand "~/miniconda3/envs/jupynium"), - }, "hrsh7th/nvim-cmp", -- optional, for completion - "rcarriga/nvim-notify", -- optional - "stevearc/dressing.nvim", -- optional, UI for :JupyniumKernelSelect -- Top Right Notify Pop Up 'rcarriga/nvim-notify', @@ -122,15 +117,15 @@ return { config = function() require('mini.move').setup({ mappings = { - left = '', - right = '', - down = '', - up = '', + left = '', + right = '', + down = '', + up = '', - line_left = '', - line_right = '', - line_down = '', - line_up = '', + line_left = '', + line_right = '', + line_down = '', + line_up = '', } }) end @@ -161,6 +156,7 @@ return { }, ----------------------------------------------------------- + -- Markdown Plugins ------------------------------------------------------------ @@ -177,7 +173,7 @@ return { MkdnSTab = {{'i'}, ''}, MkdnFollowLink = {'n', 'p'} }, - wrap = true + wrap = true }) end }, @@ -185,9 +181,6 @@ return { { "iamcco/markdown-preview.nvim", build = "cd app && npm install", init = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, }, - -- Prettier Plugin for Neovim specifically - 'MunifTanjim/prettier.nvim', - -- DAP (Debug adaptor Protocol) 'mfussenegger/nvim-dap', @@ -199,12 +192,6 @@ return { ) end }, - { - 'rebelot/terminal.nvim', - config = function() - require("terminal").setup() - end -}, -- Sidebar { 'sidebar-nvim/sidebar.nvim', @@ -212,18 +199,18 @@ return { require("sidebar-nvim").setup({ side = "right", sections = { - "git", - "symbols", - "diagnostics", - "files", - "todos", + "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 = "", - }, + todos = { + initially_closed = false, -- whether the groups should be initially closed on start. You can manually open/close groups later. + }, + diagnostics = { + icon = "", + }, }) end }, @@ -233,8 +220,10 @@ return { }, --------------------------------------------------------- + -- Text, Icons, Symbols ---------------------------------------------------------- + { 'simrat39/symbols-outline.nvim', config = function() @@ -243,7 +232,6 @@ return { }, 'lukas-reineke/indent-blankline.nvim', --- 'nvim-tree/nvim-web-devicons', 'folke/lsp-colors.nvim', 'karb94/neoscroll.nvim', @@ -282,7 +270,7 @@ return { default = { "Identifier", "#7C3AED" }, test = { "Identifier", "#FF00FF" } }, - } + } end }, -- Various telescopes @@ -294,8 +282,10 @@ return { }, ----------------------------------------------------------- + -- Various Color Schemes, Dashboard, etc ----------------------------------------------------------- + {'ray-x/starry.nvim', setup=function() end}, 'rose-pine/neovim', diff --git a/zsh/.zshrc b/zsh/.zshrc index d9ad85f..583d2b9 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -28,7 +28,7 @@ eval "$(pyenv init -)" test -e /Users/normrasmussen/.iterm2_shell_integration.zsh && source /Users/normrasmussen/.iterm2_shell_integration.zsh || true -source /Users/normrasmussen/.docker/init-zsh.sh || true # Added by Docker Desktop +# source /Users/normrasmussen/.docker/init-zsh.sh || true # Added by Docker Desktop export PATH="$PATH:$HOME/.rvm/bin"