diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 48f24a7..e142455 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -28,18 +28,20 @@ mouse_hide_wait 3.0 focus_follows_mouse no ## Mappings -map ctrl+shift+1 goto_tab 1 -map ctrl+shift+2 goto_tab 2 -map ctrl+shift+3 goto_tab 3 -map ctrl+shift+4 goto_tab 4 -map ctrl+shift+5 goto_tab 5 +map alt+1 goto_tab 1 +map alt+2 goto_tab 2 +map alt+3 goto_tab 3 +map alt+4 goto_tab 4 +map alt+5 goto_tab 5 +map alt+5 goto_tab 6 +map alt+5 goto_tab 7 +map ctrl+shift+t new_tab_with_cwd map ctrl+equal change_font_size all +1 map ctrl+minus change_font_size all -1 map ctrl+backspace change_font_size all 0 ## Colors -background #1E1E29 -# background #1e1e1e +background #2E3440 foreground #d4d4d4 selection_background #d7ba7d diff --git a/vscode/settings.json b/vscode/settings.json index 0ae9515..20a70ba 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -1,14 +1,15 @@ { - "workbench.colorTheme": "Default Dark+", + "workbench.colorTheme": "Nord", "workbench.iconTheme": "material-icon-theme", - "workbench.sideBar.location": "right", + "workbench.sideBar.location": "left", "workbench.startupEditor": "none", - "workbench.activityBar.visible": false, + "workbench.activityBar.visible": true, "window.menuBarVisibility": "toggle", "update.showReleaseNotes": false, // Font "editor.fontSize": 16, "terminal.integrated.fontSize": 15, + "go.testExplorer.enable": true, // Editor "editor.fontFamily": "'Jetbrains Mono'", "editor.cursorSmoothCaretAnimation": false, @@ -71,5 +72,7 @@ "workbench.editorAssociations": { "*.mp4": "default" }, - "liveServer.settings.donotVerifyTags": true + "liveServer.settings.donotVerifyTags": true, + "diffEditor.ignoreTrimWhitespace": false, + "gitlens.hovers.currentLine.over": "line" } \ No newline at end of file diff --git a/zshrc b/zshrc index e413cba..889fe88 100644 --- a/zshrc +++ b/zshrc @@ -4,7 +4,7 @@ export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yar export EDITOR="nvim" ## Oh my zsh -plugins=(dotenv extract) +plugins=(dotenv asdf) ZSH_THEME="simple" DISABLE_AUTO_TITLE="true" source $HOME/.oh-my-zsh/oh-my-zsh.sh @@ -18,7 +18,8 @@ alias cls="clear" cp="cp -r" mkdir="mkdir -p" alias gor="go run" gob="go build" gog="go get" alias ...="cd ../.." .3="cd ../../.." alias v="nvim" vim="v" vi="vim" -alias asdfi=". /opt/asdf-vm/asdf.sh" sdki=". $HOME/.sdkman/bin/sdkman-init.sh" +alias sdki=". $HOME/.sdkman/bin/sdkman-init.sh" +alias asdfi=". $HOME/.asdf/asdf.sh" if [[ -f "/bin/exa" ]]; then alias ls="exa -l" ll="ls" la="ls -a"