From ceb0bc34cccd6fba26e52f3f42daefa768237a3c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Oct 2023 19:46:45 +0000 Subject: [PATCH] Cleared out colorschemes, ZSH plugins, and other superfluous items for a more minimal neovim setup. I'm considering stripping it down even more, but with this setup, I get 95% of my keymaps and flows working as I 'm used to. --- nvim/.config/nvim/init.lua | 2 +- nvim/.config/nvim/lazy-lock.json | 29 +- .../nvim/lua/custom_snippets/markdown.json | 7 - .../nvim/lua/custom_snippets/package.json | 10 - nvim/.config/nvim/lua/plugins/hover.lua | 27 -- nvim/.config/nvim/lua/plugins/init.lua | 104 ------ nvim/.config/nvim/lua/plugins/telescope.lua | 2 - nvim/.config/nvim/spell/en.utf-8.add | 341 ------------------ nvim/.config/nvim/spell/en.utf-8.add.spl | Bin 3580 -> 0 bytes zsh/.zshrc | 65 ---- zsh/.zshrc.minimal | 8 - zsh/zsh-autosuggestions | 1 - zsh/zsh-syntax-highlighting | 1 - zsh_issues.md | 15 - 14 files changed, 8 insertions(+), 604 deletions(-) delete mode 100644 nvim/.config/nvim/lua/custom_snippets/markdown.json delete mode 100644 nvim/.config/nvim/lua/custom_snippets/package.json delete mode 100644 nvim/.config/nvim/lua/plugins/hover.lua delete mode 100644 nvim/.config/nvim/spell/en.utf-8.add delete mode 100644 nvim/.config/nvim/spell/en.utf-8.add.spl delete mode 100644 zsh/.zshrc delete mode 100644 zsh/.zshrc.minimal delete mode 160000 zsh/zsh-autosuggestions delete mode 160000 zsh/zsh-syntax-highlighting delete mode 100644 zsh_issues.md diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index e2b03c1..2cc8707 100755 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -167,4 +167,4 @@ end --]] require('core/keymaps') -vim.cmd[[colorscheme tol]] +vim.cmd[[colorscheme dracula]] diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 12a7bf7..754ac21 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -2,7 +2,6 @@ "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" }, "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" }, "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" }, @@ -14,19 +13,15 @@ "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" }, - "diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" }, "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" }, "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" }, "headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" }, - "hover.nvim": { "branch": "main", "commit": "a173256a9dba938e876ceb4bb5d2742f8866e349" }, - "indent-blankline.nvim": { "branch": "master", "commit": "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff" }, - "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" }, - "lsp-timeout.nvim": { "branch": "main", "commit": "9525ee3dfd676468dd3d3961494d3d2ebb9ccfe5" }, - "lualine.nvim": { "branch": "master", "commit": "7533b0ead663d80452210c0c089e5105089697e5" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" }, + "indent-blankline.nvim": { "branch": "master", "commit": "8a7b48f5823cc924f815129192288ec2e2b9288f" }, + "lazy.nvim": { "branch": "main", "commit": "9788a19ec0b4036028e78aec702634b4b89d3470" }, + "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "09be3766669bfbabbe2863c624749d8da392c916" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, @@ -35,35 +30,25 @@ "mini.pairs": { "branch": "stable", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" }, "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" }, "mini.trailspace": { "branch": "main", "commit": "e8c144ee11f6a827ac9c5732f20aefbbd7b26035" }, - "moonfly": { "branch": "master", "commit": "5d7aff3545cd3f365215bf86a3f188b65ab9b90c" }, "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" }, - "neovim": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" }, - "nightfox.nvim": { "branch": "main", "commit": "6a6076bd678f825ffbe16ec97807793c3167f1a7" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, - "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": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, - "nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" }, - "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, + "nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" }, "nvim-tree.lua": { "branch": "master", "commit": "40b9b887d090d5da89a84689b4ca0304a9649f62" }, - "nvim-treesitter": { "branch": "master", "commit": "afa103385a2b5ef060596ed822ef63276ae88016" }, + "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" }, - "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" }, - "starry.nvim": { "branch": "master", "commit": "ee585b622455deace2b59d2f846c713805f69100" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "6e51d0cd6447cf2525412220ff0a2885eef9039c" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "toggleterm.nvim": { "branch": "main", "commit": "faee9d60428afc7857e0927fdc18daa6c409fa64" }, - "tokyonight.nvim": { "branch": "main", "commit": "633039585dff7fd2b9b62fb190bf768702609d95" }, - "tol.nvim": { "branch": "main", "commit": "5ce76f5173a8331c4ed0b89941f5465a1a3732b3" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-wakatime": { "branch": "master", "commit": "945a441b83e48c7bafdd227ef8e2eb826f72ab90" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/nvim/.config/nvim/lua/custom_snippets/markdown.json b/nvim/.config/nvim/lua/custom_snippets/markdown.json deleted file mode 100644 index 228b622..0000000 --- a/nvim/.config/nvim/lua/custom_snippets/markdown.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "todays-date": { - "prefix": "today", - "body": ["${CURRENT_MONTH}-${CURRENT_DATE}-${CURRENT_YEAR}"], - "description": "Put the date in (Y-m-D) format" - } -} diff --git a/nvim/.config/nvim/lua/custom_snippets/package.json b/nvim/.config/nvim/lua/custom_snippets/package.json deleted file mode 100644 index db7c236..0000000 --- a/nvim/.config/nvim/lua/custom_snippets/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "contributes": { - "snippets": [ - { - "language": "markdown", - "path": "./markdown.json" - } - ] - } -} diff --git a/nvim/.config/nvim/lua/plugins/hover.lua b/nvim/.config/nvim/lua/plugins/hover.lua deleted file mode 100644 index ab36f6c..0000000 --- a/nvim/.config/nvim/lua/plugins/hover.lua +++ /dev/null @@ -1,27 +0,0 @@ -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 -} - diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index fc528ae..094cdff 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -20,10 +20,6 @@ return { 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", @@ -44,18 +40,11 @@ return { 'hrsh7th/cmp-nvim-lsp-signature-help', 'lukas-reineke/cmp-under-comparator', - { - 'asiryk/auto-hlsearch.nvim', - version = "1.1.0", - config = function() require("auto-hlsearch").setup{} end, - }, - ------------------------------------------------------------ -- General Functionality ------------------------------------------------------------ { 'MaximilianLloyd/adjacent.nvim' }, - { 'sindrets/diffview.nvim' }, { 'nacro90/numb.nvim', config = function() require('numb').setup{ @@ -75,9 +64,6 @@ return { theme = 'material', always_divide_middle = false, }, - sections = { - lualine_x = { "encoding", { "fileformat", symbols = { unix = "" } }, "filetype" }, - }, }) end, }, @@ -149,8 +135,6 @@ return { }, "hrsh7th/nvim-cmp", -- optional, for completion --- Top Right Notify Pop Up - 'rcarriga/nvim-notify', {'akinsho/toggleterm.nvim', version = "*", opts = { direction = 'float', }}, @@ -219,26 +203,6 @@ return { ) end }, - -- Sidebar - { - 'sidebar-nvim/sidebar.nvim', - config = function() - require("sidebar-nvim").setup({ - side = "right", - sections = { - "git", - "symbols", - "diagnostics", - }, - 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"} @@ -254,14 +218,6 @@ return { require('symbols-outline').setup() end }, - { - "j-hui/fidget.nvim", - tag = "legacy", - event = "LspAttach", - opts = { - -- options - }, -}, 'lukas-reineke/indent-blankline.nvim', 'karb94/neoscroll.nvim', @@ -269,75 +225,15 @@ return { 'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim', - -- Todo & Comments for Organization - { - 'folke/todo-comments.nvim', - dependencies = "nvim-lua/plenary.nvim", - config = function() - require("todo-comments").setup { - keywords = { - FIX = { - icon = " ", -- icon used for the sign, and in search results - color = "error", -- can be a hex color, or a named color (see below) - alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords - -- signs = false, -- configure signs for some keywords individually - }, - DONE = { icon = " ", color = "info" }, - IN_PROG = { icon = "󰇘", color = "default" }, - FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } }, - WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } }, - TODO = { icon = " ", color = "hint", alt = { "TASK", "TBD" } }, - RISK = { icon = " ", color = "hint", alt = { "RISK" } }, - SENG = { icon = " ", color = "test", alt = { "SOLUTIONS", "SE", "WORKAROUND" } }, - }, - highlight = { - comments_only = false, - }, - colors = { - error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, - warning = { "DiagnosticWarning", "WarningMsg", "#FBBF24" }, - info = { "DiagnosticInfo", "#2563EB" }, - hint = { "DiagnosticHint", "#10B981" }, - default = { "Identifier", "#7C3AED" }, - test = { "Identifier", "#FF00FF" } - }, - } - end - }, -- Various telescopes 'nvim-telescope/telescope-file-browser.nvim', - --{ - -- 'nvim-telescope/telescope-fzf-native.nvim', - -- build = 'make' - --}, - ----------------------------------------------------------- -- Various Color Schemes, Dashboard, etc ----------------------------------------------------------- 'Mofiqul/dracula.nvim', - 'ray-x/starry.nvim', - 'rose-pine/neovim', - '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() - -- load the colorscheme here - -- vim.cmd([[colorscheme tokyonight]]) - end, - }, - { "bluz71/vim-moonfly-colors", name = "moonfly", lazy = true, priority = 1000 }, 'Bekaboo/deadcolumn.nvim', - { - "dustypomerleau/tol.nvim", - lazy = false, -- load the colorscheme at startup - priority = 1000, -- load colorscheme first - config = true, - }, -- Wakatime Tracking 'wakatime/vim-wakatime', diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua index d9187c6..ff66a9c 100644 --- a/nvim/.config/nvim/lua/plugins/telescope.lua +++ b/nvim/.config/nvim/lua/plugins/telescope.lua @@ -153,8 +153,6 @@ return { }) require("telescope").load_extension "file_browser" require("telescope").load_extension "live_grep_args" - require("telescope").load_extension "fzf" - require("telescope").load_extension "adjacent" end }} diff --git a/nvim/.config/nvim/spell/en.utf-8.add b/nvim/.config/nvim/spell/en.utf-8.add deleted file mode 100644 index 46a4f45..0000000 --- a/nvim/.config/nvim/spell/en.utf-8.add +++ /dev/null @@ -1,341 +0,0 @@ -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 -cateogries -cateogries -Glassdoor -accomodate -Ines -distrcits -suggstions -Chek's -COO -nginx's -nginx -config -javascript -subdomain -Moodle -MSP -moodle -Faux -repos -Github -Gitea -AppDaemon -AppDaemon's -birdnet -HomeAssistant -MQTT -BirdNET -reseller -Ece -accredation diff --git a/nvim/.config/nvim/spell/en.utf-8.add.spl b/nvim/.config/nvim/spell/en.utf-8.add.spl deleted file mode 100644 index af4aac027f8c427c4c27e0b894b1be555c05c637..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3580 zcmYjUJB%Gy89wLCz1LAJ7Z#CNUl3KKrEn20Q&1r`SsU-#i%r%tt0+P`cOG|U@64I; zJnrsYS&QWc$=M1CkX%~nB8!S3p{x}QX$8E zSdi*sp$n5xt^Rhd7d(pTq6l(J`KsYEoVvy=8k0YS6B69DxE)-ZWny_ls%(vW2MWAD z>)-)7jUC?TS)6`o-?T}l)uktSSs`xgF=Egg@495 zPAZ@s95zdg1F!4h+D0ehy09G~8+x;BAP$%3n?mgc7y2{(1QKXV1hx93CBBHVLqtG5 zuR-nf3GTgJ;ziev;!-qKxL~qW!mh$4nVyy=71w{6!^tg39OQ|{aBUK*^Xk|72=7pP zkOw6g!xleoWy}cAj0sHF!4m*rMGwx;#C^_AY?8M<8IC|^A;?E~VUm?(DqWTZ%7O%f zorH-Y)CbmxqP2-ApKcZ7{%P@ypbZ=|R*SxFanE{jJ|)6xf;*IjYCoksM$%Gd=1ks0!ZKi? zNg!XV>+{5v!tEG8U+%0G!qK173<}Yw#Tzpl=LJ&Er$bf-dC3qH%0g0HzhEn1eJ~}| z1JNF{B=q$fn)UOvjBRpoY5LW@Muu>DW!PtLC&)!s8;yLU{Okg#O!);y}4{@ z(pf}{y(~J1l;Y1!6kaVQD9>xSyVW&p0#DpcQg*{u{3NBC(c|V?2NDY#I-r2Qt9=0S z^CV?#STYv(nGZl1L9ai1)drtB(|`eK=p7(UFU-dF5H3d6wTu$+F|(j=muOq)^TlXB zsqsZZ#!_X6Lon329a|nBR&^ib9XS8H4j55=+OkSmclrg*Hs2@!UaR0G%gS719|q?m zJ3*sT`U{p!T6g`(F4~oG%@B5K11_olzxxUlDQ_15M4y?<>`a9|MEJbJ>QU-C)Z#Qe}T+CxgDTHFR_cH&X)NPd%ENklL|bmae9-A5pPB?O>UMIN!Q(@*)oAgpEGJ z+!p&U;;%B_|~v{F3qUGoJUj z9d&_CDsw2L|2`6g`XC7ulRlK3{W38q`yPl;6pUUP<7evxFgXt$Uai zd~Ol{|48Rg1z(EhO&cXuFJ#Slgu#v#YGmdMVBiqsenX!Oqv&t#8xW)R;9nJHIaY`@ zU~xlZCQp9A2>E)Yipg807!VQEP)achZg@Ogt(03JAkRO%RifnC95D^QYFKVORHE6 zlAvdttAnzCuzI=4IJ(KtUaSC5gmd(ZrBb?kYwO+jwr|}0@vWWR+js8Xdw>6DALNy} z!8xL^S--dK)oc*r|MzNc#~YhwCNQV(ayQ-isVHT|?}1X_PG8$ir`%0{qHoZE>3y>= z`L?kK;l%p^L`z{!+3DDtw#AKVy3h~wJu+=@b>XzQ4@ybksWUT)%XClQl;FzPo^qRH z8g2m#WB1xfpLY6=2)hrZM6x>w-(jL|+)Hv}SGd}KWde;Z^e%A9(3;kQVILTWa-Eh2 z0ZGg@arq{wrnH6?sebPp^VU9cU}(%6JR0Wv%QD#77sEF^uJ<99|CeF++YzMOpkC>_ z@?M)ed-Ad+zc/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" -eval "$(pyenv virtualenv-init -)" - -# Function to Correctly Source $VIRTUAL_ENV for Neovim -function nvimvenv { - if [[ -e "$VIRTUAL_ENV" && -f "$VIRTUAL_ENV/bin/activate" ]]; then - source "$VIRTUAL_ENV/bin/activate" - command nvim "$@" - deactivate - else - command nvim "$@" - fi -} - -alias nvim=nvimvenv -# alias nvim-minimal="NVIM_APPNAME=Minivim nvim" -# alias nvim-arduino="NVIM_APPNAME=Arduino nvim" - -#function nvims() { -# items=("Main" "Minivim" "Arduinvim") -# config=$(printf "%s\n" "${items[@]}" | fzf --prompt=" Neovim Config  " --height=~50% --layout=reverse --border --exit-0) -# if [[ -z $config ]]; then -# echo "Nothing selected" -# return 0 -# elif [[ $config == "Main" ]]; then -# config="" -# fi -# NVIM_APPNAME=$config nvim $@ -#} -#bindkey -s ^a "nvims\n" - -# source /Users/normrasmussen/.docker/init-zsh.sh || true # Added by Docker Desktop -export PATH="$PATH:$HOME/.rvm/bin" - -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -export PATH="/opt/homebrew/sbin:$PATH" -export PATH="/opt/homebrew/bin:$PATH" -source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh -source ~/.dotfiles/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh -source ~/.dotfiles/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh diff --git a/zsh/.zshrc.minimal b/zsh/.zshrc.minimal deleted file mode 100644 index 775f1cb..0000000 --- a/zsh/.zshrc.minimal +++ /dev/null @@ -1,8 +0,0 @@ -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 diff --git a/zsh/zsh-autosuggestions b/zsh/zsh-autosuggestions deleted file mode 160000 index c3d4e57..0000000 --- a/zsh/zsh-autosuggestions +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5 diff --git a/zsh/zsh-syntax-highlighting b/zsh/zsh-syntax-highlighting deleted file mode 160000 index 143b25e..0000000 --- a/zsh/zsh-syntax-highlighting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec diff --git a/zsh_issues.md b/zsh_issues.md deleted file mode 100644 index 9faf1f5..0000000 --- a/zsh_issues.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -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`