diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 2959a67..65da24e 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,70 +1,73 @@ { "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, - "avante.nvim": { "branch": "main", "commit": "de8fb58bfab54f1494b1ba0089efd2c85e3beb9f" }, - "barbar.nvim": { "branch": "master", "commit": "3a74402bdf04745a762de83d5c5e88e3e9b0e2e0" }, - "blink-emoji.nvim": { "branch": "master", "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9" }, - "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, - "copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" }, + "avante.nvim": { "branch": "main", "commit": "212797a2f27d15ef5f0e8b3727a2c0a245ea5f8d" }, + "barbar.nvim": { "branch": "master", "commit": "549ee11d97057eae207bafa2c23c315942cca097" }, + "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, + "claudius.nvim": { "branch": "develop", "commit": "88b825f206ec2a759b9e8b8cc0b88cb12a064ea7" }, + "copilot.lua": { "branch": "master", "commit": "3fd7b50810ae4cccf8b38e4c509b1608f141a9e9" }, "dashboard-nvim": { "branch": "master", "commit": "c42fcfbd96dfcaa486c0a0ab52494316f1c31350" }, - "deadcolumn.nvim": { "branch": "master", "commit": "6a144a32fd847a998095d2494f152e405c6ae7cb" }, + "deadcolumn.nvim": { "branch": "master", "commit": "7083c496d278d650c4933e6f704fface80db4aa5" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dracula.nvim": { "branch": "main", "commit": "96c9d19ce81b26053055ad6f688277d655b3f7d2" }, + "dracula.nvim": { "branch": "main", "commit": "df528c869b09fbdc7578e6ccc7ff6faf44a2046d" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, - "eldritch.nvim": { "branch": "master", "commit": "adedead3423c58cc2e2ebf30001fe4055ad0e416" }, + "eldritch.nvim": { "branch": "master", "commit": "c980caea40cab7eab2c3a467af5bab1e7e66fcce" }, "f-string-toggle.nvim": { "branch": "main", "commit": "74545e699ed0caca603b2612bfa706ff40736d31" }, - "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "fidget.nvim": { "branch": "main", "commit": "a837f0653ab0f07b9efb1870372a60a031208ac1" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" }, + "fzf-lua": { "branch": "main", "commit": "15a6d0d8b8c13f703053be9a7d6e2f5dab581749" }, + "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" }, - "hover.nvim": { "branch": "main", "commit": "07c7269c3a88751f2f36ed0563dc6e7b8b84f7f7" }, + "hover.nvim": { "branch": "main", "commit": "24a43e0eda924f1f32361c76ee9a1f0e8cc25650" }, "img-clip.nvim": { "branch": "main", "commit": "d8b6b030672f9f551a0e3526347699985a779d93" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "mini.comment": { "branch": "main", "commit": "fb867a9246f9b892cf51a8c84a3f8479cdf1558c" }, "mini.fuzzy": { "branch": "stable", "commit": "c33d6a93c4fe395ae8a9bd02fed35315a90b688a" }, - "mini.hipatterns": { "branch": "main", "commit": "e5083df391171dc9d8172645606f8496d9443374" }, - "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, - "mini.move": { "branch": "main", "commit": "4fe4a855fee53c66b0f3255a4b54ddc2ae6b308c" }, + "mini.hipatterns": { "branch": "main", "commit": "2b78f3d475d60ea1793a6d595ff65a0db9ac3a67" }, + "mini.icons": { "branch": "main", "commit": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c" }, + "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, + "mini.move": { "branch": "main", "commit": "819e90c3e113a3c826c3003ec07073f1e0677ea0" }, "mini.pairs": { "branch": "stable", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" }, - "mini.trailspace": { "branch": "main", "commit": "39a0460c025a605519fdd6bea1ce870642429996" }, + "mini.trailspace": { "branch": "main", "commit": "3d570d015d63ad6d3f8a90f12c6b544c2400cea9" }, "mkdnflow.nvim": { "branch": "main", "commit": "d459bd7ce68910272038ed037c028180161fd14d" }, "morta": { "branch": "main", "commit": "10b4cdb8b7ae3f814b77f617f985245b3c11c1fa" }, "neowarrior.nvim": { "branch": "main", "commit": "197cd4a7a56d07374fcda09b5b56baa433e40549" }, - "nightfly": { "branch": "master", "commit": "8c55003e89f321a48a8cd4bb426dd3e7c58f0646" }, + "nightfly": { "branch": "master", "commit": "8d0ee8436a9f37252c1a7976fe76617e8df34a5a" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "numb.nvim": { "branch": "master", "commit": "7f564e638d3ba367abf1ec91181965b9882dd509" }, - "nvim": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, + "nvim": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" }, - "nvim-tree.lua": { "branch": "master", "commit": "be5b788f2dc1522c73fb7afad9092331c8aebe80" }, + "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" }, + "nvim-tree.lua": { "branch": "master", "commit": "321bc61580fd066b76861c32de3319c3a6d089e7" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "97bf4b8ef9298644a29fcd9dd41a0210cf08cac7" }, "rainbow_csv.nvim": { "branch": "main", "commit": "26de78d8324f7ac6a3e478319d1eb1f17123eb5b" }, - "render-markdown.nvim": { "branch": "main", "commit": "6f5a4c36d9383b2a916facaa63dcd573afa11ee8" }, + "render-markdown.nvim": { "branch": "main", "commit": "0087ee1d505d4fc4886d8d3121ae7848b7c0e49b" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "solarized-osaka.nvim": { "branch": "main", "commit": "f796014c14b1910e08d42cc2077fef34f08e0295" }, - "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, "telescope-cmdline.nvim": { "branch": "main", "commit": "7106ff7357d9d3cde3e71cd8fe8998d2f96a1bdd" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "b80ec2c70ec4f32571478b501218c8979fab5201" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "thethethe.nvim": { "branch": "main", "commit": "357580127cd291c8a813564eeaff07c09303084e" }, - "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "cac10593c4baaacd0f2a1f4d8ba9508667bf3f79" }, + "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "f64efd33a51ea89bdb847fb3aaf716e96b83ba1a" }, "tmux.nvim": { "branch": "main", "commit": "2c1c3be0ef287073cef963f2aefa31a15c8b9cd8" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" }, "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" }, - "vim-wakatime": { "branch": "master", "commit": "f39c4a201ae350aaba713b59d4a4fdd88e0811aa" }, + "vim-wakatime": { "branch": "master", "commit": "3403495670f0ee08887401a28f8430dc4ac67429" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/nvim/.config/nvim/lua/plugins/avante.lua b/nvim/.config/nvim/lua/plugins/avante.lua index 14ae581..673a9f2 100644 --- a/nvim/.config/nvim/lua/plugins/avante.lua +++ b/nvim/.config/nvim/lua/plugins/avante.lua @@ -1,20 +1,43 @@ return { "yetone/avante.nvim", + build = function() + -- conditionally use the correct build system for the current OS + if vim.fn.has("win32") == 1 then + return "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" + else + return "make" + end + end, event = "VeryLazy", - lazy = false, - version = false, -- set this if you want to always pull the latest change + version = false, -- Never set this value to "*"! Never! + ---@module 'avante' + ---@type avante.Config opts = { -- add any opts here + -- for example + provider = "claude", + providers = { + claude = { + endpoint = "https://api.anthropic.com", + model = "claude-sonnet-4-20250514", + timeout = 30000, -- Timeout in milliseconds + extra_request_body = { + temperature = 0.75, + max_tokens = 20480, + }, + }, + }, }, - -- if you want to build from source then do `make BUILD_FROM_SOURCE=true` - build = "make", - -- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows dependencies = { "stevearc/dressing.nvim", "nvim-lua/plenary.nvim", "MunifTanjim/nui.nvim", --- The below dependencies are optional, + "nvim-telescope/telescope.nvim", -- for file_selector provider telescope "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions + "ibhagwan/fzf-lua", -- for file_selector provider fzf + "stevearc/dressing.nvim", -- for input provider dressing + "folke/snacks.nvim", -- for input provider snacks "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons "zbirenbaum/copilot.lua", -- for providers='copilot' { diff --git a/nvim/.config/nvim/lua/plugins/blink.lua b/nvim/.config/nvim/lua/plugins/blink.lua index d215da7..61b42dd 100644 --- a/nvim/.config/nvim/lua/plugins/blink.lua +++ b/nvim/.config/nvim/lua/plugins/blink.lua @@ -1,18 +1,14 @@ return { 'saghen/blink.cmp', - lazy = false, -- lazy loading handled internally version = '1.*', ---@module 'blink.cmp' ---@type blink.cmp.Config dependencies = { 'rafamadriz/friendly-snippets', 'L3MON4D3/LuaSnip', version = 'v2.*', - "moyiz/blink-emoji.nvim", }, opts = { - -- chartoggle = { enabled = true }, - -- indent = { enabled = true }, - -- tree = { enabled = true }, + -- tree = { enabled = true }, keymap = { preset = "default", [''] = { 'show', 'show_documentation', 'hide_documentation' }, @@ -26,17 +22,14 @@ return { 'fallback' }, [''] = { 'snippet_backward', 'fallback' }, - [''] = { 'select_prev', 'fallback' }, [''] = { 'select_next', 'fallback' }, [''] = { 'select_prev', 'fallback' }, [''] = { 'select_next', 'fallback' }, - [''] = { 'scroll_documentation_up', 'fallback' }, [''] = { 'scroll_documentation_down', 'fallback' }, }, appearance = { - -- use_nvim_cmp_as_default = true, nerd_font_variant = 'mono', }, completion = {documentation = { auto_show = false }, @@ -59,14 +52,6 @@ return { -- }, sources = { default = {'lsp', 'path', 'snippets', 'buffer'}, - -- providers = { - -- emoji = { - -- module = "blink-emoji", - -- name = "Emoji", - -- score_offset = 15, -- Tune by preference - -- opts = { insert = true }, -- Insert emoji (default) or complete its name - -- }, - -- } }, fuzzy = { implementation = "prefer_rust_with_warning" } }, diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 8ab6a41..ac6479b 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -39,13 +39,15 @@ return { -- General Functionality ------------------------------------------------------------ +{ + "StanAngeloff/claudius.nvim", + opts = {}, +}, { "folke/noice.nvim", - opts = { - }, - dependencies = { - "rcarriga/nvim-notify", - } + dependencies = { "rcarriga/nvim-notify" }, + opts = { + } }, -- Neovim statusline @@ -58,6 +60,11 @@ return { }, sections = { lualine_x = { + { + require("noice").api.statusline.mode.get, + cond = require("noice").api.statusline.mode.has, + color = { fg = "#ff9e64" }, + }, -- { -- function() -- return require("lazydo").get_lualine_stats() @@ -288,6 +295,11 @@ return { }) end }, + { 'echasnovski/mini.indentscope', version = '*', + config = function() + require('mini.indentscope').setup() + end + }, ----------------------------------------------------------- -- Markdown Plugins @@ -325,12 +337,6 @@ return { -- Text, Icons, Symbols ---------------------------------------------------------- - { - 'simrat39/symbols-outline.nvim', - config = function() - require('symbols-outline').setup() - end - }, { "j-hui/fidget.nvim", opts = { @@ -345,9 +351,10 @@ return { -- 'nvim-lua/plenary.nvim', -- Todo & Comments for Organization - -- { - -- 'folke/todo-comments.nvim', - -- dependencies = "nvim-lua/plenary.nvim", + { + 'folke/todo-comments.nvim', + dependencies = "nvim-lua/plenary.nvim", + opts = {} -- config = function() -- require("todo-comments").setup { -- keywords = { @@ -378,7 +385,7 @@ return { -- }, -- } -- end - -- }, + }, -- Various telescopes 'nvim-telescope/telescope-file-browser.nvim', diff --git a/zsh/.p10k.zsh b/zsh/.p10k.zsh index cb878d1..a183864 100644 --- a/zsh/.p10k.zsh +++ b/zsh/.p10k.zsh @@ -1,8 +1,8 @@ -# Generated by Powerlevel10k configuration wizard on 2025-03-03 at 10:14 EST. +# Generated by Powerlevel10k configuration wizard on 2025-06-17 at 11:08 EDT. # Based on romkatv/powerlevel10k/config/p10k-lean.zsh, checksum 26839. -# Wizard options: nerdfont-complete + powerline, small icons, ascii, lean, 24h time, -# 2 lines, dotted, dark-ornaments, compact, fluent, transient_prompt, -# instant_prompt=verbose. +# Wizard options: nerdfont-v3 + powerline, small icons, unicode, lean, 24h time, +# 2 lines, dotted, right frame, lightest-ornaments, compact, few icons, fluent, +# transient_prompt, instant_prompt=quiet. # Type `p10k configure` to generate another config. # # Config for Powerlevel10k with lean prompt style. Type `p10k configure` to generate @@ -117,7 +117,7 @@ ) # Defines character set used by powerlevel10k. It's best to let `p10k configure` set it for you. - typeset -g POWERLEVEL9K_MODE=ascii + typeset -g POWERLEVEL9K_MODE=nerdfont-v3 # When set to `moderate`, some icons will have an extra space after them. This is meant to avoid # icon overlap when using non-monospace fonts. When set to `none`, spaces are not added. typeset -g POWERLEVEL9K_ICON_PADDING=none @@ -150,32 +150,32 @@ typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX= typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX= # Connect right prompt lines with these symbols. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX= - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX= - typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX= + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX='%244F─╮' + typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX='%244F─┤' + typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX='%244F─╯' # The left end of left prompt. typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL= # The right end of right prompt. - typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL= + typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL=' ' # Ruler, a.k.a. the horizontal line before each prompt. If you set it to true, you'll # probably want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false above and # POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR=' ' below. typeset -g POWERLEVEL9K_SHOW_RULER=false - typeset -g POWERLEVEL9K_RULER_CHAR='-' # reasonable alternative: '·' - typeset -g POWERLEVEL9K_RULER_FOREGROUND=240 + typeset -g POWERLEVEL9K_RULER_CHAR='─' # reasonable alternative: '·' + typeset -g POWERLEVEL9K_RULER_FOREGROUND=244 - # Filler between left and right prompt on the first prompt line. You can set it to '·' or '-' + # Filler between left and right prompt on the first prompt line. You can set it to '·' or '─' # to make it easier to see the alignment between left and right prompt and to separate prompt # from command output. It serves the same purpose as ruler (see above) without increasing # the number of prompt lines. You'll probably want to set POWERLEVEL9K_SHOW_RULER=false # if using this. You might also like POWERLEVEL9K_PROMPT_ADD_NEWLINE=false for more compact # prompt. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='.' + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='·' if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then # The color of the filler. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=240 + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=244 # Add a space between the end of left prompt and the filler. typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=' ' # Add a space between the filler and the start of right prompt. @@ -198,13 +198,13 @@ # Red prompt symbol if the last command failed. typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196 # Default prompt symbol. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='>' + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='❯' # Prompt symbol in command vi mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='<' + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='❮' # Prompt symbol in visual vi mode. typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='V' # Prompt symbol in overwrite vi mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='^' + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='▶' typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=true # No line terminator if prompt_char is the last segment. typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='' @@ -355,7 +355,7 @@ # Formatter for Git status. # - # Example output: master wip <42>42 *42 merge ~42 +42 !42 ?42. + # Example output: master wip ⇣42⇡42 *42 merge ~42 +42 !42 ?42. # # You can edit the function to customize how Git status looks. # @@ -392,9 +392,9 @@ if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then local branch=${(V)VCS_STATUS_LOCAL_BRANCH} # If local branch name is at most 32 characters long, show it in full. - # Otherwise show the first 12 .. the last 12. + # Otherwise show the first 12 … the last 12. # Tip: To always show local branch name in full without truncation, delete the next line. - (( $#branch > 32 )) && branch[13,-13]=".." # <-- this line + (( $#branch > 32 )) && branch[13,-13]="…" # <-- this line res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}${branch//\%/%%}" fi @@ -405,9 +405,9 @@ ]]; then local tag=${(V)VCS_STATUS_TAG} # If tag name is at most 32 characters long, show it in full. - # Otherwise show the first 12 .. the last 12. + # Otherwise show the first 12 … the last 12. # Tip: To always show tag name in full without truncation, delete the next line. - (( $#tag > 32 )) && tag[13,-13]=".." # <-- this line + (( $#tag > 32 )) && tag[13,-13]="…" # <-- this line res+="${meta}#${clean}${tag//\%/%%}" fi @@ -427,21 +427,21 @@ fi if (( VCS_STATUS_COMMITS_AHEAD || VCS_STATUS_COMMITS_BEHIND )); then - # <42 if behind the remote. - (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}<${VCS_STATUS_COMMITS_BEHIND}" - # >42 if ahead of the remote; no leading space if also behind the remote: <42>42. + # ⇣42 if behind the remote. + (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}" + # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42. (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && res+=" " - (( VCS_STATUS_COMMITS_AHEAD )) && res+="${clean}>${VCS_STATUS_COMMITS_AHEAD}" + (( VCS_STATUS_COMMITS_AHEAD )) && res+="${clean}⇡${VCS_STATUS_COMMITS_AHEAD}" elif [[ -n $VCS_STATUS_REMOTE_BRANCH ]]; then # Tip: Uncomment the next line to display '=' if up to date with the remote. # res+=" ${clean}=" fi - # <-42 if behind the push remote. - (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" ${clean}<-${VCS_STATUS_PUSH_COMMITS_BEHIND}" + # ⇠42 if behind the push remote. + (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" ${clean}⇠${VCS_STATUS_PUSH_COMMITS_BEHIND}" (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" " - # ->42 if ahead of the push remote; no leading space if also behind: <-42->42. - (( VCS_STATUS_PUSH_COMMITS_AHEAD )) && res+="${clean}->${VCS_STATUS_PUSH_COMMITS_AHEAD}" + # ⇢42 if ahead of the push remote; no leading space if also behind: ⇠42⇢42. + (( VCS_STATUS_PUSH_COMMITS_AHEAD )) && res+="${clean}⇢${VCS_STATUS_PUSH_COMMITS_AHEAD}" # *42 if have stashes. (( VCS_STATUS_STASHES )) && res+=" ${clean}*${VCS_STATUS_STASHES}" # 'merge' if the repo is in an unusual state. @@ -456,12 +456,12 @@ # See POWERLEVEL9K_VCS_UNTRACKED_ICON above if you want to use a different icon. # Remove the next line if you don't want to see untracked files at all. (( VCS_STATUS_NUM_UNTRACKED )) && res+=" ${untracked}${(g::)POWERLEVEL9K_VCS_UNTRACKED_ICON}${VCS_STATUS_NUM_UNTRACKED}" - # "-" if the number of unstaged files is unknown. This can happen due to + # "─" if the number of unstaged files is unknown. This can happen due to # POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY (see below) being set to a non-negative number lower # than the number of files in the Git index, or due to bash.showDirtyState being set to false # in the repository config. The number of staged and untracked files may also be unknown # in this case. - (( VCS_STATUS_HAS_UNSTAGED == -1 )) && res+=" ${modified}-" + (( VCS_STATUS_HAS_UNSTAGED == -1 )) && res+=" ${modified}─" typeset -g my_git_format=$res } @@ -517,32 +517,32 @@ # it will signify success by turning green. typeset -g POWERLEVEL9K_STATUS_OK=false typeset -g POWERLEVEL9K_STATUS_OK_FOREGROUND=70 - typeset -g POWERLEVEL9K_STATUS_OK_VISUAL_IDENTIFIER_EXPANSION='ok' + typeset -g POWERLEVEL9K_STATUS_OK_VISUAL_IDENTIFIER_EXPANSION='✔' # Status when some part of a pipe command fails but the overall exit status is zero. It may look # like this: 1|0. typeset -g POWERLEVEL9K_STATUS_OK_PIPE=true typeset -g POWERLEVEL9K_STATUS_OK_PIPE_FOREGROUND=70 - typeset -g POWERLEVEL9K_STATUS_OK_PIPE_VISUAL_IDENTIFIER_EXPANSION='ok' + typeset -g POWERLEVEL9K_STATUS_OK_PIPE_VISUAL_IDENTIFIER_EXPANSION='✔' # Status when it's just an error code (e.g., '1'). No need to show it if prompt_char is enabled as # it will signify error by turning red. typeset -g POWERLEVEL9K_STATUS_ERROR=false typeset -g POWERLEVEL9K_STATUS_ERROR_FOREGROUND=160 - typeset -g POWERLEVEL9K_STATUS_ERROR_VISUAL_IDENTIFIER_EXPANSION='err' + typeset -g POWERLEVEL9K_STATUS_ERROR_VISUAL_IDENTIFIER_EXPANSION='✘' # Status when the last command was terminated by a signal. typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL=true typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_FOREGROUND=160 # Use terse signal names: "INT" instead of "SIGINT(2)". typeset -g POWERLEVEL9K_STATUS_VERBOSE_SIGNAME=false - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_VISUAL_IDENTIFIER_EXPANSION= + typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_VISUAL_IDENTIFIER_EXPANSION='✘' # Status when some part of a pipe command fails and the overall exit status is also non-zero. # It may look like this: 1|0. typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE=true typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_FOREGROUND=160 - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_VISUAL_IDENTIFIER_EXPANSION='err' + typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_VISUAL_IDENTIFIER_EXPANSION='✘' ###################[ command_execution_time: duration of the last command ]################### # Show duration of the last command if takes at least this many seconds. @@ -840,11 +840,11 @@ ###########[ timewarrior: timewarrior tracking status (https://timewarrior.net/) ]############ # Timewarrior color. typeset -g POWERLEVEL9K_TIMEWARRIOR_FOREGROUND=110 - # If the tracked task is longer than 24 characters, truncate and append "..". + # If the tracked task is longer than 24 characters, truncate and append "…". # Tip: To always display tasks without truncation, delete the following parameter. # Tip: To hide task names and display just the icon when time tracking is enabled, set the # value of the following parameter to "". - typeset -g POWERLEVEL9K_TIMEWARRIOR_CONTENT_EXPANSION='${P9K_CONTENT:0:24}${${P9K_CONTENT:24}:+..}' + typeset -g POWERLEVEL9K_TIMEWARRIOR_CONTENT_EXPANSION='${P9K_CONTENT:0:24}${${P9K_CONTENT:24}:+…}' # Custom icon. # typeset -g POWERLEVEL9K_TIMEWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐' @@ -1575,7 +1575,7 @@ # P9K_IP_TX_BYTES_DELTA | number of bytes sent since last prompt # P9K_IP_RX_RATE | receive rate (since last prompt) # P9K_IP_TX_RATE | send rate (since last prompt) - typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='$P9K_IP_IP${P9K_IP_RX_RATE:+ %70F<$P9K_IP_RX_RATE}${P9K_IP_TX_RATE:+ %215F>$P9K_IP_TX_RATE}' + typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='$P9K_IP_IP${P9K_IP_RX_RATE:+ %70F⇣$P9K_IP_RX_RATE}${P9K_IP_TX_RATE:+ %215F⇡$P9K_IP_TX_RATE}' # Show information for the first network interface whose name matches this regular expression. # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces. typeset -g POWERLEVEL9K_IP_INTERFACE='[ew].*' @@ -1597,7 +1597,7 @@ # Show battery in yellow when it's discharging. typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178 # Battery pictograms going from low to high level of charge. - typeset -g POWERLEVEL9K_BATTERY_STAGES=('battery') + typeset -g POWERLEVEL9K_BATTERY_STAGES='\UF008E\UF007A\UF007B\UF007C\UF007D\UF007E\UF007F\UF0080\UF0081\UF0082\UF0079' # Don't show the remaining time to charge/discharge. typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false @@ -1647,7 +1647,7 @@ # # Type `p10k help segment` for documentation and a more sophisticated example. function prompt_example() { - p10k segment -f 208 -i '*' -t 'hello, %n' + p10k segment -f 208 -i '⭐' -t 'hello, %n' } # User-defined prompt segments may optionally provide an instant_prompt_* function. Its job @@ -1692,7 +1692,7 @@ # - verbose: Enable instant prompt and print a warning when detecting console output during # zsh initialization. Choose this if you've never tried instant prompt, haven't # seen the warning, or if you are unsure what this all means. - typeset -g POWERLEVEL9K_INSTANT_PROMPT=verbose + typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet # Hot reload allows you to change POWERLEVEL9K options after Powerlevel10k has been initialized. # For example, you can type POWERLEVEL9K_BACKGROUND=red and see your prompt turn red. Hot reload diff --git a/zsh/.zshrc b/zsh/.zshrc index 564c534..f96c4ad 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,3 +1,13 @@ + +# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. +# Initialization code that may require console input (password prompts, [y/n] +# confirmations, etc.) must go above this block; everything else may go below. +if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then + source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" +fi + +# autoload -Uz compinit +# compinit export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 # autoload -Uz compinit; compinit; _comp_options+=(globdots); @@ -30,7 +40,7 @@ function nvimvenv { export PATH="$PATH:$HOME/.rvm/bin" [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -NPM_PACKAGES=/Users/normrasmussen/.npm-packages +NPM_PACKAGES=/Users/$USERNAME/.npm-packages export PATH="/opt/homebrew/sbin:$PATH" export PATH="/opt/homebrew/bin:$PATH" export PATH="$NPM_PACKAGES/bin:$PATH" @@ -42,149 +52,16 @@ source ~/.dotfiles/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh source ~/.dotfiles/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh . "$HOME/.cargo/env" export PATH="/usr/local/opt/openssl/bin:$PATH" -echo 'eval "$(uv generate-shell-completion zsh)"' >> ~/.zshrc - . "$HOME/.local/bin/env" # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" eval "$(uv generate-shell-completion zsh)" -export NVM_DIR="$HOME/.nvm" +# export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" -eval "$(uv generate-shell-completion zsh)" + +# To customize prompt, run `p10k configure` or edit ~/.dotfiles/zsh/.p10k.zsh. +[[ ! -f ~/.dotfiles/zsh/.p10k.zsh ]] || source ~/.dotfiles/zsh/.p10k.zsh