Skip to content

Commit d362b16

Browse files
ivankatliarchukivankatliarchuk
committed
vscode
1 parent 9002ac1 commit d362b16

File tree

3 files changed

+141
-135
lines changed

3 files changed

+141
-135
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
11
repos:
2-
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.0.1
4-
hooks:
5-
- id: check-added-large-files
6-
args: ['--maxkb=700']
7-
- id: check-ast
8-
- id: check-builtin-literals
9-
- id: check-case-conflict
10-
- id: check-docstring-first
11-
- id: check-executables-have-shebangs
12-
- id: check-json
13-
- id: check-merge-conflict
14-
- id: check-symlinks
15-
- id: check-toml
16-
- id: check-vcs-permalinks
17-
- id: check-xml
18-
- id: check-yaml
19-
- id: debug-statements
20-
- id: destroyed-symlinks
21-
- id: detect-aws-credentials
22-
args: ['--allow-missing-credentials']
23-
- id: detect-private-key
24-
- id: double-quote-string-fixer
25-
- id: end-of-file-fixer
26-
- id: fix-byte-order-marker
27-
- id: fix-encoding-pragma
28-
- id: mixed-line-ending
29-
args: ['--fix=lf']
30-
description: Forces to replace line ending by the UNIX 'lf' character.
31-
- id: pretty-format-json
32-
args: ['--autofix', '--indent=2']
33-
- id: requirements-txt-fixer
34-
- id: sort-simple-yaml
35-
- id: trailing-whitespace
36-
- id: no-commit-to-branch
37-
args: [--branch, master, --branch, main]
38-
- repo: git://github.com/johncblandii/pre-commit-makefile
39-
rev: 261f8fb4b31dfdc05d1a1d7fbde1f1462ecde66d
40-
hooks:
41-
- id: makefile-doc
42-
- repo: meta
43-
hooks:
44-
- id: check-useless-excludes
45-
- repo: https://github.com/gruntwork-io/pre-commit
46-
# Get the latest from: https://github.com/gruntwork-io/pre-commit/releases
47-
rev: v0.1.12
48-
hooks:
49-
- id: shellcheck
50-
- repo: https://github.com/asottile/reorder_python_imports
51-
rev: v2.6.0
52-
hooks:
53-
- id: reorder-python-imports
54-
language_version: python3
55-
- repo: https://github.com/Yelp/detect-secrets
56-
rev: v1.1.0
57-
hooks:
58-
- id: detect-secrets
59-
args: ['--baseline', '.secrets.baseline']
60-
exclude: .pre-commit-config.yaml
61-
- repo: https://github.com/markdownlint/markdownlint
62-
rev: v0.11.0
63-
hooks:
64-
- id: markdownlint
65-
name: Markdownlint
66-
description: Run markdownlint on your Markdown files
67-
entry: mdl
68-
language: ruby
69-
files: \.(md|mdown|markdown)$
70-
- repo: https://github.com/adrienverge/yamllint.git
71-
rev: v1.26.3
72-
hooks:
73-
- id: yamllint
74-
files: \.(yaml|yml)$
75-
types: [file, yaml]
76-
entry: 'yamllint --strict'
77-
- repo: https://github.com/thlorenz/doctoc
78-
rev: v2.0.1
79-
hooks:
80-
- id: doctoc
81-
args: ['--title=**Table of Contents**']
82-
descripiton: 'Generates table of contents for markdown files'
83-
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
84-
rev: v5.0.0
85-
hooks:
86-
- id: commitlint
87-
stages: [commit-msg]
88-
additional_dependencies: ["@commitlint/config-conventional"]
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v4.0.1
4+
hooks:
5+
- id: check-added-large-files
6+
args: ["--maxkb=700"]
7+
- id: check-ast
8+
- id: check-builtin-literals
9+
- id: check-case-conflict
10+
- id: check-docstring-first
11+
- id: check-executables-have-shebangs
12+
- id: check-json
13+
- id: check-merge-conflict
14+
- id: check-symlinks
15+
- id: check-toml
16+
- id: check-vcs-permalinks
17+
- id: check-xml
18+
- id: check-yaml
19+
- id: debug-statements
20+
- id: destroyed-symlinks
21+
- id: detect-aws-credentials
22+
args: ["--allow-missing-credentials"]
23+
- id: detect-private-key
24+
- id: double-quote-string-fixer
25+
- id: end-of-file-fixer
26+
- id: fix-byte-order-marker
27+
- id: fix-encoding-pragma
28+
- id: mixed-line-ending
29+
args: ["--fix=lf"]
30+
description: Forces to replace line ending by the UNIX 'lf' character.
31+
- id: pretty-format-json
32+
args: ["--autofix", "--indent=2"]
33+
- id: requirements-txt-fixer
34+
- id: sort-simple-yaml
35+
- id: trailing-whitespace
36+
- id: no-commit-to-branch
37+
args: [--branch, master, --branch, main]
38+
- repo: git://github.com/johncblandii/pre-commit-makefile
39+
rev: 261f8fb4b31dfdc05d1a1d7fbde1f1462ecde66d
40+
hooks:
41+
- id: makefile-doc
42+
- repo: meta
43+
hooks:
44+
- id: check-useless-excludes
45+
- repo: https://github.com/gruntwork-io/pre-commit
46+
# Get the latest from: https://github.com/gruntwork-io/pre-commit/releases
47+
rev: v0.1.12
48+
hooks:
49+
- id: shellcheck
50+
- repo: https://github.com/asottile/reorder_python_imports
51+
rev: v2.6.0
52+
hooks:
53+
- id: reorder-python-imports
54+
language_version: python3
55+
- repo: https://github.com/Yelp/detect-secrets
56+
rev: v1.1.0
57+
hooks:
58+
- id: detect-secrets
59+
args: ["--baseline", ".secrets.baseline"]
60+
exclude: .pre-commit-config.yaml
61+
- repo: https://github.com/markdownlint/markdownlint
62+
rev: v0.11.0
63+
hooks:
64+
- id: markdownlint
65+
name: Markdownlint
66+
description: Run markdownlint on your Markdown files
67+
entry: mdl
68+
language: ruby
69+
files: \.(md|mdown|markdown)$
70+
- repo: https://github.com/adrienverge/yamllint.git
71+
rev: v1.26.3
72+
hooks:
73+
- id: yamllint
74+
files: \.(yaml|yml)$
75+
types: [file, yaml]
76+
entry: "yamllint --strict"
77+
- repo: https://github.com/thlorenz/doctoc
78+
rev: v2.0.1
79+
hooks:
80+
- id: doctoc
81+
args: ["--title=**Table of Contents**"]
82+
descripiton: "Generates table of contents for markdown files"
83+
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
84+
rev: v5.0.0
85+
hooks:
86+
- id: commitlint
87+
stages: [commit-msg]
88+
additional_dependencies: ["@commitlint/config-conventional"]

‎install.conf.yaml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@
4646
# force: true
4747
# create: true
4848
~/Library/ApplicationSupport/iTerm2/DynamicProfiles:
49-
if: '[ `uname` = Darwin ]'
49+
if: "[ `uname` = Darwin ]"
5050
path: terminal/iTerm/profiles
5151
force: true
5252
~/.config/iTerm2/colors/material-design-colors.itermcolors:
53-
if: '[ `uname` = Darwin ]'
53+
if: "[ `uname` = Darwin ]"
5454
path: vendor/iterm2-material-design/material-design-colors.itermcolors
5555
force: true
5656
~/.config/iTerm2/xsfce-v2.png:
57-
if: '[ `uname` = Darwin ]'
57+
if: "[ `uname` = Darwin ]"
5858
path: terminal/iTerm/xsfce-v2.png
5959
force: true
6060
~/.config/starship: terminal/starship
@@ -79,23 +79,27 @@
7979
~/.zprezto: vendor/prezto
8080
~/.bash-it: vendor/bash-it
8181
# vscode
82-
~/Library/ApplicationSupport/Code/User/settings.json: tools/vscode/settings.json
83-
~/Library/ApplicationSupport/Code/User/keybindings.json: tools/vscode/keybindings.json
84-
~/Library/Application Support/Code/User/settings.json: tools/vscode/settings.json
85-
~/Library/Application Support/Code/User/keybindings.json: tools/vscode/keybindings.json
86-
82+
~/Library/ApplicationSupport/Code/User/settings.json:
83+
path: tools/vscode/settings.json
84+
force: true
85+
~/Library/ApplicationSupport/Code/User/keybindings.json:
86+
path: tools/vscode/keybindings.json
87+
force: true
88+
~/Library/Application Support/Code/User/settings.json:
89+
path: tools/vscode/settings.json
90+
force: true
91+
~/Library/Application Support/Code/User/keybindings.json:
92+
path: tools/vscode/keybindings.json
93+
force: true
8794

8895
- shell:
8996
- command: git submodule update --init --recursive
9097
description: Installing submodules
91-
-
92-
command: make install-deps
98+
- command: make install-deps
9399
description: Installing dependencies, go, python, osx
94-
-
95-
command: make brew-install
100+
- command: make brew-install
96101
description: Manage Brew
97-
-
98-
command: echo "My current 'shell' is '$SHELL'"
102+
- command: echo "My current 'shell' is '$SHELL'"
99103
description: Check current shell
100104

101105
# - chsh -s $(which zsh)

‎tools/vscode/settings.json‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"files.autoSave": "afterDelay",
3-
"files.autoSaveDelay": "100",
3+
"files.autoSaveDelay": 100,
44
"files.eol": "\n",
5+
"files.encoding": "utf8",
56
"files.exclude": {
67
"**/.DS_Store": false,
78
"**/.git": true,
@@ -15,7 +16,38 @@
1516
"**/.settings": false,
1617
"**/.factorypath": true
1718
},
18-
"files.encoding": "utf8",
19+
"files.associations": {
20+
"Dockerfile*": "dockerfile",
21+
"*Dockerfile": "dockerfile",
22+
"*.go ": "go",
23+
"*.hcl": "terraform",
24+
"*.tf": "terraform",
25+
"**/defaults/**/*": "ansible",
26+
"**/tasks/**/*.yml": "ansible",
27+
"**/handler/*.yml": "ansible",
28+
"**/*_vars/**/*.yml": "ansible",
29+
"**/roles/**/*.yml": "ansible",
30+
"**/playbooks/**/*.yml": "ansible",
31+
"**/*ansible*/**/*.yml": "ansible",
32+
"**/vars/**/*.yml": "ansible",
33+
"**/inventory/*/*": "ansible",
34+
"Brewfile": "ruby",
35+
"Brewfile.*": "ruby",
36+
"Vagrantfile*": "ruby",
37+
"*Vagrantfile": "ruby",
38+
"Fastfile": "ruby",
39+
"Fastfile*": "ruby",
40+
"**/*.cmd": "shellscript",
41+
"**/aliase/*": "shellscript",
42+
"**/aliases": "shellscript",
43+
"**/aliases.*": "shellscript",
44+
"*.cmd": "shellscript",
45+
".yamllint": "yaml",
46+
"*.jsx": "javascriptreact",
47+
"*.js": "javascriptreact",
48+
"*.tpl": "json",
49+
"*.tmpl": "json"
50+
},
1951
"editor.fontWeight": "normal",
2052
"editor.lineHeight": 0,
2153
// narrow space betwwen panes
@@ -248,35 +280,6 @@
248280
"--max-line-length=180"
249281
],
250282
"editor.formatOnSave": true,
251-
"files.associations": {
252-
"Dockerfile*": "dockerfile",
253-
"*Dockerfile": "dockerfile",
254-
"*.go ": "go",
255-
"*.tpl": "json",
256-
"*.hcl": "terraform",
257-
"*.tf": "terraform",
258-
"**/defaults/**/*": "ansible",
259-
"**/tasks/**/*.yml": "ansible",
260-
"**/handler/*.yml": "ansible",
261-
"**/*_vars/**/*.yml": "ansible",
262-
"**/roles/**/*.yml": "ansible",
263-
"**/playbooks/**/*.yml": "ansible",
264-
"**/*ansible*/**/*.yml": "ansible",
265-
"**/vars/**/*.yml": "ansible",
266-
"**/inventory/*/*": "ansible",
267-
"Brewfile": "ruby",
268-
"Brewfile.*": "ruby",
269-
"Vagrantfile*": "ruby",
270-
"*Vagrantfile": "ruby",
271-
"Fastfile": "ruby",
272-
"Fastfile*": "ruby",
273-
"**/*.cmd": "shellscript",
274-
"**/aliase/*": "shellscript",
275-
"**/aliases": "shellscript",
276-
"**/aliases.*": "shellscript",
277-
"*.cmd": "shellscript",
278-
".yamllint": "yaml"
279-
},
280283
"references.preferredLocation": "view",
281284
"editor.suggestSelection": "first",
282285
"[html]": {
@@ -304,6 +307,5 @@
304307
},
305308
"window.zoomLevel": 0,
306309
"python.analysis.completeFunctionParens": true,
307-
"redhat.telemetry.enabled": false,
308-
"bracketPairColorizer.depreciation-notice": false
309-
}
310+
"redhat.telemetry.enabled": false
311+
}

0 commit comments

Comments
 (0)