Skip to content

Commit

Permalink
Some updates
Browse files Browse the repository at this point in the history
  • Loading branch information
gggritso committed Jun 10, 2022
1 parent 25a03ae commit 5f181a9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
13 changes: 7 additions & 6 deletions VSCode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
"editor.snippetSuggestions": "top",
"editor.insertSpaces": true,
"editor.renderWhitespace": "selection",
"editor.renderIndentGuides": false,
"editor.trimAutoWhitespace": false,
"editor.cursorStyle": "block",
"editor.cursorBlinking": "blink",
"editor.renderLineHighlight": "none",
"editor.hideCursorInOverviewRuler": true,
"editor.multiCursorModifier": "ctrlCmd",
"editor.autoIndent": true,
"editor.autoIndent": "full",
"editor.colorDecorators": false,
"editor.minimap.enabled": false,
"editor.minimap.renderCharacters": false,
Expand All @@ -34,7 +33,7 @@
"*.js": "javascriptreact"
},
"terminal.external.osxExec": "iTerm.app",
"workbench.colorTheme": "Solarized Light",
"workbench.colorTheme": "Solarized Dark",
"workbench.editor.enablePreviewFromQuickOpen": false,
"workbench.sideBar.location": "left",
"workbench.activityBar.visible": false,
Expand Down Expand Up @@ -68,7 +67,7 @@
"editor.formatOnSave": false
},
"[html]": {
"editor.formatOnSave": false,
"editor.formatOnSave": false
},
"[haml]": {
"editor.tabSize": 2,
Expand Down Expand Up @@ -163,7 +162,9 @@
],
"terminal.integrated.copyOnSelection": true,
"javascript.updateImportsOnFileMove.enabled": "always",
"vscode-neovim.neovimExecutablePaths.darwin": "/usr/local/bin/nvim",
"vscode-neovim.neovimExecutablePaths.darwin": "/opt/homebrew/bin/nvim",
"terminal.integrated.defaultProfile.osx": "fish",
"editor.bracketPairColorization.enabled": true
"editor.bracketPairColorization.enabled": true,
"prettier.requireConfig": true,
"editor.guides.indentation": false
}
5 changes: 2 additions & 3 deletions eslintrc.symlink
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"plugins": ["prettier"],
"plugins": [],
"rules": {
"linebreak-style": [2, "unix"],
"no-multi-spaces": 1,
Expand All @@ -20,7 +20,6 @@
2,
{ "min": 2, "exceptions": ["$", "q", "s", "i", "x", "y"] }
],
"prettier/prettier": "error"
},
"env": {
"browser": true,
Expand All @@ -30,5 +29,5 @@
"parserOptions": {
"ecmaVersion": 2015
},
"extends": ["eslint:recommended", "plugin:prettier/recommended"]
"extends": ["eslint:recommended"]
}
6 changes: 5 additions & 1 deletion fish/config.fish
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
set -U EDITOR nvim
set -gx EDITOR nvim

eval (/opt/homebrew/bin/brew shellenv)
status --is-interactive; and rbenv init - fish | source

status is-login; and pyenv init --path | source
status is-interactive; and pyenv init - | source

set __fish_git_prompt_showdirtystate 'yes'
set __fish_git_prompt_showupstream 'yes'
Expand Down
1 change: 1 addition & 0 deletions fish/fish_plugins
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
jorgebucaran/fisher
jethrokuan/z
gggritso/fishy
jorgebucaran/nvm.fish

0 comments on commit 5f181a9

Please sign in to comment.