From 18c979e8bdf2a4ed302d1d4c6f27047dc4ede70d Mon Sep 17 00:00:00 2001 From: thomasabishop Date: Fri, 20 Jan 2023 08:01:36 +0000 Subject: [PATCH] changes --- AlienBLoodTerminator.config | 6 ++++ AlienBlood.colorscheme | 64 +++++++++++++++++++++++++++++++++++++ vscode/settings.json | 48 +++++++++++----------------- zsh/zshrc | 48 ++++++++-------------------- 4 files changed, 102 insertions(+), 64 deletions(-) create mode 100644 AlienBLoodTerminator.config create mode 100644 AlienBlood.colorscheme diff --git a/AlienBLoodTerminator.config b/AlienBLoodTerminator.config new file mode 100644 index 0000000..8b7054d --- /dev/null +++ b/AlienBLoodTerminator.config @@ -0,0 +1,6 @@ +[[AlienBlood]] + palette = "#112616:#7f2b27:#2f7e25:#717f24:#2f6a7f:#47587f:#327f77:#647d75:#3c4812:#e08009:#18e000:#bde000:#00aae0:#0058e0:#00e0c4:#73fa91" + background_color = "#0f1610" + cursor_color = "#73fa91" + foreground_color = "#637d75" + background_image = None diff --git a/AlienBlood.colorscheme b/AlienBlood.colorscheme new file mode 100644 index 0000000..5da886c --- /dev/null +++ b/AlienBlood.colorscheme @@ -0,0 +1,64 @@ +[General] +Description=AlienBlood +Opacity=1 +Wallpaper= + +[Background] +Color=15,22,16 + +[BackgroundIntense] +Color=15,22,16 + +[Foreground] +Color=99,125,117 + +[ForegroundIntense] +Color=122,250,135 + +[Color0] +Color=17,38,22 + +[Color1] +Color=127,43,39 + +[Color2Intense] +Color=24,224,0 + +[Color3Intense] +Color=189,224,0 + +[Color4Intense] +Color=0,170,224 + +[Color5Intense] +Color=0,88,224 + +[Color6Intense] +Color=0,224,196 + +[Color7Intense] +Color=115,250,145 + +[Color2] +Color=47,126,37 + +[Color3] +Color=113,127,36 + +[Color4] +Color=47,106,127 + +[Color5] +Color=71,88,127 + +[Color6] +Color=50,127,119 + +[Color7] +Color=100,125,117 + +[Color0Intense] +Color=60,72,18 + +[Color1Intense] +Color=224,128,9 diff --git a/vscode/settings.json b/vscode/settings.json index c66d540..f62dc87 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -1,7 +1,7 @@ { - "editor.fontFamily": "Jetbrains Mono Light", + "editor.fontFamily": "PragmataPro Mono Liga", "editor.fontLigatures": true, - "editor.fontSize": 14, + "editor.fontSize": 16, "editor.fontWeight": 400, "editor.formatOnPaste": false, "editor.wordWrap": "on", @@ -9,24 +9,17 @@ "editor.smoothScrolling": true, "editor.formatOnSave": true, "editor.bracketPairColorization.enabled": true, - "terminal.integrated.fontFamily": "Jetbrains Mono", - "terminal.integrated.fontSize": 13, - "terminal.integrated.fontWeight": "300", + "terminal.integrated.fontFamily": "PragmataPro Mono Liga", + "terminal.integrated.fontSize": 15, "terminal.integrated.tabs.enabled": true, - "debug.console.fontFamily": "Jetbrains Mono", - "debug.console.fontSize": 12, + "debug.console.fontFamily": "PragmataPro Mono Liga", + "debug.console.fontSize": 15, "explorer.confirmDelete": false, "workbench.list.smoothScrolling": true, "workbench.startupEditor": "none", "workbench.colorCustomizations": { "scrollbar.shadow": "#ffffff00" }, - "todo-tree.highlights.defaultHighlight": { - "icon": "alert", - "background": "#112616", - "foreground": "#bde000" - }, - "markdown-preview-enhanced.previewTheme": "atom-light.css", "diffEditor.codeLens": true, "git.mergeEditor": false, "npm.enableRunFromFolder": true, @@ -53,7 +46,7 @@ { "scope": "comment", "settings": { - "fontStyle": "italic" + "fontStyle": "" } }, { @@ -84,11 +77,20 @@ "gitlens.advanced.messages": { "suppressGitMissingWarning": true }, - - "window.titleBarStyle": "custom", "npm.keybindingsChangedWarningShown": true, "debug.onTaskErrors": "debugAnyway", - "[markdown]": { + "editor.stickyScroll.enabled": true, + "gitlens.views.branches.branches.layout": "list", + "files.insertFinalNewline": true, + "workbench.iconTheme": "bearded-icons", + "workbench.colorTheme": "Alien Blood ", + "[shellscript]": { + "editor.defaultFormatter": "shakram02.bash-beautify" + }, + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, +"[markdown]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[typescriptreact]": { @@ -97,16 +99,4 @@ "[scss]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "editor.stickyScroll.enabled": true, - "gitlens.views.branches.branches.layout": "list", - "files.insertFinalNewline": true, - "cSpell.userWords": ["colour", "colours"], - "workbench.iconTheme": "bearded-icons", - "workbench.colorTheme": "Alien Blood ", - "[shellscript]": { - "editor.defaultFormatter": "shakram02.bash-beautify" - }, - "[css]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - } } diff --git a/zsh/zshrc b/zsh/zshrc index 7ca6b4d..67db1f1 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -6,46 +6,24 @@ alias grep="rg" alias chrome="google-chrome-stable" alias spot="ncspot" alias xhd="cd /run/media/thomas" +alias cs-save="/home/thomas/repos/bash_scripts/automate_commit.sh" +alias cs-clean="" +alias cs-all="" # Set properties based on OS -case "$OSTYPE" in - darwin*) - # Mac specific - ZSH_THEME=spaceship - SPACESHIP_PACKAGE_SHOW=true - SPACESHIP_TIME_SHOW=true - SPACESHIP_NODE_SHOW=true - SPACESHIP_PACKAGE_SYMBOL="" - SPACESHIP_NODE_SYMBOL="" - SPACESHIP_PACKAGE_COLOR="#e08009" - SPACESHIP_GIT_BRANCH_COLOR="#00aae0" - SPACESHIP_DIR_COLOR="#18e000" - SPACESHIP_TIME_COLOR="#bde000" - SPACESHIP_EXEC_TIME_SHOW=true - ;; - linux*) - # Linux specific - #ZSH_THEME=agnoster-customized - ZSH_THEME=spaceship - SPACESHIP_PACKAGE_SHOW=true - SPACESHIP_TIME_SHOW=true - SPACESHIP_NODE_SHOW=true - SPACESHIP_PACKAGE_SHOW=true - SPACESHIP_TIME_SHOW=true - SPACESHIP_NODE_SHOW=true - SPACESHIP_PACKAGE_SYMBOL="" - SPACESHIP_NODE_SYMBOL="" - - ;; -esac - -plugins=(git npm zsh-syntax-highlighting) +ZSH_THEME=spaceship +SPACESHIP_TIME_SHOW=false +SPACESHIP_PROMPT_ASYNC=true +SPACESHIP_CHAR_SYMBOL="▶ " +#SPACESHIP_CHAR_SUFFIX="}" +plugins=(git npm zsh-autosuggestions zsh-syntax-highlighting) # User configuration source $ZSH/oh-my-zsh.sh -export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" -export LC_ALL=en_GB.UTF-8 + + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion