diff --git a/.gitignore b/.gitignore index 1c08d1e..9783b0d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,8 @@ zsh/zsh.symlink/zsh-completions zsh/zsh.symlink/zsh-syntax-highlighting zsh/zsh.symlink/secret +python/venv + __pycache__ *.pyc diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink index a07384e..d91e5ba 100644 --- a/git/gitconfig.symlink +++ b/git/gitconfig.symlink @@ -1,6 +1,6 @@ [core] excludesfile = ~/.gitignore - editor = nvim + editor = vim pager = delta autocrlf = input fileMode = false diff --git a/iterm/MB Dark.itermcolors b/iterm/MB Dark.itermcolors deleted file mode 100644 index 681e301..0000000 --- a/iterm/MB Dark.itermcolors +++ /dev/null @@ -1,344 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.40784314274787903 - Color Space - sRGB - Green Component - 0.364705890417099 - Red Component - 0.32941177487373352 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.40392157435417175 - Color Space - sRGB - Green Component - 0.43921568989753723 - Red Component - 0.95686274766921997 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.42745098471641541 - Color Space - sRGB - Green Component - 0.76862746477127075 - Red Component - 0.41960784792900085 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.24705882370471954 - Color Space - sRGB - Green Component - 0.66666668653488159 - Red Component - 0.85490196943283081 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 1 - Color Space - sRGB - Green Component - 0.7137255072593689 - Red Component - 0.42352941632270813 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.9843137264251709 - Color Space - sRGB - Green Component - 0.74117648601531982 - Red Component - 0.86274510622024536 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.86666667461395264 - Color Space - sRGB - Green Component - 0.83137255907058716 - Red Component - 0.33725491166114807 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.89803922176361084 - Color Space - sRGB - Green Component - 0.85098040103912354 - Red Component - 0.80392158031463623 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.16078431904315948 - Color Space - sRGB - Green Component - 0.38823530077934265 - Red Component - 0.066666670143604279 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.14901961386203766 - Color Space - sRGB - Green Component - 0.56470590829849243 - Red Component - 0.7764706015586853 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.96078431606292725 - Color Space - sRGB - Green Component - 0.60784316062927246 - Red Component - 0.32549020648002625 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.94117647409439087 - Color Space - sRGB - Green Component - 0.51372551918029785 - Red Component - 0.69019609689712524 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.81176471710205078 - Color Space - sRGB - Green Component - 0.77254903316497803 - Red Component - 0.22352941334247589 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.67058825492858887 - Color Space - sRGB - Green Component - 0.61568629741668701 - Red Component - 0.56470590829849243 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.48235294222831726 - Color Space - sRGB - Green Component - 0.43137255311012268 - Red Component - 0.38823530077934265 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.54117649793624878 - Color Space - sRGB - Green Component - 0.57647061347961426 - Red Component - 1 - - Background Color - - Alpha Component - 1 - Blue Component - 0.18039216101169586 - Color Space - sRGB - Green Component - 0.15294118225574493 - Red Component - 0.13333334028720856 - - Badge Color - - Alpha Component - 0.5 - Blue Component - 0.99215686321258545 - Color Space - sRGB - Green Component - 0.54509806632995605 - Red Component - 0.21960784494876862 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.41532039642333984 - Red Component - 0.8347281813621521 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.49803921580314636 - Color Space - sRGB - Green Component - 0.49803921580314636 - Red Component - 0.50196081399917603 - - Cursor Guide Color - - Alpha Component - 0.25 - Blue Component - 1 - Color Space - sRGB - Green Component - 0.9268307089805603 - Red Component - 0.70213186740875244 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.96568018198013306 - Color Space - sRGB - Green Component - 0.96568018198013306 - Red Component - 0.96568030118942261 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.78039216995239258 - Color Space - sRGB - Green Component - 0.729411780834198 - Red Component - 0.67843139171600342 - - Link Color - - Alpha Component - 1 - Blue Component - 1 - Color Space - sRGB - Green Component - 0.65098041296005249 - Red Component - 0.34509804844856262 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.39962771534919739 - Color Space - sRGB - Green Component - 0.39962771534919739 - Red Component - 0.39962771534919739 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.90910130739212036 - Color Space - sRGB - Green Component - 0.80342596769332886 - Red Component - 0.71790117025375366 - - - diff --git a/iterm/MB Light.itermcolors b/iterm/MB Light.itermcolors deleted file mode 100644 index 3e44b00..0000000 --- a/iterm/MB Light.itermcolors +++ /dev/null @@ -1,344 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.12156862765550613 - Color Space - sRGB - Green Component - 0.12156862765550613 - Red Component - 0.12156862765550613 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.18039216101169586 - Color Space - sRGB - Green Component - 0.13333334028720856 - Red Component - 0.81176471710205078 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.21568627655506134 - Color Space - sRGB - Green Component - 0.49803921580314636 - Red Component - 0.10196078568696976 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.0039215688593685627 - Color Space - sRGB - Green Component - 0.23529411852359772 - Red Component - 0.38823530077934265 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 1 - Color Space - sRGB - Green Component - 0.54509806632995605 - Red Component - 0.12941177189350128 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.97647058963775635 - Color Space - sRGB - Green Component - 0.45882353186607361 - Red Component - 0.64313727617263794 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.66666668653488159 - Color Space - sRGB - Green Component - 0.57254904508590698 - Red Component - 0.19215686619281769 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.62352943420410156 - Color Space - sRGB - Green Component - 0.58431375026702881 - Red Component - 0.54901963472366333 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.16078431904315948 - Color Space - sRGB - Green Component - 0.38823530077934265 - Red Component - 0.066666670143604279 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.17647059261798859 - Red Component - 0.30196079611778259 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.85490196943283081 - Color Space - sRGB - Green Component - 0.4117647111415863 - Red Component - 0.035294119268655777 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.87450981140136719 - Color Space - sRGB - Green Component - 0.31372550129890442 - Red Component - 0.50980395078659058 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.51372551918029785 - Color Space - sRGB - Green Component - 0.48627451062202454 - Red Component - 0.10588235408067703 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.5058823823928833 - Color Space - sRGB - Green Component - 0.46666666865348816 - Red Component - 0.43137255311012268 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.41568627953529358 - Color Space - sRGB - Green Component - 0.37647059559822083 - Red Component - 0.34117648005485535 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.14901961386203766 - Color Space - sRGB - Green Component - 0.054901961237192154 - Red Component - 0.64313727617263794 - - Background Color - - Alpha Component - 1 - Blue Component - 1 - Color Space - sRGB - Green Component - 1 - Red Component - 1 - - Badge Color - - Alpha Component - 0.5 - Blue Component - 0.99215686321258545 - Color Space - sRGB - Green Component - 0.54509806632995605 - Red Component - 0.21960784494876862 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.41532039642333984 - Red Component - 0.8347281813621521 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.49803921580314636 - Color Space - sRGB - Green Component - 0.49803921580314636 - Red Component - 0.50196081399917603 - - Cursor Guide Color - - Alpha Component - 0.25 - Blue Component - 1 - Color Space - sRGB - Green Component - 0.9268307089805603 - Red Component - 0.70213186740875244 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.96568018198013306 - Color Space - sRGB - Green Component - 0.96568018198013306 - Red Component - 0.96568030118942261 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.18431372940540314 - Color Space - sRGB - Green Component - 0.16078431904315948 - Red Component - 0.14117647707462311 - - Link Color - - Alpha Component - 1 - Blue Component - 1 - Color Space - sRGB - Green Component - 0.65098041296005249 - Red Component - 0.34509804844856262 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.39962771534919739 - Color Space - sRGB - Green Component - 0.39962771534919739 - Red Component - 0.39962771534919739 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.90910130739212036 - Color Space - sRGB - Green Component - 0.80342596769332886 - Red Component - 0.71790117025375366 - - - diff --git a/iterm/colors.png b/iterm/colors.png new file mode 100644 index 0000000..e253244 Binary files /dev/null and b/iterm/colors.png differ diff --git a/iterm/colors.pxd b/iterm/colors.pxd new file mode 100644 index 0000000..add3089 Binary files /dev/null and b/iterm/colors.pxd differ diff --git a/iterm/mpwb.json b/iterm/mpwb.json new file mode 100644 index 0000000..f8bf7a5 --- /dev/null +++ b/iterm/mpwb.json @@ -0,0 +1,816 @@ +{ + "Close Sessions On End" : true, + "Ansi 15 Color (Dark)" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.9137254901960784, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + }, + "Ansi 0 Color" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Cursor Text Color" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.90980392156862744, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + }, + "Smart Cursor Color" : false, + "Prompt Before Closing 2" : false, + "Ansi 3 Color (Dark)" : { + "Red Component" : 0.87058823529411766, + "Color Space" : "P3", + "Blue Component" : 0.47058823529411764, + "Alpha Component" : 1, + "Green Component" : 0.70196078431372544 + }, + "Ansi 12 Color (Dark)" : { + "Red Component" : 0.18823529411764706, + "Color Space" : "P3", + "Blue Component" : 0.66274509803921566, + "Alpha Component" : 1, + "Green Component" : 0.34509803921568627 + }, + "Mouse Reporting" : true, + "Use Underline Color (Light)" : false, + "Disable Window Resizing" : true, + "BM Growl" : true, + "Background Color (Dark)" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Guid" : "A499F3A2-89B0-4267-A380-E390A6337CFA", + "Cursor Color (Dark)" : { + "Red Component" : 0.84705882352941175, + "Color Space" : "P3", + "Blue Component" : 0.85882352941176465, + "Alpha Component" : 1, + "Green Component" : 0.42745098039215684 + }, + "Selection Color (Dark)" : { + "Red Component" : 0.84705882352941175, + "Color Space" : "P3", + "Blue Component" : 0.85882352941176465, + "Alpha Component" : 1, + "Green Component" : 0.42745098039215684 + }, + "Scrollback Lines" : 0, + "Badge Color (Dark)" : { + "Red Component" : 0.21960784494876862, + "Color Space" : "sRGB", + "Blue Component" : 0.99215686321258545, + "Alpha Component" : 0.5, + "Green Component" : 0.54509806632995605 + }, + "Faint Text Alpha" : 0.5, + "Ansi 0 Color (Dark)" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.9137254901960784, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + }, + "Transparency" : 0, + "Use Bright Bold" : false, + "Horizontal Spacing" : 1, + "Ansi 13 Color (Light)" : { + "Red Component" : 0.84705882352941175, + "Color Space" : "P3", + "Blue Component" : 0.85882352941176465, + "Alpha Component" : 1, + "Green Component" : 0.42745098039215684 + }, + "Blur" : false, + "Ansi 13 Color" : { + "Red Component" : 0.84705882352941175, + "Color Space" : "P3", + "Blue Component" : 0.85882352941176465, + "Alpha Component" : 1, + "Green Component" : 0.42745098039215684 + }, + "Ansi 2 Color (Dark)" : { + "Red Component" : 0.54509803921568623, + "Color Space" : "P3", + "Blue Component" : 0.49803921568627452, + "Alpha Component" : 1, + "Green Component" : 0.87450980392156863 + }, + "Cursor Color" : { + "Red Component" : 0.62352941176470589, + "Color Space" : "P3", + "Blue Component" : 0.63529411764705879, + "Alpha Component" : 1, + "Green Component" : 0.17254901960784313 + }, + "Unicode Version" : 8, + "Use Cursor Guide (Light)" : false, + "Option Key Sends" : 0, + "Idle Code" : 0, + "Ansi 13 Color (Dark)" : { + "Red Component" : 0.60392156862745094, + "Color Space" : "P3", + "Blue Component" : 0.61568627450980395, + "Alpha Component" : 1, + "Green Component" : 0.16862745098039217 + }, + "Send Code When Idle" : false, + "Selection Color" : { + "Green Component" : 0.75686275959014893, + "Red Component" : 0.66274511814117432, + "Blue Component" : 0.88627451658248901 + }, + "Terminal Type" : "xterm-256color", + "Cursor Boost (Dark)" : 0, + "Right Option Key Sends" : 0, + "Background Color" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.90980392156862744, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + }, + "Show Mark Indicators" : false, + "Ansi 10 Color (Dark)" : { + "Red Component" : 0.31764705882352939, + "Color Space" : "P3", + "Blue Component" : 0.25882352941176473, + "Alpha Component" : 1, + "Green Component" : 0.65490196078431373 + }, + "Ansi 10 Color" : { + "Red Component" : 0.54509803921568623, + "Color Space" : "P3", + "Blue Component" : 0.49803921568627452, + "Alpha Component" : 1, + "Green Component" : 0.87450980392156863 + }, + "Vertical Spacing" : 1, + "Use Tab Color (Light)" : false, + "Columns" : 80, + "Ansi 2 Color (Light)" : { + "Red Component" : 0.31764705882352939, + "Color Space" : "P3", + "Blue Component" : 0.25882352941176473, + "Alpha Component" : 1, + "Green Component" : 0.65490196078431373 + }, + "Screen" : -1, + "Cursor Text Color (Dark)" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Description" : "Default", + "Unlimited Scrollback" : true, + "Use Italic Font" : true, + "Working Directory" : "\/Volumes\/Code", + "Selected Text Color (Dark)" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Use Cursor Guide (Dark)" : false, + "AWDS Window Option" : "Yes", + "Visual Bell" : true, + "Link Color (Light)" : { + "Red Component" : 0.14513972401618958, + "Color Space" : "P3", + "Blue Component" : 0.7093239426612854, + "Alpha Component" : 1, + "Green Component" : 0.35333043336868286 + }, + "Ansi 1 Color (Dark)" : { + "Red Component" : 0.89411764705882357, + "Color Space" : "P3", + "Blue Component" : 0.37254901960784315, + "Alpha Component" : 1, + "Green Component" : 0.37647058823529411 + }, + "Default Bookmark" : "No", + "Ansi 14 Color (Light)" : { + "Red Component" : 0.5607843137254902, + "Color Space" : "P3", + "Blue Component" : 0.86274509803921573, + "Alpha Component" : 1, + "Green Component" : 0.84313725490196079 + }, + "Ansi 7 Color (Light)" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.90980392156862744, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + }, + "Ansi 3 Color (Light)" : { + "Red Component" : 0.6470588235294118, + "Color Space" : "P3", + "Blue Component" : 0.20784313725490197, + "Alpha Component" : 1, + "Green Component" : 0.49019607843137253 + }, + "Ansi 9 Color (Dark)" : { + "Red Component" : 0.62352941176470589, + "Color Space" : "P3", + "Blue Component" : 0.16078431372549021, + "Alpha Component" : 1, + "Green Component" : 0.17254901960784313 + }, + "Badge Color (Light)" : { + "Red Component" : 0.92929404973983765, + "Color Space" : "P3", + "Blue Component" : 0.13960540294647217, + "Alpha Component" : 0.5, + "Green Component" : 0.25479039549827576 + }, + "Ansi 14 Color (Dark)" : { + "Red Component" : 0.29803921568627451, + "Color Space" : "P3", + "Blue Component" : 0.63529411764705879, + "Alpha Component" : 1, + "Green Component" : 0.61568627450980395 + }, + "Tags" : [ + + ], + "Link Color (Dark)" : { + "Red Component" : 0.34509804844856262, + "Color Space" : "sRGB", + "Blue Component" : 1, + "Alpha Component" : 1, + "Green Component" : 0.65098041296005249 + }, + "Custom Command" : "No", + "Jobs to Ignore" : [ + "rlogin", + "ssh", + "slogin", + "telnet" + ], + "Use Non-ASCII Font" : false, + "Custom Directory" : "Advanced", + "Use Selected Text Color (Light)" : true, + "Bold Color (Light)" : { + "Green Component" : 0.3333333432674408, + "Red Component" : 0.78823530673980713, + "Blue Component" : 0 + }, + "Brighten Bold Text (Dark)" : false, + "Ansi 8 Color (Light)" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Name" : "Default", + "Ansi 11 Color (Dark)" : { + "Red Component" : 0.65098039215686276, + "Color Space" : "P3", + "Blue Component" : 0.20784313725490197, + "Alpha Component" : 1, + "Green Component" : 0.49019607843137253 + }, + "AWDS Pane Directory" : "", + "Ansi 14 Color" : { + "Red Component" : 0.5607843137254902, + "Color Space" : "P3", + "Blue Component" : 0.86274509803921573, + "Alpha Component" : 1, + "Green Component" : 0.84313725490196079 + }, + "Faint Text Alpha (Dark)" : 0.5, + "Rows" : 25, + "Background Color (Light)" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.90980392156862744, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + }, + "Cursor Guide Color (Light)" : { + "Red Component" : 0.74862593412399292, + "Color Space" : "P3", + "Blue Component" : 0.99125725030899048, + "Alpha Component" : 0.25, + "Green Component" : 0.92047786712646484 + }, + "Use Selected Text Color" : true, + "Ansi 6 Color (Dark)" : { + "Red Component" : 0.5607843137254902, + "Color Space" : "P3", + "Blue Component" : 0.86274509803921573, + "Alpha Component" : 1, + "Green Component" : 0.84313725490196079 + }, + "Use Tab Color" : false, + "Use Bright Bold (Light)" : false, + "Cursor Color (Light)" : { + "Red Component" : 0.62352941176470589, + "Color Space" : "P3", + "Blue Component" : 0.63529411764705879, + "Alpha Component" : 1, + "Green Component" : 0.17254901960784313 + }, + "Ansi 15 Color (Light)" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.9137254901960784, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + }, + "AWDS Tab Directory" : "", + "Sync Title" : false, + "AWDS Window Directory" : "\/Volumes\/Code", + "Ansi 11 Color" : { + "Red Component" : 0.87058823529411766, + "Color Space" : "P3", + "Blue Component" : 0.47058823529411764, + "Alpha Component" : 1, + "Green Component" : 0.70196078431372544 + }, + "Ansi 8 Color (Dark)" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Ansi 10 Color (Light)" : { + "Red Component" : 0.54509803921568623, + "Color Space" : "P3", + "Blue Component" : 0.49803921568627452, + "Alpha Component" : 1, + "Green Component" : 0.87450980392156863 + }, + "Normal Font" : "InputMono-Regular 12", + "Use Selected Text Color (Dark)" : true, + "Foreground Color" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Match Background Color (Light)" : { + "Red Component" : 1, + "Color Space" : "P3", + "Blue Component" : 0, + "Alpha Component" : 1, + "Green Component" : 1 + }, + "Command" : "", + "Minimum Contrast (Light)" : 0, + "Send Bell Alert" : true, + "Character Encoding" : 4, + "Minimum Contrast" : 0, + "Cursor Boost (Light)" : 0, + "Cursor Text Color (Light)" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.90980392156862744, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + }, + "Cursor Boost" : 0, + "Use Underline Color" : false, + "Ansi 5 Color (Dark)" : { + "Red Component" : 0.84705882352941175, + "Color Space" : "P3", + "Blue Component" : 0.85882352941176465, + "Alpha Component" : 1, + "Green Component" : 0.42745098039215684 + }, + "Window Type" : 0, + "Background Image Location" : "", + "Brighten Bold Text" : false, + "ASCII Anti Aliased" : true, + "Use Tab Color (Dark)" : false, + "Cursor Guide Color (Dark)" : { + "Red Component" : 0.70213186740875244, + "Color Space" : "sRGB", + "Blue Component" : 1, + "Alpha Component" : 0.25, + "Green Component" : 0.9268307089805603 + }, + "Flashing Bell" : false, + "Brighten Bold Text (Light)" : false, + "Non Ascii Font" : "Monaco 12", + "Ansi 7 Color (Dark)" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Badge Color" : { + "Red Component" : 0.92929404973983765, + "Color Space" : "P3", + "Blue Component" : 0.13960540294647217, + "Alpha Component" : 0.5, + "Green Component" : 0.25479039549827576 + }, + "Smart Cursor Color (Dark)" : false, + "Shortcut" : "", + "Match Background Color (Dark)" : { + "Red Component" : 1, + "Color Space" : "P3", + "Blue Component" : 0, + "Alpha Component" : 1, + "Green Component" : 1 + }, + "Ansi 15 Color" : { + "Red Component" : 0.94509803921568625, + "Color Space" : "P3", + "Blue Component" : 0.95294117647058818, + "Alpha Component" : 1, + "Green Component" : 0.93333333333333335 + }, + "Ansi 11 Color (Light)" : { + "Red Component" : 0.87058823529411766, + "Color Space" : "P3", + "Blue Component" : 0.47058823529411764, + "Alpha Component" : 1, + "Green Component" : 0.70196078431372544 + }, + "Ansi 9 Color" : { + "Red Component" : 0.89411764705882357, + "Color Space" : "P3", + "Blue Component" : 0.37254901960784315, + "Alpha Component" : 1, + "Green Component" : 0.37254901960784315 + }, + "Use Bold Font" : true, + "Ansi 4 Color (Light)" : { + "Red Component" : 0.18823529411764706, + "Color Space" : "P3", + "Blue Component" : 0.66274509803921566, + "Alpha Component" : 1, + "Green Component" : 0.34509803921568627 + }, + "Ansi 8 Color" : { + "Red Component" : 0.1803921568627451, + "Color Space" : "P3", + "Blue Component" : 0.19215686274509805, + "Alpha Component" : 1, + "Green Component" : 0.16862745098039217 + }, + "Ansi 0 Color (Light)" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Use Bright Bold (Dark)" : false, + "Bold Color" : { + "Green Component" : 0.3333333432674408, + "Red Component" : 0.78823530673980713, + "Blue Component" : 0 + }, + "Selected Text Color (Light)" : { + "Red Component" : 0.89411764705882357, + "Color Space" : "P3", + "Blue Component" : 0.90196078431372551, + "Alpha Component" : 1, + "Green Component" : 0.88235294117647056 + }, + "Minimum Contrast (Dark)" : 0, + "Smart Cursor Color (Light)" : false, + "Ansi 7 Color" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.90980392156862744, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + }, + "Keyboard Map" : { + "0xf700-0x260000" : { + "Action" : 10, + "Text" : "[1;6A" + }, + "0x37-0x40000" : { + "Action" : 11, + "Text" : "0x1f" + }, + "0x32-0x40000" : { + "Action" : 11, + "Text" : "0x00" + }, + "0xf709-0x20000" : { + "Action" : 10, + "Text" : "[17;2~" + }, + "0xf70c-0x20000" : { + "Action" : 10, + "Text" : "[20;2~" + }, + "0xf729-0x20000" : { + "Action" : 10, + "Text" : "[1;2H" + }, + "0xf72b-0x40000" : { + "Action" : 10, + "Text" : "[1;5F" + }, + "0xf705-0x20000" : { + "Action" : 10, + "Text" : "[1;2Q" + }, + "0xf703-0x260000" : { + "Action" : 10, + "Text" : "[1;6C" + }, + "0xf700-0x220000" : { + "Action" : 10, + "Text" : "[1;2A" + }, + "0xf701-0x280000" : { + "Action" : 11, + "Text" : "0x1b 0x1b 0x5b 0x42" + }, + "0x38-0x40000" : { + "Action" : 11, + "Text" : "0x7f" + }, + "0x33-0x40000" : { + "Action" : 11, + "Text" : "0x1b" + }, + "0xf703-0x220000" : { + "Action" : 10, + "Text" : "[1;2C" + }, + "0xf701-0x240000" : { + "Action" : 10, + "Text" : "[1;5B" + }, + "0xf70d-0x20000" : { + "Action" : 10, + "Text" : "[21;2~" + }, + "0xf702-0x260000" : { + "Action" : 10, + "Text" : "[1;6D" + }, + "0xf729-0x40000" : { + "Action" : 10, + "Text" : "[1;5H" + }, + "0xf706-0x20000" : { + "Action" : 10, + "Text" : "[1;2R" + }, + "0x34-0x40000" : { + "Action" : 11, + "Text" : "0x1c" + }, + "0xf700-0x280000" : { + "Action" : 11, + "Text" : "0x1b 0x1b 0x5b 0x41" + }, + "0x2d-0x40000" : { + "Action" : 11, + "Text" : "0x1f" + }, + "0xf70e-0x20000" : { + "Action" : 10, + "Text" : "[23;2~" + }, + "0xf702-0x220000" : { + "Action" : 10, + "Text" : "[1;2D" + }, + "0xf703-0x280000" : { + "Action" : 11, + "Text" : "0x1b 0x1b 0x5b 0x43" + }, + "0xf700-0x240000" : { + "Action" : 10, + "Text" : "[1;5A" + }, + "0xf707-0x20000" : { + "Action" : 10, + "Text" : "[1;2S" + }, + "0xf70a-0x20000" : { + "Action" : 10, + "Text" : "[18;2~" + }, + "0x35-0x40000" : { + "Action" : 11, + "Text" : "0x1d" + }, + "0xf70f-0x20000" : { + "Action" : 10, + "Text" : "[24;2~" + }, + "0xf703-0x240000" : { + "Action" : 10, + "Text" : "[1;5C" + }, + "0xf701-0x260000" : { + "Action" : 10, + "Text" : "[1;6B" + }, + "0xf702-0x280000" : { + "Action" : 11, + "Text" : "0x1b 0x1b 0x5b 0x44" + }, + "0xf72b-0x20000" : { + "Action" : 10, + "Text" : "[1;2F" + }, + "0x36-0x40000" : { + "Action" : 11, + "Text" : "0x1e" + }, + "0xf708-0x20000" : { + "Action" : 10, + "Text" : "[15;2~" + }, + "0xf701-0x220000" : { + "Action" : 10, + "Text" : "[1;2B" + }, + "0xf70b-0x20000" : { + "Action" : 10, + "Text" : "[19;2~" + }, + "0xf702-0x240000" : { + "Action" : 10, + "Text" : "[1;5D" + }, + "0xf704-0x20000" : { + "Action" : 10, + "Text" : "[1;2P" + } + }, + "Bold Color (Dark)" : { + "Red Component" : 0.78823530673980713, + "Color Space" : "sRGB", + "Blue Component" : 0.85098040103912354, + "Alpha Component" : 1, + "Green Component" : 0.81960785388946533 + }, + "Link Color" : { + "Red Component" : 0.14513972401618958, + "Color Space" : "P3", + "Blue Component" : 0.7093239426612854, + "Alpha Component" : 1, + "Green Component" : 0.35333043336868286 + }, + "Ansi 6 Color" : { + "Red Component" : 0.31764705882352939, + "Color Space" : "P3", + "Blue Component" : 0.67450980392156867, + "Alpha Component" : 1, + "Green Component" : 0.65490196078431373 + }, + "Silence Bell" : false, + "Ansi 4 Color (Dark)" : { + "Red Component" : 0.41176470588235292, + "Color Space" : "P3", + "Blue Component" : 0.92156862745098034, + "Alpha Component" : 1, + "Green Component" : 0.5490196078431373 + }, + "Ansi 9 Color (Light)" : { + "Red Component" : 0.89411764705882357, + "Color Space" : "P3", + "Blue Component" : 0.37254901960784315, + "Alpha Component" : 1, + "Green Component" : 0.37254901960784315 + }, + "Ansi 12 Color" : { + "Red Component" : 0.41176470588235292, + "Color Space" : "P3", + "Blue Component" : 0.92156862745098034, + "Alpha Component" : 1, + "Green Component" : 0.5490196078431373 + }, + "AWDS Tab Option" : "Recycle", + "Ansi 1 Color (Light)" : { + "Red Component" : 0.62352941176470589, + "Color Space" : "P3", + "Blue Component" : 0.16078431372549021, + "Alpha Component" : 1, + "Green Component" : 0.17254901960784313 + }, + "Ansi 5 Color (Light)" : { + "Red Component" : 0.62352941176470589, + "Color Space" : "P3", + "Blue Component" : 0.63529411764705879, + "Alpha Component" : 1, + "Green Component" : 0.17254901960784313 + }, + "Foreground Color (Light)" : { + "Red Component" : 0.12156862745098039, + "Color Space" : "P3", + "Blue Component" : 0.13333333333333333, + "Alpha Component" : 1, + "Green Component" : 0.10980392156862745 + }, + "Ansi 5 Color" : { + "Red Component" : 0.62352941176470589, + "Color Space" : "P3", + "Blue Component" : 0.63529411764705879, + "Alpha Component" : 1, + "Green Component" : 0.17254901960784313 + }, + "Ansi 4 Color" : { + "Red Component" : 0.18823529411764706, + "Color Space" : "P3", + "Blue Component" : 0.66274509803921566, + "Alpha Component" : 1, + "Green Component" : 0.34509803921568627 + }, + "Use Separate Colors for Light and Dark Mode" : true, + "Ansi 3 Color" : { + "Red Component" : 0.6470588235294118, + "Color Space" : "P3", + "Blue Component" : 0.20784313725490197, + "Alpha Component" : 1, + "Green Component" : 0.49019607843137253 + }, + "Blinking Cursor" : false, + "Ansi 6 Color (Light)" : { + "Red Component" : 0.31764705882352939, + "Color Space" : "P3", + "Blue Component" : 0.67450980392156867, + "Alpha Component" : 1, + "Green Component" : 0.65490196078431373 + }, + "Match Background Color" : { + "Red Component" : 1, + "Color Space" : "P3", + "Blue Component" : 0, + "Alpha Component" : 1, + "Green Component" : 1 + }, + "Cursor Guide Color" : { + "Red Component" : 0.74862593412399292, + "Color Space" : "P3", + "Blue Component" : 0.99125725030899048, + "Alpha Component" : 0.25, + "Green Component" : 0.92047786712646484 + }, + "Ansi 2 Color" : { + "Red Component" : 0.31764705882352939, + "Color Space" : "P3", + "Blue Component" : 0.25882352941176473, + "Alpha Component" : 1, + "Green Component" : 0.65490196078431373 + }, + "Use Cursor Guide" : false, + "Use Underline Color (Dark)" : false, + "Selection Color (Light)" : { + "Red Component" : 0.62352941176470589, + "Color Space" : "P3", + "Blue Component" : 0.63529411764705879, + "Alpha Component" : 1, + "Green Component" : 0.17254901960784313 + }, + "Ansi 1 Color" : { + "Red Component" : 0.62352941176470589, + "Color Space" : "P3", + "Blue Component" : 0.16078431372549021, + "Alpha Component" : 1, + "Green Component" : 0.17254901960784313 + }, + "Faint Text Alpha (Light)" : 0.5, + "AWDS Pane Option" : "Recycle", + "Ambiguous Double Width" : false, + "Selected Text Color" : { + "Green Component" : 0.32549020648002625, + "Red Component" : 0.32549020648002625, + "Blue Component" : 0.32549020648002625 + }, + "Non-ASCII Anti Aliased" : true, + "Ansi 12 Color (Light)" : { + "Red Component" : 0.41176470588235292, + "Color Space" : "P3", + "Blue Component" : 0.92156862745098034, + "Alpha Component" : 1, + "Green Component" : 0.5490196078431373 + }, + "Foreground Color (Dark)" : { + "Red Component" : 0.90196078431372551, + "Color Space" : "P3", + "Blue Component" : 0.90980392156862744, + "Alpha Component" : 1, + "Green Component" : 0.8901960784313725 + } +} \ No newline at end of file diff --git a/keyboard.layout.json b/keyboard.layout.json new file mode 100644 index 0000000..2ced78d --- /dev/null +++ b/keyboard.layout.json @@ -0,0 +1,857 @@ +{ + "name": "NuPhy Gem80", + "vendorProductId": 435499637, + "macros": [ + "{KC_LCTL,KC_LGUI,KC_Q}", + "{KC_LGUI,KC_LSFT,KC_2}", + "{KC_LGUI,KC_LCTL,KC_LSFT,KC_4}{50}{KC_SPC}", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "layers": [ + [ + "KC_ESC", + "KC_SLCK", + "KC_PAUS", + "CUSTOM(6)", + "MACRO(2)", + "KC_F5", + "KC_F6", + "KC_F7", + "KC_F8", + "KC_F9", + "KC_F10", + "KC_F11", + "KC_F12", + "MACRO(0)", + "KC_MUTE", + "KC_VOLD", + "KC_VOLU", + "KC_GRV", + "KC_1", + "KC_2", + "KC_3", + "KC_4", + "KC_5", + "KC_6", + "KC_7", + "KC_8", + "KC_9", + "KC_0", + "KC_MINS", + "KC_EQL", + "KC_BSPC", + "KC_MPRV", + "KC_MPLY", + "KC_MNXT", + "KC_TAB", + "KC_Q", + "KC_W", + "KC_E", + "KC_R", + "KC_T", + "KC_Y", + "KC_U", + "KC_I", + "KC_O", + "KC_P", + "KC_LBRC", + "KC_RBRC", + "KC_BSLS", + "KC_DEL", + "KC_PGUP", + "KC_PGDN", + "KC_LCTL", + "KC_A", + "KC_S", + "KC_D", + "KC_F", + "KC_G", + "KC_H", + "KC_J", + "KC_K", + "KC_L", + "KC_SCLN", + "KC_QUOT", + "KC_NO", + "KC_ENT", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_LSFT", + "KC_NO", + "KC_Z", + "KC_X", + "KC_C", + "KC_V", + "KC_B", + "KC_N", + "KC_M", + "KC_COMM", + "KC_DOT", + "KC_SLSH", + "KC_NO", + "KC_RSFT", + "KC_UP", + "KC_NO", + "KC_NO", + "MO(1)", + "KC_LALT", + "KC_LGUI", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_SPC", + "KC_NO", + "KC_NO", + "KC_RGUI", + "KC_RCTL", + "KC_RALT", + "MACRO(1)", + "KC_LEFT", + "KC_DOWN", + "KC_RGHT", + "KC_NO" + ], + [ + "KC_TRNS", + "KC_F1", + "KC_F2", + "KC_F3", + "KC_F4", + "KC_F5", + "KC_F6", + "KC_F7", + "KC_F8", + "KC_F9", + "KC_F10", + "KC_F11", + "KC_F12", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(3)", + "CUSTOM(4)", + "CUSTOM(5)", + "CUSTOM(2)", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(32)", + "CUSTOM(33)", + "CUSTOM(31)", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(41)", + "CUSTOM(29)", + "CUSTOM(12)", + "CUSTOM(13)", + "CUSTOM(14)", + "CUSTOM(39)", + "CUSTOM(40)", + "CUSTOM(38)", + "CUSTOM(30)", + "CUSTOM(35)", + "CUSTOM(36)", + "CUSTOM(34)", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "MO(5)", + "MO(4)", + "RGB_SPD", + "RGB_SPI", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "RGB_VAI", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_TRNS", + "MO(1)", + "KC_TRNS", + "KC_TRNS", + "RGB_MOD", + "RGB_VAD", + "RGB_HUI", + "KC_NO" + ], + [ + "KC_ESC", + "KC_F1", + "KC_F2", + "KC_F3", + "KC_F4", + "KC_F5", + "KC_F6", + "KC_F7", + "KC_F8", + "KC_F9", + "KC_F10", + "KC_F11", + "KC_VOLU", + "KC_F13", + "CUSTOM(37)", + "LSG(KC_S)", + "MACRO(0)", + "KC_GRV", + "KC_1", + "KC_2", + "KC_3", + "KC_4", + "KC_5", + "KC_6", + "KC_7", + "KC_8", + "KC_9", + "KC_0", + "KC_MINS", + "KC_EQL", + "KC_BSPC", + "KC_INS", + "KC_HOME", + "KC_PGUP", + "KC_TAB", + "KC_Q", + "KC_W", + "KC_E", + "KC_R", + "KC_T", + "KC_Y", + "KC_U", + "KC_I", + "KC_O", + "KC_P", + "KC_LBRC", + "KC_RBRC", + "KC_BSLS", + "KC_DEL", + "KC_END", + "KC_PGDN", + "KC_LCTL", + "KC_A", + "KC_S", + "KC_D", + "KC_F", + "KC_G", + "KC_H", + "KC_J", + "KC_K", + "KC_L", + "KC_SCLN", + "KC_QUOT", + "KC_NO", + "KC_ENT", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_LSFT", + "KC_NO", + "KC_Z", + "KC_X", + "KC_C", + "KC_V", + "KC_B", + "KC_N", + "KC_M", + "KC_COMM", + "KC_DOT", + "KC_SLSH", + "KC_NO", + "KC_RSFT", + "KC_UP", + "KC_NO", + "KC_NO", + "KC_LCTL", + "KC_LALT", + "KC_LGUI", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_SPC", + "KC_NO", + "KC_NO", + "KC_RGUI", + "MO(3)", + "KC_RALT", + "MACRO(1)", + "KC_LEFT", + "KC_DOWN", + "KC_RGHT", + "KC_NO" + ], + [ + "KC_TRNS", + "KC_BRID", + "KC_BRIU", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_MPRV", + "KC_MPLY", + "KC_MNXT", + "KC_MUTE", + "KC_VOLD", + "KC_VOLU", + "KC_NO", + "KC_TRNS", + "KC_PSCR", + "KC_NO", + "KC_TRNS", + "CUSTOM(3)", + "CUSTOM(4)", + "CUSTOM(5)", + "CUSTOM(2)", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(32)", + "CUSTOM(33)", + "CUSTOM(31)", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(41)", + "CUSTOM(29)", + "CUSTOM(12)", + "CUSTOM(13)", + "CUSTOM(14)", + "CUSTOM(39)", + "CUSTOM(40)", + "CUSTOM(38)", + "CUSTOM(30)", + "CUSTOM(35)", + "CUSTOM(36)", + "CUSTOM(34)", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "MO(5)", + "MO(4)", + "RGB_SPD", + "RGB_SPI", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "RGB_VAI", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_TRNS", + "MO(3)", + "KC_TRNS", + "KC_TRNS", + "RGB_MOD", + "RGB_VAD", + "RGB_HUI", + "KC_NO" + ], + [ + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(15)", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(22)", + "CUSTOM(21)", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "CUSTOM(17)", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_TRNS", + "MO(4)", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(19)", + "CUSTOM(18)", + "CUSTOM(20)", + "KC_NO" + ], + [ + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(28)", + "CUSTOM(27)", + "KC_TRNS", + "KC_NO", + "KC_TRNS", + "CUSTOM(23)", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_TRNS", + "MO(5)", + "KC_TRNS", + "KC_TRNS", + "CUSTOM(25)", + "CUSTOM(24)", + "CUSTOM(26)", + "KC_NO" + ], + [ + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS" + ], + [ + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS" + ] + ], + "encoders": [] +} \ No newline at end of file diff --git a/vim/vim.symlink/colors/mpwb.vim b/vim/vim.symlink/colors/mpwb.vim index 3fb316c..1b6dd40 100644 --- a/vim/vim.symlink/colors/mpwb.vim +++ b/vim/vim.symlink/colors/mpwb.vim @@ -16,6 +16,8 @@ endif " 5: magenta " 6: cyan " 7: background +" 8: black +" 15: white " " +8 for bright colours. " @@ -35,6 +37,7 @@ hi Define cterm=NONE ctermfg=NONE ctermbg=NONE hi Include cterm=NONE ctermfg=NONE ctermbg=NONE hi Macro cterm=NONE ctermfg=NONE ctermbg=NONE hi PreProc cterm=NONE ctermfg=NONE ctermbg=NONE +hi Title cterm=NONE ctermfg=NONE ctermbg=NONE hi VimHiAttrib cterm=NONE ctermfg=NONE ctermbg=NONE hi VimOption cterm=NONE ctermfg=NONE ctermbg=NONE @@ -48,22 +51,32 @@ hi Boolean cterm=NONE ctermfg=4 ctermbg=NONE hi Comment cterm=NONE ctermfg=2 ctermbg=NONE hi Todo cterm=bold ctermbg=2 ctermfg=7 -hi CursorLine cterm=bold - -hi Search ctermfg=0 ctermbg=3 +" Search is bright blue +hi Search ctermfg=0 ctermbg=14 +" Chrome is magenta hi VertSplit ctermfg=5 ctermbg=NONE cterm=NONE hi StatusLine ctermfg=5 ctermbg=NONE cterm=bold hi StatusLineNC ctermfg=5 ctermbg=NONE cterm=NONE -hi Visual ctermfg=7 ctermbg=0 +hi Visual ctermfg=15 ctermbg=0 -if &background == 'dark' - hi LineNr cterm=NONE ctermfg=15 ctermbg=NONE - hi CursorLineNr cterm=bold ctermfg=15 ctermbg=0 -endif +hi LineNr cterm=NONE ctermfg=5 ctermbg=NONE +hi CursorLine cterm=bold +hi CursorLineNr cterm=bold ctermfg=15 ctermbg=5 -if &background == 'light' - hi LineNr cterm=NONE ctermfg=0 ctermbg=NONE - hi CursorLineNr cterm=bold ctermfg=0 ctermbg=NONE -endif +" LSP hints +hi ErrorMsg cterm=NONE ctermfg=7 ctermbg=1 +hi Question cterm=NONE ctermfg=7 ctermbg=4 +hi SpellLocal cterm=NONE ctermfg=3 ctermbg=NONE +hi SpellRare cterm=NONE ctermfg=3 ctermbg=NONE +hi SpellCap cterm=NONE ctermfg=0 ctermbg=3 + +hi link LspDiagSignInfoText Question +hi link LspDiagSignWarningText Question + +hi PMenu cterm=NONE ctermfg=8 ctermbg=5 +hi PMenuSel cterm=bold ctermfg=8 ctermbg=3 + +" Misc cleanup +hi pandocBlockQuote cterm=NONE ctermfg=0 ctermbg=NONE diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index 15eb2e8..fec8671 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -11,24 +11,29 @@ call plug#begin() Plug 'tpope/vim-commentary' Plug 'tpope/vim-fugitive' Plug 'tpope/vim-surround' +Plug 'tpope/vim-repeat' -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } +Plug '/opt/homebrew/opt/fzf' Plug 'junegunn/fzf.vim' -Plug 'jayli/vim-easycomplete' Plug 'SirVer/ultisnips' +Plug 'yegappan/lsp' + +Plug 'vim-pandoc/vim-pandoc-syntax' +Plug 'quarto-dev/quarto-vim' + +Plug 'HerringtonDarkholme/yats.vim' + call plug#end() -" Plugin configuration - -" Get AI out of here -let g:easycomplete_tabnine_enable = 0 +" Language config +let g:pandoc#syntax#conceal#use = 0 +let g:r_indent_align_args = 0 " Syntax and colors and things filetype plugin indent on syntax on -syntax manual " Disable Swapping set nobackup nowritebackup noswapfile @@ -48,6 +53,8 @@ set nowrap " Relative numbering with absolute anchor set number relativenumber +set signcolumn=number +set cursorline cursorlineopt=both " Keep buffers open in memory when not visible set hidden @@ -98,9 +105,12 @@ let localmapleader = "\\" " Use jk to escape back to normal inoremap jk -tnoremap jk inoremap +" Hide search highlights +nnoremap :noh +nnoremap / :noh + " Switch between recent buffers nnoremap @@ -130,18 +140,32 @@ nnoremap _ :-1dpk== " Quick access vimrc nnoremap ev :tabedit $MYVIMRC - -augroup updateVimrc - autocmd! - - autocmd BufWritePost $MYVIMRC :source $MYVIMRC -augroup END +nnoremap es :so $MYVIMRC " Pane management nnoremap nnoremap nnoremap nnoremap +inoremap +inoremap +inoremap +inoremap + +" FZF +nnoremap o :Files +nnoremap b :Buffers +nnoremap f :Rg +nnoremap g :RG + +let g:fzf_vim = {} +let g:fzf_vim.preview_window = [] + +augroup FZF + autocmd! + + autocmd FileType fzf tmap jk +augroup END " Focus mode @@ -158,14 +182,6 @@ endfunc nnoremap z :call Zoom() -" Show nice things on active pane only -augroup activePaneManagement - autocmd! - - autocmd WinEnter,VimEnter,BufWinEnter * setl rnu cul syntax=ON - autocmd WinLeave,BufWinLeave,BufLeave * setl nornu nocul syntax=OFF -augroup END - " Make directories in a filename if they don't exist. function! EnsureDirExists () @@ -185,6 +201,64 @@ augroup AutoMkdir autocmd BufNewFile * :call EnsureDirExists() augroup END +" LSP and other completion + +nnoremap aa :LspDiag current +nnoremap ga :LspDiag nextWrap +nnoremap gA :LspDiag prevWrap + +augroup Lsp + autocmd! + + let lspOptions = #{ ultisnips: v:true } + autocmd User LspSetup call LspOptionsSet(lspOptions) + + let lspServers = [#{ + \ name: 'r', + \ filetype: ['r', 'rmd', 'quarto'], + \ path: '/usr/local/bin/R', + \ args: ['-s', '-e languageserver::run()'] + \ }] + + autocmd User LspSetup call LspAddServer(lspServers) +augroup END + +" File Running + +function! PreviewQuarto() + call ClosePreview() + + echom 'Starting preview job' + let b:file = expand('%') + let b:preview_job = job_start( + \ ['quarto', 'preview', b:file], + \ ) +endfunc + +function! ClosePreview() + if exists("b:preview_job") + echo 'Killing existing job...' + call job_stop(b:preview_job) + endif +endfunc + +nnoremap r :echo 'No preview configured' +nmap r + +augroup Previews + autocmd! + + autocmd Filetype quarto nnoremap r :call PreviewQuarto() +augroup END + + +augroup TextFormatting + autocmd! + + autocmd FileType make,go setl noet sw=8 sts=8 ts=8 + + autocmd FileType r,quarto,rmd setl et sw=2 sts=2 ts=2 +augroup END " Show syntax highlighting groups for word under cursor " @@ -192,10 +266,10 @@ augroup END " scheme. nnoremap \ :call SynStack() function! SynStack() - if !exists("*synstack") - return - endif - echo map(synstack(line('.'), col('.')), 'synIDattr(v:val,"name")') + if !exists("*synstack") + return + endif + echo map(synstack(line('.'), col('.')), 'synIDattr(v:val,"name")') endfunc " Open syntax file for current diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 3afe314..7d6d145 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -29,6 +29,12 @@ source "$(brew --prefix fzf)/shell/completion.zsh" export FZF_DEFAULT_COMMAND='rg --files --hidden --follow --glob "!.git/*"' # Python +if [ ! -f "$HOME/dotfiles/python/venv/bin/activate" ] +then + python3 -m venv "$HOME/dotfiles/python/venv" +fi + +source "$HOME/dotfiles/python/venv/bin/activate" export PYTHONPATH="$PYTHONPATH:$HOME/dotfiles/lib/python" # Rust