From 263fca58397cab9301c9e2824a8d343fed9590d1 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 27 Apr 2023 01:12:31 +0300 Subject: [PATCH] Feat: Configuration updates --- .../astronvim/lua/user/plugins/community.lua | 13 +- config/astronvim/lua/user/plugins/user.lua | 11 - config/exports-shell | 1 + config/misc/iterm2-config.json | 428 ++++++++++++++++++ 4 files changed, 439 insertions(+), 14 deletions(-) create mode 100644 config/misc/iterm2-config.json diff --git a/config/astronvim/lua/user/plugins/community.lua b/config/astronvim/lua/user/plugins/community.lua index 2eea80a..16573f7 100644 --- a/config/astronvim/lua/user/plugins/community.lua +++ b/config/astronvim/lua/user/plugins/community.lua @@ -1,7 +1,12 @@ return { -- Add the community repository of plugin specifications "AstroNvim/astrocommunity", -- example of imporing a plugin, comment out to use it or add your own -- available plugins can be found at https://github.com/AstroNvim/astrocommunity - -- { import = "astrocommunity.colorscheme.catppuccin" }, + { + import = "astrocommunity.colorscheme.catppuccin", + opts = { + flavour = "mocha" + } + }, -- { import = "astrocommunity.completion.copilot-lua-cmp" }, { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" }, { @@ -12,14 +17,16 @@ return { -- Add the community repository of plugin specifications }, }, { import = "astrocommunity.code-runner.overseer-nvim" }, - { import = "astrocommunity.diagnostics.lsp_lines-nvim" }, - { import = "astrocommunity.diagnostics.trouble-nvim" }, + --- { import = "astrocommunity.diagnostics.lsp_lines-nvim" }, + --- { import = "astrocommunity.diagnostics.trouble-nvim" }, { import = "astrocommunity.editing-support.refactoring-nvim" }, { import = "astrocommunity.editing-support.neogen" }, { import = "astrocommunity.editing-support.nvim-regexplainer" }, { import = "astrocommunity.editing-support.todo-comments-nvim" }, { import = "astrocommunity.indent.mini-indentscope" }, { import = "astrocommunity.markdown-and-latex.glow-nvim" }, + { import = "astrocommunity.pack.php" }, + { import = "astrocommunity.pack.typescript" }, { import = "astrocommunity.project.neoconf-nvim" }, { import = "astrocommunity.test.neotest" }, { import = "astrocommunity.utility.neodim" }, diff --git a/config/astronvim/lua/user/plugins/user.lua b/config/astronvim/lua/user/plugins/user.lua index 65af286..15a6393 100644 --- a/config/astronvim/lua/user/plugins/user.lua +++ b/config/astronvim/lua/user/plugins/user.lua @@ -1,17 +1,6 @@ return { -- You can also add new plugins here as well: -- Add plugins, the lazy syntax - { - "catppuccin/nvim", - name = "catppuccin", - lazy = false, - enabled = true, - config = function() - require("catppuccin").setup({ - flavour = "mocha" - }) - end, - }, "andweeb/presence.nvim", { "ray-x/lsp_signature.nvim", diff --git a/config/exports-shell b/config/exports-shell index dfa9f9a..ce743af 100755 --- a/config/exports-shell +++ b/config/exports-shell @@ -1,5 +1,6 @@ #!/usr/bin/env bash # shellcheck shell=bash +# shellcheck disable=1091,2046 # vim: filetype=zsh source "$DOTFILES/scripts/shared.sh" diff --git a/config/misc/iterm2-config.json b/config/misc/iterm2-config.json new file mode 100644 index 0000000..05642d2 --- /dev/null +++ b/config/misc/iterm2-config.json @@ -0,0 +1,428 @@ +{ + "Ansi 7 Color" : { + "Green Component" : 0.73333334922790527, + "Red Component" : 0.73333334922790527, + "Blue Component" : 0.73333334922790527 + }, + "Tags" : [ + + ], + "Ansi 12 Color" : { + "Green Component" : 0.3333333432674408, + "Red Component" : 0.3333333432674408, + "Blue Component" : 1 + }, + "Ansi 8 Color" : { + "Green Component" : 0.3333333432674408, + "Red Component" : 0.3333333432674408, + "Blue Component" : 0.3333333432674408 + }, + "Reduce Flicker" : true, + "Bold Color" : { + "Green Component" : 1, + "Red Component" : 1, + "Blue Component" : 1 + }, + "Draw Powerline Glyphs" : true, + "Ansi 9 Color" : { + "Green Component" : 0.3333333432674408, + "Red Component" : 1, + "Blue Component" : 0.3333333432674408 + }, + "Right Option Key Sends" : 0, + "Rows" : 25, + "Default Bookmark" : "No", + "Ansi 6 Color" : { + "Green Component" : 0.73333334922790527, + "Red Component" : 0, + "Blue Component" : 0.73333334922790527 + }, + "Non-ASCII Anti Aliased" : true, + "Use Bright Bold" : true, + "Ansi 10 Color" : { + "Green Component" : 1, + "Red Component" : 0.3333333432674408, + "Blue Component" : 0.3333333432674408 + }, + "Ambiguous Double Width" : false, + "Jobs to Ignore" : [ + "rlogin", + "ssh", + "slogin", + "telnet" + ], + "Show Status Bar" : true, + "Ansi 15 Color" : { + "Green Component" : 1, + "Red Component" : 1, + "Blue Component" : 1 + }, + "Foreground Color" : { + "Green Component" : 0.73333334922790527, + "Red Component" : 0.73333334922790527, + "Blue Component" : 0.73333334922790527 + }, + "Working Directory" : "\/Users\/ivuorinen", + "Blinking Cursor" : false, + "Disable Window Resizing" : true, + "Sync Title" : false, + "Prompt Before Closing 2" : false, + "BM Growl" : true, + "Command" : "", + "Description" : "Default", + "Mouse Reporting" : true, + "Screen" : -1, + "Selection Color" : { + "Green Component" : 0.8353000283241272, + "Red Component" : 0.70980000495910645, + "Blue Component" : 1 + }, + "Only The Default BG Color Uses Transparency" : true, + "Columns" : 130, + "Idle Code" : 0, + "Ansi 13 Color" : { + "Green Component" : 0.3333333432674408, + "Red Component" : 1, + "Blue Component" : 1 + }, + "Custom Command" : "No", + "ASCII Anti Aliased" : true, + "Non Ascii Font" : "Monaco 12", + "Vertical Spacing" : 1, + "Use Bold Font" : true, + "Option Key Sends" : 0, + "Selected Text Color" : { + "Green Component" : 0, + "Red Component" : 0, + "Blue Component" : 0 + }, + "Background Color" : { + "Red Component" : 0.11764705882352941, + "Color Space" : "sRGB", + "Blue Component" : 0.17647058823529413, + "Alpha Component" : 1, + "Green Component" : 0.11764705882352941 + }, + "Character Encoding" : 4, + "Ansi 11 Color" : { + "Green Component" : 1, + "Red Component" : 1, + "Blue Component" : 0.3333333432674408 + }, + "Use Italic Font" : true, + "Unlimited Scrollback" : true, + "Keyboard Map" : { + "0xf700-0x260000" : { + "Text" : "[1;6A", + "Action" : 10 + }, + "0x37-0x40000" : { + "Text" : "0x1f", + "Action" : 11 + }, + "0x32-0x40000" : { + "Text" : "0x00", + "Action" : 11 + }, + "0xf709-0x20000" : { + "Text" : "[17;2~", + "Action" : 10 + }, + "0xf70c-0x20000" : { + "Text" : "[20;2~", + "Action" : 10 + }, + "0xf729-0x20000" : { + "Text" : "[1;2H", + "Action" : 10 + }, + "0xf72b-0x40000" : { + "Text" : "[1;5F", + "Action" : 10 + }, + "0xf705-0x20000" : { + "Text" : "[1;2Q", + "Action" : 10 + }, + "0xf703-0x260000" : { + "Text" : "[1;6C", + "Action" : 10 + }, + "0xf700-0x220000" : { + "Text" : "[1;2A", + "Action" : 10 + }, + "0xf701-0x280000" : { + "Text" : "0x1b 0x1b 0x5b 0x42", + "Action" : 11 + }, + "0x38-0x40000" : { + "Text" : "0x7f", + "Action" : 11 + }, + "0x33-0x40000" : { + "Text" : "0x1b", + "Action" : 11 + }, + "0xf703-0x220000" : { + "Text" : "[1;2C", + "Action" : 10 + }, + "0xf701-0x240000" : { + "Text" : "[1;5B", + "Action" : 10 + }, + "0xf70d-0x20000" : { + "Text" : "[21;2~", + "Action" : 10 + }, + "0xf702-0x260000" : { + "Text" : "[1;6D", + "Action" : 10 + }, + "0xf729-0x40000" : { + "Text" : "[1;5H", + "Action" : 10 + }, + "0xf706-0x20000" : { + "Text" : "[1;2R", + "Action" : 10 + }, + "0x34-0x40000" : { + "Text" : "0x1c", + "Action" : 11 + }, + "0xf700-0x280000" : { + "Text" : "0x1b 0x1b 0x5b 0x41", + "Action" : 11 + }, + "0x2d-0x40000" : { + "Text" : "0x1f", + "Action" : 11 + }, + "0xf70e-0x20000" : { + "Text" : "[23;2~", + "Action" : 10 + }, + "0xf702-0x220000" : { + "Text" : "[1;2D", + "Action" : 10 + }, + "0xf703-0x280000" : { + "Text" : "0x1b 0x1b 0x5b 0x43", + "Action" : 11 + }, + "0xf700-0x240000" : { + "Text" : "[1;5A", + "Action" : 10 + }, + "0xf707-0x20000" : { + "Text" : "[1;2S", + "Action" : 10 + }, + "0xf70a-0x20000" : { + "Text" : "[18;2~", + "Action" : 10 + }, + "0x35-0x40000" : { + "Text" : "0x1d", + "Action" : 11 + }, + "0xf70f-0x20000" : { + "Text" : "[24;2~", + "Action" : 10 + }, + "0xf703-0x240000" : { + "Text" : "[1;5C", + "Action" : 10 + }, + "0xf701-0x260000" : { + "Text" : "[1;6B", + "Action" : 10 + }, + "0xf702-0x280000" : { + "Text" : "0x1b 0x1b 0x5b 0x44", + "Action" : 11 + }, + "0xf72b-0x20000" : { + "Text" : "[1;2F", + "Action" : 10 + }, + "0x36-0x40000" : { + "Text" : "0x1e", + "Action" : 11 + }, + "0xf708-0x20000" : { + "Text" : "[15;2~", + "Action" : 10 + }, + "0xf701-0x220000" : { + "Text" : "[1;2B", + "Action" : 10 + }, + "0xf70b-0x20000" : { + "Text" : "[19;2~", + "Action" : 10 + }, + "0xf702-0x240000" : { + "Text" : "[1;5D", + "Action" : 10 + }, + "0xf704-0x20000" : { + "Text" : "[1;2P", + "Action" : 10 + } + }, + "Window Type" : 0, + "Blur Radius" : 10, + "Background Image Location" : "", + "Blur" : true, + "Scrollback Lines" : 0, + "Send Code When Idle" : false, + "Close Sessions On End" : true, + "Terminal Type" : "xterm-256color", + "Visual Bell" : true, + "Flashing Bell" : true, + "Status Bar Layout" : { + "components" : [ + { + "class" : "iTermStatusBarClockComponent", + "configuration" : { + "knobs" : { + "maxwidth" : 150, + "localize" : 0, + "base: priority" : 5, + "minwidth" : 150, + "base: compression resistance" : 1, + "format" : "YYYY-MM-dd HH:mm" + }, + "layout advanced configuration dictionary value" : { + "algorithm" : 0, + "remove empty components" : false, + "auto-rainbow style" : 0 + } + } + }, + { + "class" : "iTermStatusBarHostnameComponent", + "configuration" : { + "knobs" : { + "abbreviate-localhost" : "", + "maxwidth" : 1.7976931348623157e+308, + "base: priority" : 5, + "minwidth" : "0", + "base: compression resistance" : 1, + "shared text color" : { + "Red Component" : 0, + "Color Space" : "sRGB", + "Blue Component" : 0.43218994140625, + "Alpha Component" : 1, + "Green Component" : 0.34513998031616211 + } + }, + "layout advanced configuration dictionary value" : { + "remove empty components" : true, + "font" : ".AppleSystemUIFont 12", + "algorithm" : 0, + "auto-rainbow style" : 0 + } + } + }, + { + "class" : "iTermStatusBarSpringComponent", + "configuration" : { + "knobs" : { + "base: priority" : 5, + "iTermStatusBarSpringComponentSpringConstantKey" : 0.01, + "base: compression resistance" : 1, + "iTermStatusBarSpringComponentSizeMultipleKey" : 1 + }, + "layout advanced configuration dictionary value" : { + "remove empty components" : true, + "font" : ".AppleSystemUIFont 12", + "algorithm" : 0, + "auto-rainbow style" : 0 + } + } + }, + { + "class" : "iTermStatusBarSpringComponent", + "configuration" : { + "knobs" : { + "base: priority" : 5, + "iTermStatusBarSpringComponentSpringConstantKey" : 0.01, + "base: compression resistance" : 1, + "iTermStatusBarSpringComponentSizeMultipleKey" : 1 + }, + "layout advanced configuration dictionary value" : { + "algorithm" : 0, + "remove empty components" : false, + "auto-rainbow style" : 0 + } + } + } + ], + "advanced configuration" : { + "remove empty components" : true, + "font" : ".AppleSystemUIFont 12", + "algorithm" : 0, + "auto-rainbow style" : 0 + } + }, + "Show Timestamps" : 2, + "Silence Bell" : false, + "Ansi 14 Color" : { + "Green Component" : 1, + "Red Component" : 0.3333333432674408, + "Blue Component" : 1 + }, + "ASCII Ligatures" : false, + "Name" : "Default", + "Cursor Text Color" : { + "Green Component" : 1, + "Red Component" : 1, + "Blue Component" : 1 + }, + "Shortcut" : "", + "Cursor Color" : { + "Green Component" : 0.73333334922790527, + "Red Component" : 0.73333334922790527, + "Blue Component" : 0.73333334922790527 + }, + "Transparency" : 0.11999999999999998, + "Guid" : "B563F48B-314D-48CC-908E-ACA971D430BE", + "Ansi 2 Color" : { + "Green Component" : 0.73333334922790527, + "Red Component" : 0, + "Blue Component" : 0 + }, + "Ansi 3 Color" : { + "Green Component" : 0.73333334922790527, + "Red Component" : 0.73333334922790527, + "Blue Component" : 0 + }, + "Custom Directory" : "No", + "Ansi 5 Color" : { + "Green Component" : 0, + "Red Component" : 0.73333334922790527, + "Blue Component" : 0.73333334922790527 + }, + "Use Non-ASCII Font" : false, + "Ansi 0 Color" : { + "Green Component" : 0, + "Red Component" : 0, + "Blue Component" : 0 + }, + "Normal Font" : "JetBrainsMonoNerdFontCompleteM-Regular 15", + "Ansi 1 Color" : { + "Green Component" : 0, + "Red Component" : 0.73333334922790527, + "Blue Component" : 0 + }, + "Horizontal Spacing" : 1, + "Ansi 4 Color" : { + "Green Component" : 0, + "Red Component" : 0, + "Blue Component" : 0.73333334922790527 + } +} \ No newline at end of file