diff options
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/colors.zsh | 267 | ||||
| -rw-r--r-- | functions/icons.zsh | 81 | ||||
| -rw-r--r-- | functions/vcs.zsh | 2 |
3 files changed, 341 insertions, 9 deletions
diff --git a/functions/colors.zsh b/functions/colors.zsh index c82af9ea..8d75e670 100644 --- a/functions/colors.zsh +++ b/functions/colors.zsh @@ -22,14 +22,264 @@ function getColorCode() { else typeset -A codes codes=( - 'black' '000' - 'red' '001' - 'green' '002' - 'yellow' '003' - 'blue' '004' - 'magenta' '005' - 'cyan' '006' - 'white' '007' + # https://jonasjacek.github.io/colors/ + # use color names by default to allow dark/light themes to adjust colors based on names + 'black' '000' + 'maroon' '001' + 'green' '002' + 'olive' '003' + 'navy' '004' + 'purple' '005' + 'teal' '006' + 'silver' '007' + 'grey' '008' + 'red' '009' + 'lime' '010' + 'yellow' '011' + 'blue' '012' + 'fuchsia' '013' + 'aqua' '014' + 'white' '015' + 'grey0' '016' + 'navyblue' '017' + 'darkblue' '018' + 'blue3' '019' + 'blue3' '020' + 'blue1' '021' + 'darkgreen' '022' + 'deepskyblue4' '023' + 'deepskyblue4' '024' + 'deepskyblue4' '025' + 'dodgerblue3' '026' + 'dodgerblue2' '027' + 'green4' '028' + 'springgreen4' '029' + 'turquoise4' '030' + 'deepskyblue3' '031' + 'deepskyblue3' '032' + 'dodgerblue1' '033' + 'green3' '034' + 'springgreen3' '035' + 'darkcyan' '036' + 'lightseagreen' '037' + 'deepskyblue2' '038' + 'deepskyblue1' '039' + 'green3' '040' + 'springgreen3' '041' + 'springgreen2' '042' + 'cyan3' '043' + 'darkturquoise' '044' + 'turquoise2' '045' + 'green1' '046' + 'springgreen2' '047' + 'springgreen1' '048' + 'mediumspringgreen' '049' + 'cyan2' '050' + 'cyan1' '051' + 'darkred' '052' + 'deeppink4' '053' + 'purple4' '054' + 'purple4' '055' + 'purple3' '056' + 'blueviolet' '057' + 'orange4' '058' + 'grey37' '059' + 'mediumpurple4' '060' + 'slateblue3' '061' + 'slateblue3' '062' + 'royalblue1' '063' + 'chartreuse4' '064' + 'darkseagreen4' '065' + 'paleturquoise4' '066' + 'steelblue' '067' + 'steelblue3' '068' + 'cornflowerblue' '069' + 'chartreuse3' '070' + 'darkseagreen4' '071' + 'cadetblue' '072' + 'cadetblue' '073' + 'skyblue3' '074' + 'steelblue1' '075' + 'chartreuse3' '076' + 'palegreen3' '077' + 'seagreen3' '078' + 'aquamarine3' '079' + 'mediumturquoise' '080' + 'steelblue1' '081' + 'chartreuse2' '082' + 'seagreen2' '083' + 'seagreen1' '084' + 'seagreen1' '085' + 'aquamarine1' '086' + 'darkslategray2' '087' + 'darkred' '088' + 'deeppink4' '089' + 'darkmagenta' '090' + 'darkmagenta' '091' + 'darkviolet' '092' + 'purple' '093' + 'orange4' '094' + 'lightpink4' '095' + 'plum4' '096' + 'mediumpurple3' '097' + 'mediumpurple3' '098' + 'slateblue1' '099' + 'yellow4' '100' + 'wheat4' '101' + 'grey53' '102' + 'lightslategrey' '103' + 'mediumpurple' '104' + 'lightslateblue' '105' + 'yellow4' '106' + 'darkolivegreen3' '107' + 'darkseagreen' '108' + 'lightskyblue3' '109' + 'lightskyblue3' '110' + 'skyblue2' '111' + 'chartreuse2' '112' + 'darkolivegreen3' '113' + 'palegreen3' '114' + 'darkseagreen3' '115' + 'darkslategray3' '116' + 'skyblue1' '117' + 'chartreuse1' '118' + 'lightgreen' '119' + 'lightgreen' '120' + 'palegreen1' '121' + 'aquamarine1' '122' + 'darkslategray1' '123' + 'red3' '124' + 'deeppink4' '125' + 'mediumvioletred' '126' + 'magenta3' '127' + 'darkviolet' '128' + 'purple' '129' + 'darkorange3' '130' + 'indianred' '131' + 'hotpink3' '132' + 'mediumorchid3' '133' + 'mediumorchid' '134' + 'mediumpurple2' '135' + 'darkgoldenrod' '136' + 'lightsalmon3' '137' + 'rosybrown' '138' + 'grey63' '139' + 'mediumpurple2' '140' + 'mediumpurple1' '141' + 'gold3' '142' + 'darkkhaki' '143' + 'navajowhite3' '144' + 'grey69' '145' + 'lightsteelblue3' '146' + 'lightsteelblue' '147' + 'yellow3' '148' + 'darkolivegreen3' '149' + 'darkseagreen3' '150' + 'darkseagreen2' '151' + 'lightcyan3' '152' + 'lightskyblue1' '153' + 'greenyellow' '154' + 'darkolivegreen2' '155' + 'palegreen1' '156' + 'darkseagreen2' '157' + 'darkseagreen1' '158' + 'paleturquoise1' '159' + 'red3' '160' + 'deeppink3' '161' + 'deeppink3' '162' + 'magenta3' '163' + 'magenta3' '164' + 'magenta2' '165' + 'darkorange3' '166' + 'indianred' '167' + 'hotpink3' '168' + 'hotpink2' '169' + 'orchid' '170' + 'mediumorchid1' '171' + 'orange3' '172' + 'lightsalmon3' '173' + 'lightpink3' '174' + 'pink3' '175' + 'plum3' '176' + 'violet' '177' + 'gold3' '178' + 'lightgoldenrod3' '179' + 'tan' '180' + 'mistyrose3' '181' + 'thistle3' '182' + 'plum2' '183' + 'yellow3' '184' + 'khaki3' '185' + 'lightgoldenrod2' '186' + 'lightyellow3' '187' + 'grey84' '188' + 'lightsteelblue1' '189' + 'yellow2' '190' + 'darkolivegreen1' '191' + 'darkolivegreen1' '192' + 'darkseagreen1' '193' + 'honeydew2' '194' + 'lightcyan1' '195' + 'red1' '196' + 'deeppink2' '197' + 'deeppink1' '198' + 'deeppink1' '199' + 'magenta2' '200' + 'magenta1' '201' + 'orangered1' '202' + 'indianred1' '203' + 'indianred1' '204' + 'hotpink' '205' + 'hotpink' '206' + 'mediumorchid1' '207' + 'darkorange' '208' + 'salmon1' '209' + 'lightcoral' '210' + 'palevioletred1' '211' + 'orchid2' '212' + 'orchid1' '213' + 'orange1' '214' + 'sandybrown' '215' + 'lightsalmon1' '216' + 'lightpink1' '217' + 'pink1' '218' + 'plum1' '219' + 'gold1' '220' + 'lightgoldenrod2' '221' + 'lightgoldenrod2' '222' + 'navajowhite1' '223' + 'mistyrose1' '224' + 'thistle1' '225' + 'yellow1' '226' + 'lightgoldenrod1' '227' + 'khaki1' '228' + 'wheat1' '229' + 'cornsilk1' '230' + 'grey100' '231' + 'grey3' '232' + 'grey7' '233' + 'grey11' '234' + 'grey15' '235' + 'grey19' '236' + 'grey23' '237' + 'grey27' '238' + 'grey30' '239' + 'grey35' '240' + 'grey39' '241' + 'grey42' '242' + 'grey46' '243' + 'grey50' '244' + 'grey54' '245' + 'grey58' '246' + 'grey62' '247' + 'grey66' '248' + 'grey70' '249' + 'grey74' '250' + 'grey78' '251' + 'grey82' '252' + 'grey85' '253' + 'grey89' '254' + 'grey93' '255' ) # Strip eventual "bg-" prefixes @@ -53,4 +303,3 @@ function isSameColor() { return $(( color1 != color2 )) } - diff --git a/functions/icons.zsh b/functions/icons.zsh index 7124386b..6ec07379 100644 --- a/functions/icons.zsh +++ b/functions/icons.zsh @@ -87,6 +87,7 @@ case $POWERLEVEL9K_MODE in SSH_ICON '(ssh)' VPN_ICON '(vpn)' KUBERNETES_ICON $'\U2388' # ⎈ + DROPBOX_ICON $'\UF16B' # ) ;; 'awesome-fontconfig') @@ -158,6 +159,84 @@ case $POWERLEVEL9K_MODE in SSH_ICON '(ssh)' VPN_ICON $'\uF023' KUBERNETES_ICON $'\U2388' # ⎈ + DROPBOX_ICON $'\UF16B' # + ) + ;; + 'awesome-mapped-fontconfig') + # mapped fontconfig with awesome-font required! See + # https://github.com/gabrielelana/awesome-terminal-fonts + # don't forget to source the font maps in your startup script + # Set the right locale to protect special characters + local LC_ALL="" LC_CTYPE="en_US.UTF-8" + + if [ -z "$AWESOME_GLYPHS_LOADED" ]; then + echo "Powerlevel9k warning: Awesome-Font mappings have not been loaded. + Source a font mapping in your shell config, per the Awesome-Font docs + (https://github.com/gabrielelana/awesome-terminal-fonts), + Or use a different Powerlevel9k font configuration."; + fi + + icons=( + LEFT_SEGMENT_SEPARATOR $'\uE0B0' # + RIGHT_SEGMENT_SEPARATOR $'\uE0B2' # + LEFT_SEGMENT_END_SEPARATOR ' ' # Whitespace + LEFT_SUBSEGMENT_SEPARATOR $'\uE0B1' # + RIGHT_SUBSEGMENT_SEPARATOR $'\uE0B3' # + CARRIAGE_RETURN_ICON $'\u21B5' # ↵ + ROOT_ICON '\u'$CODEPOINT_OF_OCTICONS_ZAP # + RUBY_ICON '\u'$CODEPOINT_OF_OCTICONS_RUBY' ' # + AWS_ICON '\u'$CODEPOINT_OF_AWESOME_SERVER # + AWS_EB_ICON $'\U1F331 ' # 🌱 + BACKGROUND_JOBS_ICON '\u'$CODEPOINT_OF_AWESOME_COG' ' # + TEST_ICON '\u'$CODEPOINT_OF_AWESOME_BUG # + TODO_ICON '\u'$CODEPOINT_OF_AWESOME_CHECK_SQUARE_O # + BATTERY_ICON '\U'$CODEPOINT_OF_AWESOME_BATTERY_FULL # + DISK_ICON '\u'$CODEPOINT_OF_AWESOME_HDD_O' ' # + OK_ICON '\u'$CODEPOINT_OF_AWESOME_CHECK # + FAIL_ICON '\u'$CODEPOINT_OF_AWESOME_TIMES # + SYMFONY_ICON 'SF' + NODE_ICON $'\u2B22' # ⬢ + MULTILINE_FIRST_PROMPT_PREFIX $'\u256D'$'\U2500' # ╭─ + MULTILINE_SECOND_PROMPT_PREFIX $'\u2570'$'\U2500 ' # ╰─ + APPLE_ICON '\u'$CODEPOINT_OF_AWESOME_APPLE # + FREEBSD_ICON $'\U1F608 ' # 😈 + LINUX_ICON '\u'$CODEPOINT_OF_AWESOME_LINUX # + SUNOS_ICON '\u'$CODEPOINT_OF_AWESOME_SUN_O' ' # + HOME_ICON '\u'$CODEPOINT_OF_AWESOME_HOME # + HOME_SUB_ICON '\u'$CODEPOINT_OF_AWESOME_FOLDER_OPEN # + FOLDER_ICON '\u'$CODEPOINT_OF_AWESOME_FOLDER_O # + NETWORK_ICON '\u'$CODEPOINT_OF_AWESOME_RSS # + LOAD_ICON '\u'$CODEPOINT_OF_AWESOME_BAR_CHART' ' # + SWAP_ICON '\u'$CODEPOINT_OF_AWESOME_DASHBOARD # + RAM_ICON '\u'$CODEPOINT_OF_AWESOME_DASHBOARD # + SERVER_ICON '\u'$CODEPOINT_OF_AWESOME_SERVER # + VCS_UNTRACKED_ICON '\u'$CODEPOINT_OF_AWESOME_QUESTION_CIRCLE # + VCS_UNSTAGED_ICON '\u'$CODEPOINT_OF_AWESOME_EXCLAMATION_CIRCLE # + VCS_STAGED_ICON '\u'$CODEPOINT_OF_AWESOME_PLUS_CIRCLE # + VCS_STASH_ICON '\u'$CODEPOINT_OF_AWESOME_INBOX' ' # + VCS_INCOMING_CHANGES_ICON '\u'$CODEPOINT_OF_AWESOME_ARROW_CIRCLE_DOWN' ' # + VCS_OUTGOING_CHANGES_ICON '\u'$CODEPOINT_OF_AWESOME_ARROW_CIRCLE_UP' ' # + VCS_TAG_ICON '\u'$CODEPOINT_OF_AWESOME_TAG' ' # + VCS_BOOKMARK_ICON '\u'$CODEPOINT_OF_OCTICONS_BOOKMARK # + VCS_COMMIT_ICON '\u'$CODEPOINT_OF_OCTICONS_GIT_COMMIT' ' # + VCS_BRANCH_ICON '\u'$CODEPOINT_OF_OCTICONS_GIT_BRANCH' ' # + VCS_REMOTE_BRANCH_ICON '\u'$CODEPOINT_OF_OCTICONS_REPO_PUSH # + VCS_GIT_ICON '\u'$CODEPOINT_OF_AWESOME_GIT' ' # + VCS_GIT_GITHUB_ICON '\u'$CODEPOINT_OF_AWESOME_GITHUB_ALT' ' # + VCS_GIT_BITBUCKET_ICON '\u'$CODEPOINT_OF_AWESOME_BITBUCKET' ' # + VCS_GIT_GITLAB_ICON '\u'$CODEPOINT_OF_AWESOME_GITLAB' ' # + VCS_HG_ICON '\u'$CODEPOINT_OF_AWESOME_FLASK' ' # + VCS_SVN_ICON '(svn) ' + RUST_ICON $'\uE6A8' # + PYTHON_ICON $'\U1F40D' # 🐍 + SWIFT_ICON $'\uE655' # + PUBLIC_IP_ICON '\u'$CODEPOINT_OF_AWESOME_GLOBE # + LOCK_ICON '\u'$CODEPOINT_OF_AWESOME_LOCK # + EXECUTION_TIME_ICON '\u'$CODEPOINT_OF_AWESOME_HOURGLASS_END # + SSH_ICON '(ssh)' + VPN_ICON '\u'$CODEPOINT_OF_AWESOME_LOCK + KUBERNETES_ICON $'\U2388' # ⎈ + DROPBOX_ICON '\u'$CODEPOINT_OF_AWESOME_DROPBOX # ) ;; 'nerdfont-complete'|'nerdfont-fontconfig') @@ -229,6 +308,7 @@ case $POWERLEVEL9K_MODE in SSH_ICON $'\uF489' # VPN_ICON '(vpn)' KUBERNETES_ICON $'\U2388' # ⎈ + DROPBOX_ICON $'\UF16B' # ) ;; *) @@ -300,6 +380,7 @@ case $POWERLEVEL9K_MODE in SSH_ICON '(ssh)' VPN_ICON '(vpn)' KUBERNETES_ICON $'\U2388' # ⎈ + DROPBOX_ICON 'Dropbox' ) ;; esac diff --git a/functions/vcs.zsh b/functions/vcs.zsh index 89f04143..e2e9f3a3 100644 --- a/functions/vcs.zsh +++ b/functions/vcs.zsh @@ -116,6 +116,8 @@ function +vi-vcs-detect-changes() { vcs_visual_identifier='VCS_GIT_GITHUB_ICON' elif [[ "$remote" =~ "bitbucket" ]] then vcs_visual_identifier='VCS_GIT_BITBUCKET_ICON' + elif [[ "$remote" =~ "stash" ]] then + vcs_visual_identifier='VCS_GIT_BITBUCKET_ICON' elif [[ "$remote" =~ "gitlab" ]] then vcs_visual_identifier='VCS_GIT_GITLAB_ICON' else |