diff --git a/Shell/Scripts/OCR b/Shell/Scripts/OCR index d8631d8..5650c54 100755 --- a/Shell/Scripts/OCR +++ b/Shell/Scripts/OCR @@ -1,4 +1,4 @@ -#! /bin/zsh +#!/bin/zsh BASE=/tmp/tesseracttemp_$$ TMP=$BASE.txt diff --git a/Shell/Scripts/backup b/Shell/Scripts/backup index 3877078..1bbe092 100755 --- a/Shell/Scripts/backup +++ b/Shell/Scripts/backup @@ -1,3 +1,5 @@ +#!/bin/bash + MOUNT="/Volumes/Paxilon" ESC="\033" diff --git a/Shell/Scripts/eject b/Shell/Scripts/eject index 5e3469e..47d86ab 100755 --- a/Shell/Scripts/eject +++ b/Shell/Scripts/eject @@ -1 +1,2 @@ +#!/bin/bash diskutil eject "/Volumes/$1" diff --git a/atom/.atom/config.cson b/atom/.atom/config.cson index 8838547..a57517f 100644 --- a/atom/.atom/config.cson +++ b/atom/.atom/config.cson @@ -1,4 +1,6 @@ "*": + "autoclose-html": + makeNeverCloseSelfClosing: false core: disabledPackages: [ "language-clojure" @@ -19,7 +21,7 @@ telemetryConsent: "limited" themes: [ "one-dark-ui" - "peacock-syntax" + "base16-syntax" ] titleBar: "custom" editor: @@ -30,6 +32,8 @@ "exception-reporting": userId: "c6ecdfe6-c496-4331-937d-5bb16acf637e" "markdown-preview": {} + minimap: + displayCodeHighlights: false "tree-view": hideIgnoredNames: true squashDirectoryNames: true @@ -39,6 +43,11 @@ "substitute*" ] keymapYToYankToLastCharacterOfLine: true + welcome: + showOnStartup: false +".basic.html.text": + editor: + softWrap: true ".css.scss.source": editor: softWrapHangingIndent: 2 diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index b121682..0fe0fdc 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,8 +1,14 @@ +# setup location variables +set FISH_PATH "$HOME/.config/fish" +set FLINE_PATH "$FISH_PATH/fishline" # setup FishLine -set FLINE_PATH "$HOME/.config/fish/fishline" source $FLINE_PATH/init.fish -source $FLINE_PATH/../fishline_colors.fish - +source $FISH_PATH/fishline_colors.fish set FLCLR_USER_BG blue set FLCLR_USER_FG white + +# setup colors +set -gx GCC_COLORS 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' +set -gx CLICOLOR 1 +set -gx LSCOLORS 'ExcxdxfxgxxexcxdxfBxBx' diff --git a/fish/.config/fish/fishline b/fish/.config/fish/fishline index bddf62a..fe142bd 160000 --- a/fish/.config/fish/fishline +++ b/fish/.config/fish/fishline @@ -1 +1 @@ -Subproject commit bddf62a3237d5f011b4a844b2fa78473d653caff +Subproject commit fe142bdb105bb5165db144a7623953d6e59a0896 diff --git a/peacock-extended.itermcolors b/peacock-extended.itermcolors index 08d5587..64e01b5 100644 --- a/peacock-extended.itermcolors +++ b/peacock-extended.itermcolors @@ -7,13 +7,13 @@ Alpha Component 1 Blue Component - 0.21193607151508331 + 0.21924620866775513 Color Space sRGB Green Component - 0.22823883593082428 + 0.23534151911735535 Red Component - 0.233673095703125 + 0.2376844584941864 Ansi 1 Color @@ -189,13 +189,13 @@ Alpha Component 1 Blue Component - 0.32211124897003174 + 0.30335885286331177 Color Space sRGB Green Component - 0.34688904881477356 + 0.33078092336654663 Red Component - 0.3551483154296875 + 0.32643425464630127 Ansi 9 Color @@ -340,5 +340,18 @@ Red Component 1 + Tab Color + + Alpha Component + 1 + Blue Component + 0.99987989664077759 + Color Space + sRGB + Green Component + 1 + Red Component + 0.99990183115005493 +