diff --git a/iTerm/settings/com.googlecode.iterm2.plist b/iTerm/settings/com.googlecode.iterm2.plist index 801962b..dbd3bec 100644 --- a/iTerm/settings/com.googlecode.iterm2.plist +++ b/iTerm/settings/com.googlecode.iterm2.plist @@ -3153,6 +3153,758 @@ Working Directory /Users/joshp + + ASCII Anti Aliased + + Ambiguous Double Width + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + 0.18431372549019609 + Color Space + sRGB + Green Component + 0.1254901960784314 + Red Component + 0.1137254901960784 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.55686274509803924 + Color Space + sRGB + Green Component + 0.46274509803921571 + Red Component + 0.96862745098039216 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.41568627450980389 + Color Space + sRGB + Green Component + 0.80784313725490198 + Red Component + 0.61960784313725492 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.40784313725490201 + Color Space + sRGB + Green Component + 0.68627450980392157 + Red Component + 0.8784313725490196 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 0.96862745098039216 + Color Space + sRGB + Green Component + 0.63529411764705879 + Red Component + 0.47843137254901957 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.96862745098039216 + Color Space + sRGB + Green Component + 0.60392156862745094 + Red Component + 0.73333333333333328 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 1 + Color Space + sRGB + Green Component + 0.81176470588235294 + Red Component + 0.49019607843137247 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.792156862745098 + Red Component + 0.75294117647058822 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.41568627450980389 + Color Space + sRGB + Green Component + 0.80784313725490198 + Red Component + 0.61960784313725492 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.40784313725490201 + Color Space + sRGB + Green Component + 0.68627450980392157 + Red Component + 0.8784313725490196 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.96862745098039216 + Color Space + sRGB + Green Component + 0.63529411764705879 + Red Component + 0.47843137254901957 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.96862745098039216 + Color Space + sRGB + Green Component + 0.60392156862745094 + Red Component + 0.73333333333333328 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 1 + Color Space + sRGB + Green Component + 0.81176470588235294 + Red Component + 0.49019607843137247 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.83921568627450982 + Color Space + sRGB + Green Component + 0.69411764705882351 + Red Component + 0.66274509803921566 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.40784313725490201 + Color Space + sRGB + Green Component + 0.28235294117647058 + Red Component + 0.25490196078431371 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.55686274509803924 + Color Space + sRGB + Green Component + 0.46274509803921571 + Red Component + 0.96862745098039216 + + BM Growl + + Background Color + + Alpha Component + 1 + Blue Component + 0.23137254901960791 + Color Space + sRGB + Green Component + 0.15686274509803921 + Red Component + 0.14117647058823529 + + Background Image Location + + Badge Color + + Alpha Component + 0.5 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.1491314172744751 + Red Component + 1 + + Blend + 1 + Blinking Cursor + + Blur + + Bold Color + + Alpha Component + 1 + Blue Component + 0.61176470588235299 + Color Space + sRGB + Green Component + 0.73725490196078436 + Red Component + 0.1019607843137255 + + Bound Hosts + + Character Encoding + 4 + Close Sessions On End + + Columns + 100 + Command + -t -p 5222 joshp@67.146.34.171 + Cursor Color + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.792156862745098 + Red Component + 0.75294117647058822 + + Cursor Guide Color + + Alpha Component + 0.25 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.792156862745098 + Red Component + 0.75294117647058822 + + Cursor Text Color + + Alpha Component + 1 + Blue Component + 0.23137254901960791 + Color Space + sRGB + Green Component + 0.15686274509803921 + Red Component + 0.14117647058823529 + + Custom Command + SSH + Custom Directory + No + Custom Tab Title + + Custom Window Title + asdfasdfasdf + Default Bookmark + No + Description + Default + Disable Smcup Rmcup + + Disable Window Resizing + + Draw Powerline Glyphs + + Flashing Bell + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.792156862745098 + Red Component + 0.75294117647058822 + + Guid + 6AB2D553-A7D8-4F5A-AE92-C3EF9D4955FF + Horizontal Spacing + 1 + Idle Code + 0 + Initial Text + tmux new -A -s homelab + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0x2d-0x40000 + + Action + 11 + Text + 0x1f + + 0x32-0x40000 + + Action + 11 + Text + 0x00 + + 0x33-0x40000 + + Action + 11 + Text + 0x1b + + 0x34-0x40000 + + Action + 11 + Text + 0x1c + + 0x35-0x40000 + + Action + 11 + Text + 0x1d + + 0x36-0x40000 + + Action + 11 + Text + 0x1e + + 0x37-0x40000 + + Action + 11 + Text + 0x1f + + 0x38-0x40000 + + Action + 11 + Text + 0x7f + + 0xf700-0x220000 + + Action + 10 + Text + [1;2A + + 0xf700-0x240000 + + Action + 10 + Text + [1;5A + + 0xf700-0x260000 + + Action + 10 + Text + [1;6A + + 0xf700-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x41 + + 0xf701-0x220000 + + Action + 10 + Text + [1;2B + + 0xf701-0x240000 + + Action + 10 + Text + [1;5B + + 0xf701-0x260000 + + Action + 10 + Text + [1;6B + + 0xf701-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x42 + + 0xf702-0x220000 + + Action + 10 + Text + [1;2D + + 0xf702-0x240000 + + Action + 10 + Text + [1;5D + + 0xf702-0x260000 + + Action + 10 + Text + [1;6D + + 0xf702-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x44 + + 0xf703-0x220000 + + Action + 10 + Text + [1;2C + + 0xf703-0x240000 + + Action + 10 + Text + [1;5C + + 0xf703-0x260000 + + Action + 10 + Text + [1;6C + + 0xf703-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x43 + + 0xf704-0x20000 + + Action + 10 + Text + [1;2P + + 0xf705-0x20000 + + Action + 10 + Text + [1;2Q + + 0xf706-0x20000 + + Action + 10 + Text + [1;2R + + 0xf707-0x20000 + + Action + 10 + Text + [1;2S + + 0xf708-0x20000 + + Action + 10 + Text + [15;2~ + + 0xf709-0x20000 + + Action + 10 + Text + [17;2~ + + 0xf70a-0x20000 + + Action + 10 + Text + [18;2~ + + 0xf70b-0x20000 + + Action + 10 + Text + [19;2~ + + 0xf70c-0x20000 + + Action + 10 + Text + [20;2~ + + 0xf70d-0x20000 + + Action + 10 + Text + [21;2~ + + 0xf70e-0x20000 + + Action + 10 + Text + [23;2~ + + 0xf70f-0x20000 + + Action + 10 + Text + [24;2~ + + 0xf729-0x20000 + + Action + 10 + Text + [1;2H + + 0xf729-0x40000 + + Action + 10 + Text + [1;5H + + 0xf72b-0x20000 + + Action + 10 + Text + [1;2F + + 0xf72b-0x40000 + + Action + 10 + Text + [1;5F + + + Left Option Key Changeable + + Link Color + + Alpha Component + 1 + Blue Component + 0.792156862745098 + Color Space + sRGB + Green Component + 0.85490196078431369 + Red Component + 0.45098039215686281 + + Minimum Contrast + 0.0 + Mouse Reporting + + Name + home-mini-server + Non Ascii Font + Monaco 12 + Non-ASCII Anti Aliased + + Normal Font + MesloLGS-NF-Regular 17 + Only The Default BG Color Uses Transparency + + Option Key Sends + 2 + Prevent Opening in a Tab + + Prompt Before Closing 2 + + Right Option Key Changeable + + Right Option Key Sends + 2 + Rows + 35 + Screen + -1 + Scrollback Lines + 0 + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.792156862745098 + Red Component + 0.75294117647058822 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.39215686274509798 + Color Space + sRGB + Green Component + 0.23529411764705879 + Red Component + 0.1803921568627451 + + Send Code When Idle + + Shortcut + + Silence Bell + + Sync Title + + Tags + + Terminal Type + xterm-256color + Transparency + 0.0 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Use Cursor Guide + + Use Custom Tab Title + + Use Custom Window Title + + Use Italic Font + + Use Non-ASCII Font + + Vertical Spacing + 1 + Visual Bell + + Window Type + 0 + Working Directory + /Users/joshp + ASCII Anti Aliased diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 8edd73b..de1b2b3 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" }, @@ -8,28 +8,28 @@ "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codesnap.nvim": { "branch": "main", "commit": "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b" }, - "conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" }, + "codesnap.nvim": { "branch": "main", "commit": "08d7588ea03af711e8d6c4b94736e223f0464d18" }, + "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "cea5920abb202753004440f94ec39bcf2927e02e" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.indentscope": { "branch": "main", "commit": "f15c61e71318b16c6616c2ace907136b76674f13" }, - "mini.nvim": { "branch": "main", "commit": "63c21a99e60ee59456faa4e5a245c59eeacac4d9" }, + "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, + "mini.nvim": { "branch": "main", "commit": "bc6c0f7b49d71716c996a9422a46bbe5badec8ca" }, "minimap.vim": { "branch": "master", "commit": "395378137e6180762d5b963ca9ad5ac2db5d3283" }, - "noice.nvim": { "branch": "main", "commit": "88ac36864b5976a64b14a8f156c616f41b32f228" }, - "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, + "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, - "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, - "nvim-lspconfig": { "branch": "master", "commit": "9baca6a403b3b2098224010fda6ff5615ae6e782" }, + "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, - "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, + "nvim-treesitter": { "branch": "master", "commit": "caf275382f91ec8a2498d455c4d7d3fd0265ebd3" }, + "nvim-treesitter-context": { "branch": "master", "commit": "cc908326c93473041d44398d5ebfa2bb4169d649" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, @@ -37,16 +37,16 @@ "persistence.nvim": { "branch": "main", "commit": "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, - "smart-splits.nvim": { "branch": "master", "commit": "ae8ffc9509f6f82b51e3b38f24c49fe47b793cb1" }, + "smart-splits.nvim": { "branch": "master", "commit": "e186518f9d7eb4b1e43fbbe0c52bf323637194d0" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "a7ab9a957b17199183388c6f357d614fcaa508e5" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" }, + "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, - "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" }, - "trouble.nvim": { "branch": "main", "commit": "82042f7bf42ebedc8f2751f0ab16ebaff42c1ce7" }, + "tokyonight.nvim": { "branch": "main", "commit": "ddc95562fdc5c4d6e1667b7258b9e3a987ec18b4" }, + "trouble.nvim": { "branch": "main", "commit": "0fe430e953a6c47433ef923555dfe9a42351113a" }, "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" }, - "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" }, + "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" }, diff --git a/nvim/.config/nvim/lua/plugins/git-signs.lua b/nvim/.config/nvim/lua/plugins/git-signs.lua index 0c82921..1a19a77 100644 --- a/nvim/.config/nvim/lua/plugins/git-signs.lua +++ b/nvim/.config/nvim/lua/plugins/git-signs.lua @@ -4,8 +4,10 @@ local icons = require("joshp.icons") return { "lewis6991/gitsigns.nvim", + version = "0.7", event = { "BufReadPost", "BufWritePost", "BufNewFile" }, opts = { + numhl = true, signs = { add = { hl = "GitSignsAdd",