From ae89905032fa89d6119f287d09a34e11cc075007 Mon Sep 17 00:00:00 2001 From: Steven Kreitzer Date: Thu, 14 Dec 2023 16:15:09 -0600 Subject: [PATCH] chore(vscode): change settings --- .github/renovate.json5 | 2 +- .github/renovate/allowedVersions.json5 | 2 +- .github/renovate/autoMerge.json5 | 2 +- .github/renovate/commitMessage.json5 | 2 +- .github/renovate/customDatasources.json5 | 2 +- .github/renovate/customManagers.json5 | 2 +- .github/renovate/groups.json5 | 2 +- .github/renovate/labels.json5 | 2 +- .github/renovate/packageRules.json5 | 2 +- .github/renovate/semanticCommits.json5 | 2 +- .vscode/extensions.json | 1 + .vscode/settings.json | 56 +++++++++++++----------- 12 files changed, 41 insertions(+), 36 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 0144bcb891..e26c398764 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -53,4 +53,4 @@ "(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$" ] } -} \ No newline at end of file +} diff --git a/.github/renovate/allowedVersions.json5 b/.github/renovate/allowedVersions.json5 index 9eb9c60d42..be6115ea42 100644 --- a/.github/renovate/allowedVersions.json5 +++ b/.github/renovate/allowedVersions.json5 @@ -7,4 +7,4 @@ "allowedVersions": "<=16" } ] -} \ No newline at end of file +} diff --git a/.github/renovate/autoMerge.json5 b/.github/renovate/autoMerge.json5 index 3fd6fd51dc..1728b7cc69 100644 --- a/.github/renovate/autoMerge.json5 +++ b/.github/renovate/autoMerge.json5 @@ -20,4 +20,4 @@ "matchUpdateTypes": ["minor", "patch"] } ] -} \ No newline at end of file +} diff --git a/.github/renovate/commitMessage.json5 b/.github/renovate/commitMessage.json5 index 1d7ba2f85d..ec34fdb01e 100644 --- a/.github/renovate/commitMessage.json5 +++ b/.github/renovate/commitMessage.json5 @@ -18,4 +18,4 @@ "commitMessageExtra": "to revision {{newVersion}}" } ] -} \ No newline at end of file +} diff --git a/.github/renovate/customDatasources.json5 b/.github/renovate/customDatasources.json5 index c9a7c82fbf..0c15007fda 100644 --- a/.github/renovate/customDatasources.json5 +++ b/.github/renovate/customDatasources.json5 @@ -9,4 +9,4 @@ ] } } -} \ No newline at end of file +} diff --git a/.github/renovate/customManagers.json5 b/.github/renovate/customManagers.json5 index 4de73081fe..2f6a658428 100644 --- a/.github/renovate/customManagers.json5 +++ b/.github/renovate/customManagers.json5 @@ -57,4 +57,4 @@ "versioningTemplate": "redhat" } ] -} \ No newline at end of file +} diff --git a/.github/renovate/groups.json5 b/.github/renovate/groups.json5 index 0e2949671f..e5c6072a1b 100644 --- a/.github/renovate/groups.json5 +++ b/.github/renovate/groups.json5 @@ -59,4 +59,4 @@ "separateMinorPatch": true } ] -} \ No newline at end of file +} diff --git a/.github/renovate/labels.json5 b/.github/renovate/labels.json5 index 734a90c144..485b2529bf 100644 --- a/.github/renovate/labels.json5 +++ b/.github/renovate/labels.json5 @@ -50,4 +50,4 @@ "addLabels": ["renovate/grafana-dashboard"] } ] -} \ No newline at end of file +} diff --git a/.github/renovate/packageRules.json5 b/.github/renovate/packageRules.json5 index d52806828c..15a7a04bed 100644 --- a/.github/renovate/packageRules.json5 +++ b/.github/renovate/packageRules.json5 @@ -8,4 +8,4 @@ "matchPackagePatterns": ["plex", "qbittorrent"] } ] -} \ No newline at end of file +} diff --git a/.github/renovate/semanticCommits.json5 b/.github/renovate/semanticCommits.json5 index 20403e5b07..e58dbff95f 100644 --- a/.github/renovate/semanticCommits.json5 +++ b/.github/renovate/semanticCommits.json5 @@ -118,4 +118,4 @@ "semanticCommitScope": "grafana-dashboard" } ] -} \ No newline at end of file +} diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 29e391dbd9..2eb90fe827 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,6 +3,7 @@ "albert.TabOut", "britesnow.vscode-toggle-quotes", "fcrespo82.markdown-table-formatter", + "mikestead.dotenv", "mitchdenny.ecdc", "redhat.vscode-yaml", "signageos.signageos-vscode-sops", diff --git a/.vscode/settings.json b/.vscode/settings.json index 9436613cdf..f7146a833f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,42 +1,46 @@ { + "editor.bracketPairColorization.enabled": true, + "editor.fontFamily": "FiraCode Nerd Font", + "editor.fontLigatures": true, + "editor.guides.bracketPairs": true, + "editor.guides.bracketPairsHorizontal": true, + "editor.guides.highlightActiveBracketPair": true, + "editor.hover.delay": 1500, + "editor.rulers": [100], + "editor.stickyScroll.enabled": false, + "explorer.autoReveal": false, "files.associations": { "*.json5": "jsonc", - "**/terraform/**/*.tf": "terraform", - "**/kubernetes/**/*.sops.toml": "plaintext" + "./terraform/**/*.tf": "terraform" + }, + "files.trimTrailingWhitespace": true, + "material-icon-theme.files.associations": { + // TODO: https://github.com/PKief/vscode-material-icon-theme/issues/330 + "*.secret.sops.env": "lock", + "*.secret.sops.yaml": "lock" }, "material-icon-theme.folders.associations": { + // .github + ".github": "github", ".taskfiles": "utils", - "bootstrap": "import", - "charts": "kubernetes", - "hack": "scripts", - "repositories": "database", - "terraforms": "terraform", + ".vscode": "vscode", + "kubernetes": "kubernetes", "talos": "core", - "vars": "other", + "terraform": "terraform", // namespaces - "actions-runner-system": "robot", + "actions-runner-system": "github", "cert-manager": "guard", + "default": "home", "democratic-csi": "dump", - "external-secrets": "keys", - "flux-system": "ci", + "flux-system": "pipe", "kube-system": "kubernetes", "media": "video", "monitoring": "event", "networking": "connection", "rook-ceph": "dump", - "security": "guard" - }, - "editor.formatOnSave": false, - "editor.formatOnSaveMode": "file", - "editor.fontFamily": "FiraCode Nerd Font", - "editor.fontLigatures": true, - "editor.bracketPairColorization.enabled": true, - "editor.guides.bracketPairs": true, - "editor.guides.bracketPairsHorizontal": true, - "editor.guides.highlightActiveBracketPair": true, - "editor.hover.delay": 1500, - "editor.stickyScroll.enabled": false, - "editor.rulers": [100], - "explorer.autoReveal": false, - "files.trimTrailingWhitespace": true + "security": "guard", + // apps + "system-upgrade-controller": "update", + "volsync": "aws" + } }