From b9262745cb85424fb305af74713061909e67e464 Mon Sep 17 00:00:00 2001 From: Paul Aumann Date: Mon, 18 Mar 2024 00:36:04 +0100 Subject: [PATCH] layout for gnu stow --- .../Code/User}/keybindings.json | 52 +++--- {vscode => .config/Code/User}/settings.json | 5 +- .../Code/User}/snippets/gbs.code-snippets | 0 .../Code/User}/snippets/markdown.json | 0 .../Code/User}/snippets/py-main.code-snippets | 0 .../Code/User}/snippets/tsx.code-snippets | 0 .config/gSnap/layouts.json | 155 ++++++++++++++++++ .../chrome}/userChrome.css | 0 nano/.nanorc => .nanorc | 0 tmux/.tmux.conf => .tmux.conf | 0 zsh/.zshrc => .zshrc | 22 ++- 11 files changed, 202 insertions(+), 32 deletions(-) rename {vscode => .config/Code/User}/keybindings.json (87%) rename {vscode => .config/Code/User}/settings.json (91%) rename {vscode => .config/Code/User}/snippets/gbs.code-snippets (100%) rename {vscode => .config/Code/User}/snippets/markdown.json (100%) rename {vscode => .config/Code/User}/snippets/py-main.code-snippets (100%) rename {vscode => .config/Code/User}/snippets/tsx.code-snippets (100%) create mode 100644 .config/gSnap/layouts.json rename {firefox => .mozilla/firefox/jcjwalyb.default-release/chrome}/userChrome.css (100%) rename nano/.nanorc => .nanorc (100%) rename tmux/.tmux.conf => .tmux.conf (100%) rename zsh/.zshrc => .zshrc (90%) diff --git a/vscode/keybindings.json b/.config/Code/User/keybindings.json similarity index 87% rename from vscode/keybindings.json rename to .config/Code/User/keybindings.json index 0d85e43..535c48e 100644 --- a/vscode/keybindings.json +++ b/.config/Code/User/keybindings.json @@ -50,57 +50,57 @@ "command": "workbench.files.action.focusFilesExplorer" }, { - "key": "cmd+n", + "key": "ctrl+n", "command": "explorer.newFile", "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus" }, { - "key": "cmd+d", + "key": "ctrl+d", "command": "explorer.newFolder", "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus" }, // ----------------- 3. SYMBOL MANAGEMENT ---------------- { - "key": "shift+cmd+r", + "key": "shift+ctrl+r", "command": "editor.action.rename", "when": "editorHasRenameProvider && editorTextFocus && !editorReadonly" }, { - "key": "shift+cmd+i", + "key": "shift+ctrl+i", "command": "editor.action.peekImplementation", "when": "editorHasImplementationProvider && editorTextFocus && !inReferenceSearchEditor && !isInEmbeddedEditor" }, { - "key": "shift+cmd+d", + "key": "shift+ctrl+d", "command": "editor.action.revealDefinition", "when": "editorHasDefinitionProvider && editorTextFocus && !isInEmbeddedEditor" }, // ------------- 4. VARIOUS EDITOR SHORTCUTS ------------- { - "key": "cmd+d", + "key": "ctrl+d", "command": "editor.action.copyLinesDownAction", "when": "editorTextFocus && !editorReadonly" }, { - "key": "cmd+t", + "key": "ctrl+t", "command": "workbench.action.createTerminalEditor" }, { - "key": "cmd+u", + "key": "ctrl+u", "command": "workbench.action.showAllSymbols" }, { - "key": "cmd+r", + "key": "ctrl+r", "command": "editor.action.startFindReplaceAction", "when": "editorFocus && findInputFocussed" }, { - "key": "shift+cmd+w", + "key": "shift+ctrl+w", "command": "workbench.action.closeAllGroups" }, // ----------------- 4. REMOVED SHORTCUTS ---------------- { - "key": "cmd+d", + "key": "ctrl+d", "command": "-editor.action.addSelectionToNextFindMatch", "when": "editorFocus" }, @@ -110,28 +110,28 @@ "when": "editorTextFocus && !editorReadonly" }, { - "key": "cmd+t", + "key": "ctrl+t", "command": "-workbench.action.showAllSymbols" }, { - "key": "cmd+u", + "key": "ctrl+u", "command": "-cursorUndo", "when": "textInputFocus" }, { - "key": "cmd+k down", + "key": "ctrl+k down", "command": "-workbench.action.moveActiveEditorGroupDown" }, { - "key": "cmd+k left", + "key": "ctrl+k left", "command": "-workbench.action.moveActiveEditorGroupLeft" }, { - "key": "cmd+k right", + "key": "ctrl+k right", "command": "-workbench.action.moveActiveEditorGroupRight" }, { - "key": "cmd+k up", + "key": "ctrl+k up", "command": "-workbench.action.moveActiveEditorGroupUp" }, { @@ -150,20 +150,20 @@ "when": "editorHasRenameProvider && editorTextFocus && !editorReadonly" }, { - "key": "shift+cmd+r", + "key": "shift+ctrl+r", "command": "-rerunSearchEditorSearch", "when": "inSearchEditor" }, { - "key": "shift+cmd+w", + "key": "shift+ctrl+w", "command": "-workbench.action.closeWindow" }, { - "key": "cmd+k shift+cmd+w", + "key": "ctrl+k shift+ctrl+w", "command": "-workbench.action.closeAllGroups" }, { - "key": "shift+cmd+d", + "key": "shift+ctrl+d", "command": "-workbench.view.debug", "when": "viewContainer.workbench.view.debug.enabled" }, @@ -173,26 +173,26 @@ "when": "editorHasDefinitionProvider && editorTextFocus && !isInEmbeddedEditor" }, { - "key": "shift+cmd+[Comma] cmd+i", + "key": "shift+ctrl+[Comma] ctrl+i", "command": "-testing.toggleInlineTestOutput" }, { - "key": "shift+cmd+i", + "key": "shift+ctrl+i", "command": "-workbench.action.quickchat.toggle", "when": "hasChatProvider" }, { - "key": "shift+cmd+[Comma] shift+cmd+i", + "key": "shift+ctrl+[Comma] shift+ctrl+i", "command": "-testing.toggleInlineCoverage", "when": "testing.isTestCoverageOpen" }, { - "key": "cmd+f12", + "key": "ctrl+f12", "command": "-editor.action.goToImplementation", "when": "editorHasImplementationProvider && editorTextFocus && !isInEmbeddedEditor" }, { - "key": "shift+cmd+f12", + "key": "shift+ctrl+f12", "command": "-editor.action.peekImplementation", "when": "editorHasImplementationProvider && editorTextFocus && !inReferenceSearchEditor && !isInEmbeddedEditor" }, diff --git a/vscode/settings.json b/.config/Code/User/settings.json similarity index 91% rename from vscode/settings.json rename to .config/Code/User/settings.json index a8820f6..9bdda4a 100644 --- a/vscode/settings.json +++ b/.config/Code/User/settings.json @@ -1,8 +1,8 @@ { // // Appearance - "workbench.colorTheme": "Monokai Pro (Filter Octagon)", - "workbench.iconTheme": "Monokai Pro (Filter Octagon) Icons", + "workbench.colorTheme": "Monokai Pro", + "workbench.iconTheme": "Monokai Pro Icons", "editor.fontFamily": "Fira Code, Menlo, Monaco, 'Courier New', monospace", "editor.fontSize": 18, "editor.fontWeight": "normal", @@ -11,6 +11,7 @@ "editor.minimap.renderCharacters": false, "editor.suggestSelection": "first", "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue", + "window.titleBarStyle": "custom", // // Excluded files and directories "files.exclude": { diff --git a/vscode/snippets/gbs.code-snippets b/.config/Code/User/snippets/gbs.code-snippets similarity index 100% rename from vscode/snippets/gbs.code-snippets rename to .config/Code/User/snippets/gbs.code-snippets diff --git a/vscode/snippets/markdown.json b/.config/Code/User/snippets/markdown.json similarity index 100% rename from vscode/snippets/markdown.json rename to .config/Code/User/snippets/markdown.json diff --git a/vscode/snippets/py-main.code-snippets b/.config/Code/User/snippets/py-main.code-snippets similarity index 100% rename from vscode/snippets/py-main.code-snippets rename to .config/Code/User/snippets/py-main.code-snippets diff --git a/vscode/snippets/tsx.code-snippets b/.config/Code/User/snippets/tsx.code-snippets similarity index 100% rename from vscode/snippets/tsx.code-snippets rename to .config/Code/User/snippets/tsx.code-snippets diff --git a/.config/gSnap/layouts.json b/.config/gSnap/layouts.json new file mode 100644 index 0000000..d1b0ee4 --- /dev/null +++ b/.config/gSnap/layouts.json @@ -0,0 +1,155 @@ +{ + "workspaces": [ + [ + { + "current": 2 + }, + { + "current": 3 + } + ], + [ + { + "current": 2 + }, + { + "current": 3 + } + ] + ], + "definitions": [ + { + "name": "None", + "type": 0, + "length": 100, + "items": [] + }, + { + "name": "Default Monitor 0", + "type": 0, + "length": 100, + "items": [ + { + "length": 33.358974358974365, + "items": [] + }, + { + "length": 66.64102564102564, + "items": [] + } + ] + }, + { + "name" : "Default Monitor 1", + "type" : 1, + "length": 100, + "items" : [ + { + "length": 38 + }, + { + "length" : 62 + } + ] + }, + { + "name": "2 Column Split", + "type": 0, + "length": 100, + "items": [ + { + "type": 1, + "length": 50, + "items": [] + }, + { + "type": 1, + "length": 50, + "items": [] + } + ] + }, + { + "name": "3 Column", + "type": 0, + "length": 100, + "items": [ + { + "type": 1, + "length": 33, + "items": [] + }, + { + "type": 1, + "length": 34, + "items": [] + }, + { + "type": 1, + "length": 33, + "items": [] + } + ] + }, + { + "name": "3 Column (Focused)", + "type": 0, + "length": 100, + "items": [ + { + "type": 1, + "length": 25, + "items": [] + }, + { + "type": 1, + "length": 50, + "items": [] + }, + { + "type": 1, + "length": 25, + "items": [] + } + ] + }, + { + "name": "3 Columns (Custom)", + "type": 0, + "length": 100, + "items": [ + { + "type": 1, + "length": 42, + "items": [] + }, + { + "type": 1, + "length": 16, + "items": [ + { + "type": 0, + "length": 33, + "items": [] + }, + { + "type": 0, + "length": 34, + "items": [] + }, + { + "type": 0, + "length": 33, + "items": [] + } + ] + }, + { + "type": 1, + "length": 42, + "items": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/firefox/userChrome.css b/.mozilla/firefox/jcjwalyb.default-release/chrome/userChrome.css similarity index 100% rename from firefox/userChrome.css rename to .mozilla/firefox/jcjwalyb.default-release/chrome/userChrome.css diff --git a/nano/.nanorc b/.nanorc similarity index 100% rename from nano/.nanorc rename to .nanorc diff --git a/tmux/.tmux.conf b/.tmux.conf similarity index 100% rename from tmux/.tmux.conf rename to .tmux.conf diff --git a/zsh/.zshrc b/.zshrc similarity index 90% rename from zsh/.zshrc rename to .zshrc index 70c05c8..3780851 100644 --- a/zsh/.zshrc +++ b/.zshrc @@ -70,7 +70,7 @@ DISABLE_UNTRACKED_FILES_DIRTY="true" # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git zsh-autosuggestions macos pip pyenv docker autojump colorize copyfile brew) +plugins=(git zsh-autosuggestions macos pip pyenv docker colorize copyfile brew) source $ZSH/oh-my-zsh.sh @@ -100,11 +100,20 @@ fi # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" +# pyenv stuff export PYENV_ROOT="$HOME/.pyenv" command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" +# Reboot to Windows +reboot_windows() +{ + windows_title=$(grep -i windows /boot/grub/grub.cfg | cut -d "'" -f 2) + sudo grub-reboot "$windows_title" && sudo reboot +} +alias reboot-windows='reboot_windows' + # Command aliases alias py=python3 alias ll="ls -lah" @@ -124,6 +133,7 @@ alias home="cd ~" alias userchrome="$EDITOR /Users/paul/Library/Application\ Support/Firefox/Profiles/k37hu3wo.default-release/chrome/userChrome.css" alias kw='echo Current Week: $((10#$(date +"%V")))' alias wol=wakeonlan +alias ge=gnome-extensions # Python tkinter stuff export PATH="/usr/local/opt/tcl-tk/bin:$PATH" @@ -142,19 +152,23 @@ alias mount-ds='[ -e "/Volumes/pauls-dateien" ] || open "smb://paul@192.168.193. # vscode shortcuts alias ma="code --folder-uri=vscode-remote://ssh-remote+sralab/home/2021/pau.aumann/ma" -alias ws="code ~/Code/wasteside-v2" +alias ws="code ~/code/wasteside" # iTerm2 integration -source ~/.iterm2_shell_integration.zsh +# source ~/.iterm2_shell_integration.zsh # history HISTFILE=~/.histfile HISTSIZE=10000 SAVEHIST=10000 +# reload "blur my shell" +alias blur-my-shell="gnome-extensions disable blur-my-shell@aunetx && gnome-extensions enable blur-my-shell@aunetx" +alias bms=blur-my-shell + # zoxide eval "$(zoxide init --cmd cd zsh)" # SDKMAN & Java export SDKMAN_DIR="$HOME/.sdkman" -[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" \ No newline at end of file +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"