From 07e254465d91d2aa09043be6d02c022c6a4d5cbf Mon Sep 17 00:00:00 2001 From: John Doty Date: Thu, 12 Apr 2012 15:44:30 -0700 Subject: [PATCH] Dirty hacks for non-interactive shells --- WindowsPowershell/Modules/ConsoleColors.psm1 | 52 ++++++++--------- WindowsPowershell/Modules/PowerSolarized.dll | Bin 9216 -> 0 bytes WindowsPowershell/Profile.ps1 | 57 +++++++++++++------ 3 files changed, 64 insertions(+), 45 deletions(-) delete mode 100644 WindowsPowershell/Modules/PowerSolarized.dll diff --git a/WindowsPowershell/Modules/ConsoleColors.psm1 b/WindowsPowershell/Modules/ConsoleColors.psm1 index 36635e5..ac44964 100644 --- a/WindowsPowershell/Modules/ConsoleColors.psm1 +++ b/WindowsPowershell/Modules/ConsoleColors.psm1 @@ -131,30 +131,6 @@ function Add-ConsoleHelper() Add-Type -TypeDefinition $code -ReferencedAssemblies @('System.Drawing') } -# These are the 16 colors for our palette. -Add-Type -AssemblyName System.Drawing - -# Here's the solarized table... -# -# SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB -# --------- ------- ---- ------- ----------- ---------- ----------- ----------- -$base03 = "#002b36" # 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 -$base02 = "#073642" # 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 -$base01 = "#586e75" # 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 -$base00 = "#657b83" # 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 -$base0 = "#839496" # 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 -$base1 = "#93a1a1" # 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 -$base2 = "#eee8d5" # 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 -$base3 = "#fdf6e3" # 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 -$yellow = "#b58900" # 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 -$orange = "#cb4b16" # 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 -$red = "#dc322f" # 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 -$magenta = "#d33682" # 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 -$violet = "#6c71c4" # 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 -$blue = "#268bd2" # 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 -$cyan = "#2aa198" # 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 -$green = "#859900" # 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 - function Set-SolarizedColors([switch]$Light, [switch]$Dark) { if ( (-not $Light) -and (-not $Dark) ) @@ -162,8 +138,32 @@ function Set-SolarizedColors([switch]$Light, [switch]$Dark) $Light = $true } + # Here's the solarized table... + # + # SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB + # --------- ------- ---- ------- ----------- ---------- ----------- ----------- + $base03 = "#002b36" # 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 + $base02 = "#073642" # 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 + $base01 = "#586e75" # 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 + $base00 = "#657b83" # 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 + $base0 = "#839496" # 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 + $base1 = "#93a1a1" # 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 + $base2 = "#eee8d5" # 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 + $base3 = "#fdf6e3" # 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 + $yellow = "#b58900" # 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 + $orange = "#cb4b16" # 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 + $red = "#dc322f" # 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 + $magenta = "#d33682" # 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 + $violet = "#6c71c4" # 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 + $blue = "#268bd2" # 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 + $cyan = "#2aa198" # 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 + $green = "#859900" # 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 + if ($Host.Name -eq "ConsoleHost") { + Add-Type -AssemblyName System.Drawing + Add-ConsoleHelper + # Redefine the standard console colors to have the Solarized-Light # palette. # @@ -222,7 +222,5 @@ function Set-SolarizedColors([switch]$Light, [switch]$Dark) $Host.UI.RawUI.BackgroundColor Clear-Host - } + } } - -Add-ConsoleHelper \ No newline at end of file diff --git a/WindowsPowershell/Modules/PowerSolarized.dll b/WindowsPowershell/Modules/PowerSolarized.dll deleted file mode 100644 index 6541ce8429b5969b5a26e6b0bcdea1305c18b492..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9216 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