diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index ae3fb8a..9709824 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -57,6 +57,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "925e2aa30dc9fe9332060199c19f132ec0f3d493" }, "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, + "semshi": { "branch": "master", "commit": "8047086306b1951e741f519f53d293d8b4b37f1a" }, "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" }, "starry.nvim": { "branch": "master", "commit": "dacd68fd7a3b4657ca5a57f3a3236b9c88dd9c29" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 1b185b3..ce203fa 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -378,6 +378,28 @@ return { -- Plugin that causes your code to crumble >:) -- 'eandrju/cellular-automaton.nvim', + { + "wookayin/semshi", + ft = "python", + build = ":UpdateRemotePlugins", + config = function() + vim.api.nvim_set_hl(0, "semshiLocal", { ctermfg=209, fg="#80aa9e" } ) + vim.api.nvim_set_hl(0, "semshiGlobal", { ctermfg=214, fg="#d3869b" } ) + vim.api.nvim_set_hl(0, "semshiImported", { ctermfg=214, fg="#8bba7f", cterm=bold, gui=bold } ) + vim.api.nvim_set_hl(0, "semshiParameter", { ctermfg=75, fg="#8bba7f" } ) + vim.api.nvim_set_hl(0, "semshiParameterUnused", { ctermfg=117, fg="#34381b", cterm=underline, gui=underline} ) + vim.api.nvim_set_hl(0, "semshiFree", { ctermfg=218, fg="#e9b143"} ) + vim.api.nvim_set_hl(0, "semshiBuiltin", { ctermfg=207, fg="#f2594b"} ) + vim.api.nvim_set_hl(0, "semshiAttribute", { ctermfg=49, fg="#3b4439"} ) + vim.api.nvim_set_hl(0, "semshiSelf", { ctermfg=249, fg="#db4740"} ) + vim.api.nvim_set_hl(0, "semshiUnresolved", { ctermfg=226, fg="#f28534", cterm=underline, gui=underline} ) + vim.api.nvim_set_hl(0, "semshiSelected", { ctermfg=231, fg="#ffffff", ctermbg=161, bg="#4c3432"} ) + vim.api.nvim_set_hl(0, "semshiErrorSign", { ctermfg=231, fg="#ffffff", ctermbg=160, bg="#402120"} ) + vim.api.nvim_set_hl(0, "semshiErrorChar", { ctermfg=231, fg="#ffffff", ctermbg=160, bg="#402120"} ) + vim.cmd([[sign define semshiError text=E> texthl=semshiErrorSign]]) + end + }, + -- Wakatime Tracking 'wakatime/vim-wakatime', diff --git a/tmuxp/Work.yaml b/tmuxp/Work.yaml index d39ad16..c7493fc 100644 --- a/tmuxp/Work.yaml +++ b/tmuxp/Work.yaml @@ -1,31 +1,42 @@ session_name: Work windows: -- layout: b7be,192x52,0,0,1 +- layout: bf7e,144x54,0,0,1 options: {} panes: - focus: 'true' shell_command: nvim - start_directory: /Users/normrasmussen/Documents/Work/CustomerNotes + start_directory: /Users/normrasmussen/Documents/Work window_name: notes -- layout: b7bf,192x52,0,0,2 +- focus: 'true' + layout: beff,143x54,0,0,2 options: {} panes: - focus: 'true' - shell_command: nvim + shell_command: Python start_directory: /Users/normrasmussen/Documents/Work/Custom_Templates window_name: templates -- layout: 08ba,192x52,0,0[192x40,0,0,4,192x11,0,41,11] +- layout: bf85,144x54,0,0,8 + options: {} + panes: + - focus: 'true' + shell_command: zsh + start_directory: /Users/normrasmussen/Documents/Work/Scripts + window_name: scripts +- layout: 775a,144x54,0,0[144x43,0,0,4,144x10,0,44,5] options: {} panes: - focus: 'true' shell_command: - - cd /Users/normrasmussen/Documents/Work/Scripts - window_name: scripts -- focus: 'true' - layout: 9c3d,192x52,0,0[192x41,0,0,5,192x10,0,42,16] + - cd /Users/normrasmussen/.dotfiles + - nvim + - shell_command: + - cd /Users/normrasmussen + - zsh + window_name: dots +- layout: bf03,143x54,0,0,6 options: {} panes: - - shell_command: - - cd /Users/normrasmussen/.dotfiles - focus: 'true' - window_name: dots + shell_command: zsh + start_directory: /Users/normrasmussen/Documents/Projects/hugo_blog + window_name: hugo diff --git a/zsh/.zshrc b/zsh/.zshrc index 9853c55..1a210c7 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -61,3 +61,5 @@ 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/zsh-autosuggestions b/zsh/zsh-autosuggestions new file mode 160000 index 0000000..c3d4e57 --- /dev/null +++ b/zsh/zsh-autosuggestions @@ -0,0 +1 @@ +Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5 diff --git a/zsh/zsh-syntax-highlighting b/zsh/zsh-syntax-highlighting new file mode 160000 index 0000000..143b25e --- /dev/null +++ b/zsh/zsh-syntax-highlighting @@ -0,0 +1 @@ +Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec diff --git a/zsh_issues.md b/zsh_issues.md new file mode 100644 index 0000000..9faf1f5 --- /dev/null +++ b/zsh_issues.md @@ -0,0 +1,15 @@ +--- +title: "Test" +date: 2023-09-12T17:19:08Z +draft: false +--- + +Yesterday, I could not get my ZSH shell to work at all. As I kept trying things, I was getting all these weird errors. I started posting about this on Mastodon too. + +[Mastodon Thread](https://fosstodon.org/@notnorm/111047573608738701) where I kept asking myself - no responses! + +Finally, I realized the issue. And that was the [Starship](https://www.starship.rs) cross-shell prompt. Turns out, it was making everything really really slow. + +I finally got it fixed by doing the following: +* Delete everything from `~/.zsh_sessions/` and `~/.zsh_history`. +* Do not use `source ~/.zshrc` and definitely don't use it in your `zshrc` file! Instead of `source` use `exec zsh`