diff --git a/vscode/settings.json b/vscode/settings.json index 7a98fec..ae87727 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -1,5 +1,5 @@ { - "workbench.colorTheme": "GitHub Light", + "workbench.colorTheme": "Quiet Light", "workbench.iconTheme": "material-icon-theme", "workbench.sideBar.location": "left", "workbench.startupEditor": "none", @@ -22,7 +22,7 @@ "editor.wordWrap": "off", "editor.tabSize": 4, // Files - "explorer.compactFolders": false, + "explorer.compactFolders": true, "explorer.confirmDragAndDrop": false, "explorer.confirmDelete": false, "files.trimTrailingWhitespace": true, @@ -41,13 +41,13 @@ "go.lintOnSave": "package", "go.lintTool": "golangci-lint", "go.formatTool": "gofumpt", + "python.formatting.provider": "black", + "python.analysis.autoImportCompletions": true, + "python.formatting.blackPath": "~/.local/bin/black", "[go]": { "editor.insertSpaces": false }, "[python]": { - "python.formatting.provider": "black", - "python.analysis.autoImportCompletions": true, - "python.formatting.blackPath": "~/.local/bin/black", "editor.tabSize": 4 }, "[javascript]": { @@ -59,5 +59,8 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "typescript.suggestionActions.enabled": false, "editor.tabSize": 2 + }, + "files.associations": { + "justfile": "makefile" } -} +} \ No newline at end of file diff --git a/zshrc b/zshrc index e7abce8..e64cce4 100644 --- a/zshrc +++ b/zshrc @@ -1,6 +1,6 @@ ## Variables export GOPATH="$HOME/go" -export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$HOME/.luarocks/bin:$HOME/.cargo/bin:$PATH" +export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$HOME/.cargo/bin:$PATH" export EDITOR="nvim" ## Oh my zsh @@ -15,9 +15,9 @@ eval "$(zoxide init zsh)" ## Aliases alias cls="clear" cp="cp -r" mkdir="mkdir -p" -alias gor="go run" gob="go build" gog="go get" goi="go install" got="go test" gov="go vet" +alias gor="go run" gob="go build" gog="go get" alias ...="cd ../.." .3="cd ../../.." -alias v="nvim" vim="v" asdfi=". /opt/asdf-vm/asdf.sh" +alias v="nvim" vim="v" vi="vim" asdfi=". /opt/asdf-vm/asdf.sh" if [[ -f "/bin/exa" ]]; then alias ls="exa -l" ll="ls" la="ls -a"