Parcourir la source

combined updates that seem to work

Kevin Heinicke il y a 2 ans
Parent
commit
7888e32f27
6 fichiers modifiés avec 413 ajouts et 496 suppressions
  1. 7 6
      coc-extensions.json
  2. 1 1
      external/vim-plug
  3. 4 2
      gitignore_global
  4. 380 385
      iterm-profiles.json
  5. 17 26
      nvimrc
  6. 4 76
      zshrc

+ 7 - 6
coc-extensions.json

@@ -1,13 +1,14 @@
 {
 {
   "dependencies": {
   "dependencies": {
-    "coc-json": ">=1.3.6",
-    "coc-pyright": ">=1.1.194",
+    "coc-json": ">=1.8.0",
+    "coc-metals": ">=1.0.14",
+    "coc-prettier": ">=9.3.1",
+    "coc-pyright": ">=1.1.301",
+    "coc-sqlfluff": ">=0.11.0",
     "coc-toml": ">=1.1.0",
     "coc-toml": ">=1.1.0",
-    "coc-vetur": ">=1.2.5",
-    "coc-vimtex": ">=1.0.4",
-    "coc-yaml": ">=1.4.2"
+    "coc-yaml": ">=1.9.0"
   },
   },
   "disabled": [],
   "disabled": [],
   "locked": [],
   "locked": [],
-  "lastUpdate": 1665873311480
+  "lastUpdate": 1691565768803
 }
 }

+ 1 - 1
external/vim-plug

@@ -1 +1 @@
-Subproject commit 5430b6213a5c6c3bafd7e25b1e80ccb2afd7f5ba
+Subproject commit e300178a0e2fb04b56de8957281837f13ecf0b27

+ 4 - 2
gitignore_global

@@ -23,7 +23,7 @@
 # Logs and databases #
 # Logs and databases #
 ######################
 ######################
 *.log
 *.log
-*.sql
+#*.sql
 *.sqlite
 *.sqlite
 
 
 # OS generated files #
 # OS generated files #
@@ -45,5 +45,7 @@ __pycache__/
 .clang
 .clang
 toolchain.cmake
 toolchain.cmake
 livepreview/
 livepreview/
-.env
+*.env
 .python-version
 .python-version
+.metals/
+.idea/

+ 380 - 385
iterm-profiles.json

@@ -1,388 +1,383 @@
 {
 {
-    "Profiles": [
-        {
-            "Ansi 6 Color" : {
-              "Red Component" : 0.16470588235294117,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.59607843137254901,
-              "Green Component" : 0.63137254901960782
-            },
-            "Tags" : [],
-            "Ansi 12 Color" : {
-              "Red Component" : 0.51372549019607838,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.58823529411764708,
-              "Green Component" : 0.58039215686274515
-            },
-            "Ansi 4 Color" : {
-              "Red Component" : 0.14901960784313725,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.82352941176470584,
-              "Green Component" : 0.54509803921568623
-            },
-            "Normal Font" : "SauceCodeProNerdFontCompleteM-Regular 15",
-            "Bold Color" : {
-              "Red Component" : 0.34509803921568627,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.45882352941176469,
-              "Green Component" : 0.43137254901960786
-            },
-            "Ansi 5 Color" : {
-              "Red Component" : 0.82745098039215681,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.50980392156862742,
-              "Green Component" : 0.21176470588235294
-            },
-            "Use Non-ASCII Font" : false,
-            "Ansi 2 Color" : {
-              "Red Component" : 0.52156862745098043,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0,
-              "Green Component" : 0.59999999999999998
-            },
-            "Rows" : 25,
-            "Default Bookmark" : "No",
-            "Cursor Guide Color" : {
-              "Red Component" : 0.70213186740875244,
-              "Color Space" : "sRGB",
-              "Blue Component" : 1,
-              "Alpha Component" : 0.25,
-              "Green Component" : 0.9268307089805603
-            },
-            "Non-ASCII Anti Aliased" : true,
-            "Use Bright Bold" : true,
-            "Ansi 10 Color" : {
-              "Red Component" : 0.34509803921568627,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.45882352941176469,
-              "Green Component" : 0.43137254901960786
-            },
-            "Ambiguous Double Width" : false,
-            "Jobs to Ignore" : [
-              "rlogin",
-              "ssh",
-              "slogin",
-              "telnet"
-            ],
-            "Ansi 15 Color" : {
-              "Red Component" : 0.99215686274509807,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.8901960784313725,
-              "Green Component" : 0.96470588235294119
-            },
-            "Foreground Color" : {
-              "Red Component" : 0.396078431372549,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.51372549019607838,
-              "Green Component" : 0.4823529411764706
-            },
-            "Working Directory" : "\/Users\/bixel",
-            "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" : {
-              "Red Component" : 0.93333333333333335,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.83529411764705885,
-              "Green Component" : 0.90980392156862744
-            },
-            "Columns" : 80,
-            "Idle Code" : 0,
-            "Ansi 13 Color" : {
-              "Red Component" : 0.42352941176470588,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.7686274509803922,
-              "Green Component" : 0.44313725490196076
-            },
-            "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" : {
-              "Red Component" : 0.34509803921568627,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.45882352941176469,
-              "Green Component" : 0.43137254901960786
-            },
-            "Background Color" : {
-              "Red Component" : 0.99215686274509807,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.8901960784313725,
-              "Green Component" : 0.96470588235294119
-            },
-            "Character Encoding" : 4,
-            "Ansi 11 Color" : {
-              "Red Component" : 0.396078431372549,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.51372549019607838,
-              "Green Component" : 0.4823529411764706
-            },
-            "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
-              },
-              "0x4c-0x120000" : {
-                "Action" : 40,
-                "Text" : "Solarized Light"
-              },
-              "0xf701-0x220000" : {
-                "Text" : "[1;2B",
-                "Action" : 10
-              },
-              "0xf70b-0x20000" : {
-                "Text" : "[19;2~",
-                "Action" : 10
-              },
-              "0x4b-0x120000" : {
-                "Action" : 40,
-                "Text" : "Solarized Dark"
-              },
-              "0xf702-0x240000" : {
-                "Text" : "[1;5D",
-                "Action" : 10
-              },
-              "0xf704-0x20000" : {
-                "Text" : "[1;2P",
-                "Action" : 10
-              }
-            },
-            "Window Type" : 0,
-            "Background Image Location" : "",
-            "Blur" : false,
-            "Badge Color" : {
-              "Red Component" : 1,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0,
-              "Alpha Component" : 0.5,
-              "Green Component" : 0.1491314172744751
-            },
-            "Scrollback Lines" : 1000,
-            "Send Code When Idle" : false,
-            "Close Sessions On End" : true,
-            "Terminal Type" : "xterm-256color",
-            "Visual Bell" : true,
-            "Flashing Bell" : false,
-            "Silence Bell" : true,
-            "Ansi 14 Color" : {
-              "Red Component" : 0.57647058823529407,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.63137254901960782,
-              "Green Component" : 0.63137254901960782
-            },
-            "Name" : "Default",
-            "Cursor Text Color" : {
-              "Red Component" : 0.93333333333333335,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.83529411764705885,
-              "Green Component" : 0.90980392156862744
-            },
-            "Shortcut" : "",
-            "Cursor Color" : {
-              "Red Component" : 0.396078431372549,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.51372549019607838,
-              "Green Component" : 0.4823529411764706
-            },
-            "Transparency" : 0,
-            "Guid" : "C4638304-AD43-4676-BF77-7904FF6ECA49",
-            "Custom Directory" : "No",
-            "Link Color" : {
-              "Red Component" : 0,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.73423302173614502,
-              "Alpha Component" : 1,
-              "Green Component" : 0.35916060209274292
-            },
-            "Ansi 0 Color" : {
-              "Red Component" : 0.027450980392156862,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.25882352941176473,
-              "Green Component" : 0.21176470588235294
-            },
-            "Ansi 1 Color" : {
-              "Red Component" : 0.86274509803921573,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.18431372549019609,
-              "Green Component" : 0.19607843137254902
-            },
-            "Horizontal Spacing" : 1,
-            "Ansi 7 Color" : {
-              "Red Component" : 0.93333333333333335,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.83529411764705885,
-              "Green Component" : 0.90980392156862744
-            },
-            "Ansi 8 Color" : {
-              "Red Component" : 0,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.21176470588235294,
-              "Green Component" : 0.16862745098039217
-            },
-            "Ansi 9 Color" : {
-              "Red Component" : 0.79607843137254897,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.086274509803921567,
-              "Green Component" : 0.29411764705882354
-            },
-            "Ansi 3 Color" : {
-              "Red Component" : 0.70980392156862748,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0,
-              "Green Component" : 0.53725490196078429
-            },
-            "Set Local Environment Vars" : false,
-            "Right Option Key Sends" : 0
+  "Profiles": [
+    {
+      "Ansi 6 Color": {
+        "Red Component": 0.16470588235294117,
+        "Color Space": "sRGB",
+        "Blue Component": 0.59607843137254901,
+        "Green Component": 0.63137254901960782
+      },
+      "Tags": [],
+      "Ansi 12 Color": {
+        "Red Component": 0.51372549019607838,
+        "Color Space": "sRGB",
+        "Blue Component": 0.58823529411764708,
+        "Green Component": 0.58039215686274515
+      },
+      "Ansi 4 Color": {
+        "Red Component": 0.14901960784313725,
+        "Color Space": "sRGB",
+        "Blue Component": 0.82352941176470584,
+        "Green Component": 0.54509803921568623
+      },
+      "Normal Font": "SauceCodeProNF 13",
+      "Bold Color": {
+        "Red Component": 0.34509803921568627,
+        "Color Space": "sRGB",
+        "Blue Component": 0.45882352941176469,
+        "Green Component": 0.43137254901960786
+      },
+      "Ansi 5 Color": {
+        "Red Component": 0.82745098039215681,
+        "Color Space": "sRGB",
+        "Blue Component": 0.50980392156862742,
+        "Green Component": 0.21176470588235294
+      },
+      "Use Non-ASCII Font": false,
+      "Ansi 2 Color": {
+        "Red Component": 0.52156862745098043,
+        "Color Space": "sRGB",
+        "Blue Component": 0,
+        "Green Component": 0.59999999999999998
+      },
+      "Rows": 25,
+      "Default Bookmark": "No",
+      "Cursor Guide Color": {
+        "Red Component": 0.70213186740875244,
+        "Color Space": "sRGB",
+        "Blue Component": 1,
+        "Alpha Component": 0.25,
+        "Green Component": 0.9268307089805603
+      },
+      "Non-ASCII Anti Aliased": true,
+      "Use Bright Bold": true,
+      "Ansi 10 Color": {
+        "Red Component": 0.34509803921568627,
+        "Color Space": "sRGB",
+        "Blue Component": 0.45882352941176469,
+        "Green Component": 0.43137254901960786
+      },
+      "Ambiguous Double Width": false,
+      "Jobs to Ignore": ["rlogin", "ssh", "slogin", "telnet"],
+      "Ansi 15 Color": {
+        "Red Component": 0.99215686274509807,
+        "Color Space": "sRGB",
+        "Blue Component": 0.8901960784313725,
+        "Green Component": 0.96470588235294119
+      },
+      "Foreground Color": {
+        "Red Component": 0.396078431372549,
+        "Color Space": "sRGB",
+        "Blue Component": 0.51372549019607838,
+        "Green Component": 0.4823529411764706
+      },
+      "Working Directory": "/Users/bixel",
+      "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": {
+        "Red Component": 0.93333333333333335,
+        "Color Space": "sRGB",
+        "Blue Component": 0.83529411764705885,
+        "Green Component": 0.90980392156862744
+      },
+      "Columns": 80,
+      "Idle Code": 0,
+      "Ansi 13 Color": {
+        "Red Component": 0.42352941176470588,
+        "Color Space": "sRGB",
+        "Blue Component": 0.7686274509803922,
+        "Green Component": 0.44313725490196076
+      },
+      "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": {
+        "Red Component": 0.34509803921568627,
+        "Color Space": "sRGB",
+        "Blue Component": 0.45882352941176469,
+        "Green Component": 0.43137254901960786
+      },
+      "Background Color": {
+        "Red Component": 0.99215686274509807,
+        "Color Space": "sRGB",
+        "Blue Component": 0.8901960784313725,
+        "Green Component": 0.96470588235294119
+      },
+      "Character Encoding": 4,
+      "Ansi 11 Color": {
+        "Red Component": 0.396078431372549,
+        "Color Space": "sRGB",
+        "Blue Component": 0.51372549019607838,
+        "Green Component": 0.4823529411764706
+      },
+      "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
+        },
+        "0x4c-0x120000": {
+          "Action": 40,
+          "Text": "Solarized Light"
+        },
+        "0xf701-0x220000": {
+          "Text": "[1;2B",
+          "Action": 10
+        },
+        "0xf70b-0x20000": {
+          "Text": "[19;2~",
+          "Action": 10
+        },
+        "0x4b-0x120000": {
+          "Action": 40,
+          "Text": "Solarized Dark"
+        },
+        "0xf702-0x240000": {
+          "Text": "[1;5D",
+          "Action": 10
+        },
+        "0xf704-0x20000": {
+          "Text": "[1;2P",
+          "Action": 10
         }
         }
-    ]
+      },
+      "Window Type": 0,
+      "Background Image Location": "",
+      "Blur": false,
+      "Badge Color": {
+        "Red Component": 1,
+        "Color Space": "sRGB",
+        "Blue Component": 0,
+        "Alpha Component": 0.5,
+        "Green Component": 0.1491314172744751
+      },
+      "Scrollback Lines": 1000,
+      "Send Code When Idle": false,
+      "Close Sessions On End": true,
+      "Terminal Type": "xterm-256color",
+      "Visual Bell": true,
+      "Flashing Bell": false,
+      "Silence Bell": true,
+      "Ansi 14 Color": {
+        "Red Component": 0.57647058823529407,
+        "Color Space": "sRGB",
+        "Blue Component": 0.63137254901960782,
+        "Green Component": 0.63137254901960782
+      },
+      "Name": "Default",
+      "Cursor Text Color": {
+        "Red Component": 0.93333333333333335,
+        "Color Space": "sRGB",
+        "Blue Component": 0.83529411764705885,
+        "Green Component": 0.90980392156862744
+      },
+      "Shortcut": "",
+      "Cursor Color": {
+        "Red Component": 0.396078431372549,
+        "Color Space": "sRGB",
+        "Blue Component": 0.51372549019607838,
+        "Green Component": 0.4823529411764706
+      },
+      "Transparency": 0,
+      "Guid": "C4638304-AD43-4676-BF77-7904FF6ECA49",
+      "Custom Directory": "No",
+      "Link Color": {
+        "Red Component": 0,
+        "Color Space": "sRGB",
+        "Blue Component": 0.73423302173614502,
+        "Alpha Component": 1,
+        "Green Component": 0.35916060209274292
+      },
+      "Ansi 0 Color": {
+        "Red Component": 0.027450980392156862,
+        "Color Space": "sRGB",
+        "Blue Component": 0.25882352941176473,
+        "Green Component": 0.21176470588235294
+      },
+      "Ansi 1 Color": {
+        "Red Component": 0.86274509803921573,
+        "Color Space": "sRGB",
+        "Blue Component": 0.18431372549019609,
+        "Green Component": 0.19607843137254902
+      },
+      "Horizontal Spacing": 1,
+      "Ansi 7 Color": {
+        "Red Component": 0.93333333333333335,
+        "Color Space": "sRGB",
+        "Blue Component": 0.83529411764705885,
+        "Green Component": 0.90980392156862744
+      },
+      "Ansi 8 Color": {
+        "Red Component": 0,
+        "Color Space": "sRGB",
+        "Blue Component": 0.21176470588235294,
+        "Green Component": 0.16862745098039217
+      },
+      "Ansi 9 Color": {
+        "Red Component": 0.79607843137254897,
+        "Color Space": "sRGB",
+        "Blue Component": 0.086274509803921567,
+        "Green Component": 0.29411764705882354
+      },
+      "Ansi 3 Color": {
+        "Red Component": 0.70980392156862748,
+        "Color Space": "sRGB",
+        "Blue Component": 0,
+        "Green Component": 0.53725490196078429
+      },
+      "Set Local Environment Vars": false,
+      "Right Option Key Sends": 0
+    }
+  ]
 }
 }

+ 17 - 26
nvimrc

@@ -36,9 +36,9 @@ Plug 'glench/vim-jinja2-syntax'
 Plug 'fatih/vim-go'
 Plug 'fatih/vim-go'
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'junegunn/fzf.vim'
-Plug 'KabbAmine/vCoolor.vim'
-Plug 'leafOfTree/vim-vue-plugin'
 Plug 'ggandor/leap.nvim'
 Plug 'ggandor/leap.nvim'
+Plug 'towolf/vim-helm'
+Plug 'hashivim/vim-terraform'
 
 
 " All of your Plugins must be added before the following line
 " All of your Plugins must be added before the following line
 call plug#end()  " required
 call plug#end()  " required
@@ -112,9 +112,6 @@ set relativenumber  " aka :set rnu
 set ignorecase " ignore case while searching
 set ignorecase " ignore case while searching
 nnoremap <C-s> :set hlsearch!<CR>
 nnoremap <C-s> :set hlsearch!<CR>
 
 
-" python
-" This should go to local nvimrc
-
 " autoformatting
 " autoformatting
 let g:formatter_python = ['yapf']
 let g:formatter_python = ['yapf']
 let g:formatter_yapf_style = 'pep8'
 let g:formatter_yapf_style = 'pep8'
@@ -227,9 +224,6 @@ let g:vimtex_matchparen_enabled=0  " turn off folding to speed up things
 " coc.nvim
 " coc.nvim
 "
 "
 
 
-" TextEdit might fail if hidden is not set.
-set hidden
-
 " Some servers have issues with backup files, see #649.
 " Some servers have issues with backup files, see #649.
 " use them anyway
 " use them anyway
 " set nobackup
 " set nobackup
@@ -242,9 +236,6 @@ set hidden
 " delays and poor user experience.
 " delays and poor user experience.
 set updatetime=300
 set updatetime=300
 
 
-" Don't pass messages to |ins-completion-menu|.
-set shortmess+=c
-
 " Always show the signcolumn, otherwise it would shift the text each time
 " Always show the signcolumn, otherwise it would shift the text each time
 " diagnostics appear/become resolved.
 " diagnostics appear/become resolved.
 if has("patch-8.1.1564")
 if has("patch-8.1.1564")
@@ -254,16 +245,23 @@ else
   set signcolumn=yes
   set signcolumn=yes
 endif
 endif
 
 
-" Use tab for trigger completion with characters ahead and navigate.
+" Use tab for trigger completion with characters ahead and navigate
+" NOTE: There's always complete item selected by default, you may want to enable
+" no select by `"suggest.noselect": true` in your configuration file
 " NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
 " NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
-" other plugin before putting this into your config.
+" other plugin before putting this into your config
 inoremap <silent><expr> <TAB>
 inoremap <silent><expr> <TAB>
-      \ pumvisible() ? "\<C-n>" :
-      \ <SID>check_back_space() ? "\<TAB>" :
+      \ coc#pum#visible() ? coc#pum#next(1) :
+      \ CheckBackspace() ? "\<Tab>" :
       \ coc#refresh()
       \ coc#refresh()
-inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
+inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
+
+" Make <CR> to accept selected completion item or notify coc.nvim to format
+" <C-g>u breaks current undo, please make your own choice
+inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
+                              \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
 
 
-function! s:check_back_space() abort
+function! CheckBackspace() abort
   let col = col('.') - 1
   let col = col('.') - 1
   return !col || getline('.')[col - 1]  =~# '\s'
   return !col || getline('.')[col - 1]  =~# '\s'
 endfunction
 endfunction
@@ -275,15 +273,6 @@ else
   inoremap <silent><expr> <c-@> coc#refresh()
   inoremap <silent><expr> <c-@> coc#refresh()
 endif
 endif
 
 
-" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current
-" position. Coc only does snippet and additional edit on confirm.
-" <cr> could be remapped by other vim plugin, try `:verbose imap <CR>`.
-if exists('*complete_info')
-  inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
-else
-  inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
-endif
-
 " Use `[g` and `]g` to navigate diagnostics
 " Use `[g` and `]g` to navigate diagnostics
 " Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
 " Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
 nmap <silent> [g <Plug>(coc-diagnostic-prev)
 nmap <silent> [g <Plug>(coc-diagnostic-prev)
@@ -313,9 +302,11 @@ autocmd CursorHold * silent call CocActionAsync('highlight')
 nmap <leader>rn <Plug>(coc-rename)
 nmap <leader>rn <Plug>(coc-rename)
 
 
 " Formatting selected code.
 " Formatting selected code.
+nmap <leader>ff <Plug>(coc-format)
 xmap <leader>f  <Plug>(coc-format-selected)
 xmap <leader>f  <Plug>(coc-format-selected)
 nmap <leader>f  <Plug>(coc-format-selected)
 nmap <leader>f  <Plug>(coc-format-selected)
 
 
+
 augroup mygroup
 augroup mygroup
   autocmd!
   autocmd!
   " Setup formatexpr specified filetype(s).
   " Setup formatexpr specified filetype(s).

+ 4 - 76
zshrc

@@ -12,9 +12,9 @@ zplug "zsh-users/zsh-history-substring-search", defer:3
 zplug "junegunn/fzf", use:"shell/*.zsh"
 zplug "junegunn/fzf", use:"shell/*.zsh"
 zplug "modules/git", from:prezto
 zplug "modules/git", from:prezto
 zplug "modules/completion", from:prezto
 zplug "modules/completion", from:prezto
-zplug "esc/conda-zsh-completion"
 zplug "docker/compose", use:contrib/completion/zsh
 zplug "docker/compose", use:contrib/completion/zsh
 zplug "docker/cli", use:contrib/completion/zsh
 zplug "docker/cli", use:contrib/completion/zsh
+zplug "Azure/azure-cli", use:az.completion, defer:3
 
 
 # Install plugins if there are plugins that have not been installed
 # Install plugins if there are plugins that have not been installed
 if ! zplug check --verbose; then
 if ! zplug check --verbose; then
@@ -58,56 +58,12 @@ printable-code()
   echo $doc | pandoc -o "$name.$oformat"
   echo $doc | pandoc -o "$name.$oformat"
 }
 }
 
 
-# mount a remote's ($1) host dir ($2) at $3/$2 or ~/mounts/$2 if $3 is not set
-mountremote () {
-  # set the root mount dir
-  mountroot="${REMOTE_MOUNT_ROOT:-$HOME/mounts}";
-  if [ -n "$3" ]; then
-      mountpoint=$3
-  elif [ -z "$2" ]; then
-      mountpoint=$1-home
-  else
-      mountpoint=$1-`echo $2 | sed -E "s/\///g"`
-  fi
-  mkdir -p $mountroot/$mountpoint
-  if [[ $(uname -a) == *"Darwin"* ]]; then
-      # following line is apple-specific
-      sshfs $1:$2 "$mountroot/$mountpoint" -o auto_cache,reconnect,volname=$mountpoint,no_readahead,noappledouble,nolocalcaches
-  else
-      sshfs $1:$2 "$mountroot/$mountpoint" -o auto_cache,reconnect,no_readahead
-  fi
-  unset mountroot
-  unset mountpoint
-}
-
-# check number of tmux sessions running on list of ssh hosts
-function tmux-num-sessions () {
-    if (( $# == 0 )) then;
-        echo usage: tmux-num-sessions ssh-host-1 ssh-host-2 ...
-    fi
-    hosts=$@
-    for i; do
-        sessions=$(ssh $i tmux ls 2>/dev/null)
-        if (( $? )) then;
-            echo $i: No sessions
-        else
-            echo $i: $(echo $sessions | wc -l) sessions
-        fi
-    done
-}
-
 # help creating links to emails
 # help creating links to emails
 # in apple mail, go to viewing → Show message headers → Custom... → Add "Message-ID"
 # in apple mail, go to viewing → Show message headers → Custom... → Add "Message-ID"
 function murl () {
 function murl () {
     echo message://"%3c"$@"%3e"
     echo message://"%3c"$@"%3e"
 }
 }
 
 
-# make the clipboard working on remote
-if [[ -n "$SSH_CLIENT" ]]; then
-  SSH_IP=$(echo $SSH_CLIENT | awk '{print $1}')
-  alias pbcopy="ssh $SSH_IP pbcopy"
-fi
-
 #
 #
 # Aliases
 # Aliases
 #
 #
@@ -124,37 +80,7 @@ alias rm="nocorrect rm"
 # Python
 # Python
 #
 #
 
 
-# virtualenvwrapper
-if [ -f ~/virtualenvwrapper.sh ]; then
-  source ~/virtualenvwrapper.sh
-  export VIRTUAL_ENV_DISABLE_PROMT=yes
-fi
-
-if [[ -n "$ITERM_INTEGRATION" && -f ~/.iterm2_shell_integration.zsh ]]; then
-  test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
-fi
-
-# a new attempt to forward ssh sockets to tmux
-
-if [[ -n "$SSH_AUTH_SOCK" ]]; then
-    # based on/using http://stackoverflow.com/questions/21378569 and
-    # https://gist.github.com/martijnvermaat/8070533
-
-    # Fix SSH auth socket location so agent forwarding works with tmux
-    if [[ -z "$TMUX" ]] ; then
-        ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
-    else
-        export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock
-    fi
-fi
-
-# taskwarrior setup, stolen from https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/taskwarrior/taskwarrior.plugin.zsh
-zstyle ':completion:*:*:task:*' verbose yes
-zstyle ':completion:*:*:task:*:descriptions' format '%U%B%d%b%u'
-zstyle ':completion:*:*:task:*' group-name ''
-
-alias t=task
-compdef _task t=task
+alias pip_update_all="pip install -r <(pip freeze | sed 's|==.*||') -U"
 
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
@@ -167,3 +93,5 @@ zplug load
 # use up and down keys for substring search (needs to be called after plugin loading)
 # use up and down keys for substring search (needs to be called after plugin loading)
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
 bindkey '^[[B' history-substring-search-down
+
+[[ ! -f ~/.zsh_local_completions ]] || source ~/.zsh_local_completions