diff --git a/iterm2-preferences/com.googlecode.iterm2.plist b/iterm2-preferences/com.googlecode.iterm2.plist index 1375c2a..5175089 100644 --- a/iterm2-preferences/com.googlecode.iterm2.plist +++ b/iterm2-preferences/com.googlecode.iterm2.plist @@ -8,6 +8,665 @@ CopySelection + Custom Color Presets + + catppuccin-macchiato + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + 0.39215686274509803 + Color Space + sRGB + Green Component + 0.30196078431372547 + Red Component + 0.28627450980392155 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.58823529411764708 + Color Space + sRGB + Green Component + 0.52941176470588236 + Red Component + 0.92941176470588238 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.58431372549019611 + Color Space + sRGB + Green Component + 0.85490196078431369 + Red Component + 0.65098039215686276 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.62352941176470589 + Color Space + sRGB + Green Component + 0.83137254901960789 + Red Component + 0.93333333333333335 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.54117647058823526 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.90196078431372551 + Color Space + sRGB + Green Component + 0.74117647058823533 + Red Component + 0.96078431372549022 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 0.792156862745098 + Color Space + sRGB + Green Component + 0.83529411764705885 + Red Component + 0.54509803921568623 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.79607843137254897 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.6470588235294118 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.58431372549019611 + Color Space + sRGB + Green Component + 0.85490196078431369 + Red Component + 0.65098039215686276 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.62352941176470589 + Color Space + sRGB + Green Component + 0.83137254901960789 + Red Component + 0.93333333333333335 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.54117647058823526 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.90196078431372551 + Color Space + sRGB + Green Component + 0.74117647058823533 + Red Component + 0.96078431372549022 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 0.792156862745098 + Color Space + sRGB + Green Component + 0.83529411764705885 + Red Component + 0.54509803921568623 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.8784313725490196 + Color Space + sRGB + Green Component + 0.75294117647058822 + Red Component + 0.72156862745098038 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.47058823529411764 + Color Space + sRGB + Green Component + 0.37647058823529411 + Red Component + 0.35686274509803922 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.58823529411764708 + Color Space + sRGB + Green Component + 0.52941176470588236 + Red Component + 0.92941176470588238 + + Background Color + + Alpha Component + 1 + Blue Component + 0.22745098039215686 + Color Space + sRGB + Green Component + 0.15294117647058825 + Red Component + 0.14117647058823529 + + Bold Color + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Cursor Color + + Alpha Component + 1 + Blue Component + 0.83921568627450982 + Color Space + sRGB + Green Component + 0.85882352941176465 + Red Component + 0.95686274509803926 + + Cursor Guide Color + + Alpha Component + 0.070000000000000007 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Cursor Text Color + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Link Color + + Alpha Component + 1 + Blue Component + 0.8901960784313725 + Color Space + sRGB + Green Component + 0.84313725490196079 + Red Component + 0.56862745098039214 + + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.47058823529411764 + Color Space + sRGB + Green Component + 0.37647058823529411 + Red Component + 0.35686274509803922 + + + catppuccin-mocha + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + 0.35294117647058826 + Color Space + sRGB + Green Component + 0.27843137254901962 + Red Component + 0.27058823529411763 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.6588235294117647 + Color Space + sRGB + Green Component + 0.54509803921568623 + Red Component + 0.95294117647058818 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.63137254901960782 + Color Space + sRGB + Green Component + 0.8901960784313725 + Red Component + 0.65098039215686276 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.68627450980392157 + Color Space + sRGB + Green Component + 0.88627450980392153 + Red Component + 0.97647058823529409 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 0.98039215686274506 + Color Space + sRGB + Green Component + 0.70588235294117652 + Red Component + 0.53725490196078429 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.90588235294117647 + Color Space + sRGB + Green Component + 0.76078431372549016 + Red Component + 0.96078431372549022 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 0.83529411764705885 + Color Space + sRGB + Green Component + 0.88627450980392153 + Red Component + 0.58039215686274515 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.78431372549019607 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.65098039215686276 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.63137254901960782 + Color Space + sRGB + Green Component + 0.8901960784313725 + Red Component + 0.65098039215686276 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.68627450980392157 + Color Space + sRGB + Green Component + 0.88627450980392153 + Red Component + 0.97647058823529409 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.98039215686274506 + Color Space + sRGB + Green Component + 0.70588235294117652 + Red Component + 0.53725490196078429 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.90588235294117647 + Color Space + sRGB + Green Component + 0.76078431372549016 + Red Component + 0.96078431372549022 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 0.83529411764705885 + Color Space + sRGB + Green Component + 0.88627450980392153 + Red Component + 0.58039215686274515 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.87058823529411766 + Color Space + sRGB + Green Component + 0.76078431372549016 + Red Component + 0.72941176470588232 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.4392156862745098 + Color Space + sRGB + Green Component + 0.35686274509803922 + Red Component + 0.34509803921568627 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.6588235294117647 + Color Space + sRGB + Green Component + 0.54509803921568623 + Red Component + 0.95294117647058818 + + Background Color + + Alpha Component + 1 + Blue Component + 0.1803921568627451 + Color Space + sRGB + Green Component + 0.11764705882352941 + Red Component + 0.11764705882352941 + + Bold Color + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.83921568627450982 + Red Component + 0.80392156862745101 + + Cursor Color + + Alpha Component + 1 + Blue Component + 0.86274509803921573 + Color Space + sRGB + Green Component + 0.8784313725490196 + Red Component + 0.96078431372549022 + + Cursor Guide Color + + Alpha Component + 0.070000000000000007 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.83921568627450982 + Red Component + 0.80392156862745101 + + Cursor Text Color + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.83921568627450982 + Red Component + 0.80392156862745101 + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.83921568627450982 + Red Component + 0.80392156862745101 + + Link Color + + Alpha Component + 1 + Blue Component + 0.92156862745098034 + Color Space + sRGB + Green Component + 0.86274509803921573 + Red Component + 0.53725490196078429 + + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.83921568627450982 + Red Component + 0.80392156862745101 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.4392156862745098 + Color Space + sRGB + Green Component + 0.35686274509803922 + Red Component + 0.34509803921568627 + + + Default Bookmark Guid 176CC3A0-7519-4F56-A9CA-A13581E4DE4E DoubleClickPerformsSmartSelection @@ -34,210 +693,210 @@ Ansi 0 Color Alpha Component - 1 + 1 Blue Component - 0.203921568627 + 0.39215686274509803 Color Space sRGB Green Component - 0.17254901960800001 + 0.30196078431372547 Red Component - 0.15686274509799999 + 0.28627450980392155 Ansi 1 Color Alpha Component - 1 + 1 Blue Component - 0.458823529412 + 0.58823529411764708 Color Space sRGB Green Component - 0.42352941176499997 + 0.52941176470588236 Red Component - 0.87843137254899994 + 0.92941176470588238 Ansi 10 Color Alpha Component - 1 + 1 Blue Component - 0.47450980392199998 + 0.58431372549019611 Color Space sRGB Green Component - 0.76470588235299997 + 0.85490196078431369 Red Component - 0.59607843137299998 + 0.65098039215686276 Ansi 11 Color Alpha Component - 1 + 1 Blue Component - 0.48235294117600003 + 0.62352941176470589 Color Space sRGB Green Component - 0.75294117647100001 + 0.83137254901960789 Red Component - 0.89803921568599998 + 0.93333333333333335 Ansi 12 Color Alpha Component - 1 + 1 Blue Component - 0.93725490196100003 + 0.95686274509803926 Color Space sRGB Green Component - 0.68627450980399995 + 0.67843137254901964 Red Component - 0.38039215686299999 + 0.54117647058823526 Ansi 13 Color Alpha Component - 1 + 1 Blue Component - 0.86666666666699999 + 0.90196078431372551 Color Space sRGB Green Component - 0.47058823529400001 + 0.74117647058823533 Red Component - 0.77647058823500004 + 0.96078431372549022 Ansi 14 Color Alpha Component - 1 + 1 Blue Component - 0.76078431372499999 + 0.792156862745098 Color Space sRGB Green Component - 0.71372549019599996 + 0.83529411764705885 Red Component - 0.337254901961 + 0.54509803921568623 Ansi 15 Color Alpha Component - 1 + 1 Blue Component - 0.89411764705899999 + 0.79607843137254897 Color Space sRGB Green Component - 0.87450980392199995 + 0.67843137254901964 Red Component - 0.86274509803900001 + 0.6470588235294118 Ansi 2 Color Alpha Component - 1 + 1 Blue Component - 0.47450980392199998 + 0.58431372549019611 Color Space sRGB Green Component - 0.76470588235299997 + 0.85490196078431369 Red Component - 0.59607843137299998 + 0.65098039215686276 Ansi 3 Color Alpha Component - 1 + 1 Blue Component - 0.48235294117600003 + 0.62352941176470589 Color Space sRGB Green Component - 0.75294117647100001 + 0.83137254901960789 Red Component - 0.89803921568599998 + 0.93333333333333335 Ansi 4 Color Alpha Component - 1 + 1 Blue Component - 0.93725490196100003 + 0.95686274509803926 Color Space sRGB Green Component - 0.68627450980399995 + 0.67843137254901964 Red Component - 0.38039215686299999 + 0.54117647058823526 Ansi 5 Color Alpha Component - 1 + 1 Blue Component - 0.86666666666699999 + 0.90196078431372551 Color Space sRGB Green Component - 0.47058823529400001 + 0.74117647058823533 Red Component - 0.77647058823500004 + 0.96078431372549022 Ansi 6 Color Alpha Component - 1 + 1 Blue Component - 0.76078431372499999 + 0.792156862745098 Color Space sRGB Green Component - 0.71372549019599996 + 0.83529411764705885 Red Component - 0.337254901961 + 0.54509803921568623 Ansi 7 Color Alpha Component - 1 + 1 Blue Component - 0.89411764705899999 + 0.8784313725490196 Color Space sRGB Green Component - 0.87450980392199995 + 0.75294117647058822 Red Component - 0.86274509803900001 + 0.72156862745098038 Ansi 8 Color Alpha Component - 1 + 1 Blue Component - 0.56470588235294117 + 0.47058823529411764 Color Space sRGB Green Component - 0.47843137254901963 + 0.37647058823529411 Red Component - 0.43529411764705883 + 0.35686274509803922 Ansi 9 Color Alpha Component - 1 + 1 Blue Component - 0.458823529412 + 0.58823529411764708 Color Space sRGB Green Component - 0.42352941176499997 + 0.52941176470588236 Red Component - 0.87843137254899994 + 0.92941176470588238 BM Growl @@ -246,13 +905,13 @@ Alpha Component 1 Blue Component - 0.20392156862745098 + 0.22745098039215686 Color Space sRGB Green Component - 0.17254901960784313 + 0.15294117647058825 Red Component - 0.15686274509803921 + 0.14117647058823529 Background Image Location @@ -261,13 +920,13 @@ Alpha Component 0.5 Blue Component - 0 + 0.0 Color Space sRGB Green Component - 0 + 0.14910027384757996 Red Component - 1 + 1 Blinking Cursor @@ -278,15 +937,15 @@ Bold Color Alpha Component - 1 + 1 Blue Component - 0.74901962280273438 + 0.96078431372549022 Color Space sRGB Green Component - 0.69803923368453979 + 0.82745098039215681 Red Component - 0.67058825492858887 + 0.792156862745098 Bound Hosts @@ -303,41 +962,41 @@ Cursor Color Alpha Component - 1 + 1 Blue Component - 0.80000000000000004 + 0.83921568627450982 Color Space sRGB Green Component - 0.701960784314 + 0.85882352941176465 Red Component - 0.63921568627500003 + 0.95686274509803926 Cursor Guide Color Alpha Component - 0.25 + 0.070000000000000007 Blue Component - 0.25098039215700002 + 0.96078431372549022 Color Space sRGB Green Component - 0.211764705882 + 0.82745098039215681 Red Component - 0.19215686274499999 + 0.792156862745098 Cursor Text Color Alpha Component - 1 + 1 Blue Component - 0.89411764705899999 + 0.96078431372549022 Color Space sRGB Green Component - 0.87450980392199995 + 0.82745098039215681 Red Component - 0.86274509803900001 + 0.792156862745098 Cursor Type 1 @@ -356,15 +1015,15 @@ Foreground Color Alpha Component - 1 + 1 Blue Component - 0.89411764705899999 + 0.96078431372549022 Color Space sRGB Green Component - 0.87450980392199995 + 0.82745098039215681 Red Component - 0.86274509803900001 + 0.792156862745098 Guid 176CC3A0-7519-4F56-A9CA-A13581E4DE4E @@ -665,15 +1324,15 @@ Link Color Alpha Component - 1 + 1 Blue Component - 0.93725490196100003 + 0.8901960784313725 Color Space sRGB Green Component - 0.68627450980399995 + 0.84313725490196079 Red Component - 0.38039215686299999 + 0.56862745098039214 Mouse Reporting @@ -702,28 +1361,28 @@ Selected Text Color Alpha Component - 1 + 1 Blue Component - 0.89411764705899999 + 0.96078431372549022 Color Space sRGB Green Component - 0.87450980392199995 + 0.82745098039215681 Red Component - 0.86274509803900001 + 0.792156862745098 Selection Color Alpha Component - 1 + 1 Blue Component - 0.364705882353 + 0.47058823529411764 Color Space sRGB Green Component - 0.30588235294100002 + 0.37647058823529411 Red Component - 0.27843137254900002 + 0.35686274509803922 Send Code When Idle diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index d5bdca0..f129bf4 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,6 +1,7 @@ { "Comment.nvim": { "branch": "master", "commit": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20" }, "auto-session": { "branch": "main", "commit": "1d3dd70a2d48e0f3441128eb4fb0b437a0bf2cc4" }, + "catppuccin": { "branch": "main", "commit": "128af65c3a23c94b324dc8d7f02a34feee8722d4" }, "coc.nvim": { "branch": "release", "commit": "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043" }, "code_runner.nvim": { "branch": "main", "commit": "a010649236fe245eaab2641a13228cd601499715" }, "copilot.vim": { "branch": "release", "commit": "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b" }, @@ -11,10 +12,9 @@ "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, "nvim-scrollbar": { "branch": "main", "commit": "f85b29805cf917f9b1d5ff0c9a52c5b1bdca5943" }, - "nvim-toggleterm.lua": { "branch": "main", "commit": "2a787c426ef00cb3488c11b14f5dcf892bbd0bda" }, + "nvim-toggleterm.lua": { "branch": "main", "commit": "a5638b2206c3930a16a24e5c184dddd572f8cd34" }, "nvim-tree.lua": { "branch": "master", "commit": "e14989c0eaa6f9c299d48f7e45ce1ed04b21180f" }, "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, - "onehalf": { "branch": "master", "commit": "75eb2e97acd74660779fed8380989ee7891eec56" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 75c1780..1a57654 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -16,12 +16,11 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup({ -- Color scheme { - "sonph/onehalf", + "catppuccin/nvim", + name = "catppuccin", priority = 1000, config = function(plugin) - vim.opt.rtp:append(plugin.dir .. "/vim") - vim.opt.termguicolors = true - vim.cmd([[colorscheme onehalfdark]]) + vim.cmd.colorscheme "catppuccin-macchiato" end }, @@ -158,17 +157,17 @@ require("lazy").setup({ -- Persistent terminal that can be toggled with a keybinding { "akinsho/nvim-toggleterm.lua", - tag = "2.3.0", + tag = "2.4.0", keys = "", opts = { size = 20, hide_numbers = true, - direction = 'horizontal', + direction = 'float', open_mapping = [[]], - shade_terminals = true, - shading_factor = 2, + shade_terminals = false, + shading_factor = -16, shell = 'fish' - } + }, }, -- Run code with a keybinding @@ -221,19 +220,7 @@ require("lazy").setup({ -- VSCode-like scrollbar with Git and diagnostic markers { "petertriho/nvim-scrollbar", - opts = { - marks = { - Search = { color = "#ff9e64" }, - Error = { color = "#db4b4b" }, - Warn = { color = "#e0af68" }, - Info = { color = "#0db9d7" }, - Hint = { color = "#1abc9c" }, - Misc = { color = "#9d7cd8" }, - GitAdd = { color = "#9ece6a" }, - GitChange = { color = "#e0af68" }, - GitDelete = { color = "#914c54" }, - } - } + config = true, }, -- Smooth scrolling