From 7e38180671a48daeea432f8bd2f67cfe2979fbf0 Mon Sep 17 00:00:00 2001 From: Harri Lahtinen Date: Fri, 24 Jan 2020 01:45:32 +0200 Subject: [PATCH] changed -> UbuntuMono Nerd Font Mono --- .config/i3/config | 4 +- .config/polybar/bottom-bar | 11 +- .config/polybar/top-bar | 11 +- .config/wpg/templates/config_i3_config.base | 4 +- .config/wpg/templates/config_rofi_config.base | 2 +- .zshrc | 150 +++++++++--------- 6 files changed, 88 insertions(+), 94 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index 250066b..ce7516b 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -8,7 +8,7 @@ hide_edge_borders both for_window [class="^.*"] border pixel 0 gaps inner 15 gaps outer 15 -font pango:Ubuntu Mono derivative Powerline 10 +font pango:UbuntuMono Nerd Font Mono 10 set $mod Mod4 set $term --no-startup-id $TERMINAL @@ -192,7 +192,7 @@ bindsym $mod+s gaps inner current plus 5 bindsym $mod+Shift+s gaps inner current minus 5 #bindsym $mod+d exec rofi -config ~/.config/rofi/config -show drun -bindsym $mod+d exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-18' -h '35' -nb '#d3869b' -sf '#282828' -sb '#b8bb26' -nf '#fbf1c7' +bindsym $mod+d exec dmenu_run -fn 'UbuntuMono Nerd Font Mono-18' -h '35' -nb '#d3869b' -sf '#282828' -sb '#b8bb26' -nf '#fbf1c7' bindsym Mod1+d exec ~/.config/Scripts/rofi-bangs.sh bindsym $mod+Shift+d gaps inner current set 0; gaps outer current set 0 diff --git a/.config/polybar/bottom-bar b/.config/polybar/bottom-bar index 98d532c..30e073f 100644 --- a/.config/polybar/bottom-bar +++ b/.config/polybar/bottom-bar @@ -1,4 +1,5 @@ [bar/bottom] +dpi = 200 width = 100% height = 30 fixed-center = true @@ -12,9 +13,7 @@ padding-left = 0 padding-right = 0 module-margin-left = 0 module-margin-right = 0 -font-0 = PowerlineSymbols:size=22;6 -font-1 = Ubuntu Mono derivative Powerline:size=18;3 -font-2 = FontAwesome:size=18;4 -#font-2 = "Font Awesome 5 Free:style=Regular:pixelsize=18;4" -#font-3 = "Font Awesome 5 Free:style=Solid:pixelsize=18;4" -#font-4 = "Font Awesome 5 Brands:pixelsize=18;4" +font-0 = PowerlineSymbols:size=10;6 +font-1 = FontAwesome:size=9;4 +font-2 = UbuntuMono Nerd Font Mono:size=10;3 +#font-2 = Ubuntu Mono derivative Powerline:size=18;3 diff --git a/.config/polybar/top-bar b/.config/polybar/top-bar index 4cea905..5f84285 100644 --- a/.config/polybar/top-bar +++ b/.config/polybar/top-bar @@ -1,4 +1,5 @@ [bar/top] +dpi = 200 width = 100% height = 30 fixed-center = true @@ -12,11 +13,9 @@ padding-left = 0 padding-right = 0 module-margin-left = 0 module-margin-right = 0 -font-0 = PowerlineSymbols:size=22;6 -font-1 = Ubuntu Mono derivative Powerline:size=18;3 -font-2 = FontAwesome:size=18;4 -#font-2 = "Font Awesome 5 Free:style=Regular:pixelsize=18;4" -#font-3 = "Font Awesome 5 Free:style=Solid:pixelsize=18;4" -#font-4 = "Font Awesome 5 Brands:pixelsize=18;4" +font-0 = PowerlineSymbols:size=10;6 +font-1 = FontAwesome:size=9;4 +font-2 = UbuntuMono Nerd Font Mono:size=10;3 +#font-1 = Ubuntu Mono derivative Powerline:size=18;3 scroll-up = i3wm-wsnext scroll-down = i3wm-wsprev diff --git a/.config/wpg/templates/config_i3_config.base b/.config/wpg/templates/config_i3_config.base index 8f947b4..64e5c67 100644 --- a/.config/wpg/templates/config_i3_config.base +++ b/.config/wpg/templates/config_i3_config.base @@ -8,7 +8,7 @@ hide_edge_borders both for_window [class="^.*"] border pixel 0 gaps inner 15 gaps outer 15 -font pango:Ubuntu Mono derivative Powerline 10 +font pango:UbuntuMono Nerd Font Mono 10 set $mod Mod4 set $term --no-startup-id $TERMINAL @@ -192,7 +192,7 @@ bindsym $mod+s gaps inner current plus 5 bindsym $mod+Shift+s gaps inner current minus 5 #bindsym $mod+d exec rofi -config ~/.config/rofi/config -show drun -bindsym $mod+d exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-18' -h '35' -nb '{color5}' -sf '{color0}' -sb '{color10}' -nf '{color15}' +bindsym $mod+d exec dmenu_run -fn 'UbuntuMono Nerd Font Mono-18' -h '35' -nb '{color5}' -sf '{color0}' -sb '{color10}' -nf '{color15}' bindsym Mod1+d exec ~/.config/Scripts/rofi-bangs.sh bindsym $mod+Shift+d gaps inner current set 0; gaps outer current set 0 diff --git a/.config/wpg/templates/config_rofi_config.base b/.config/wpg/templates/config_rofi_config.base index 96bc866..8492bcb 100644 --- a/.config/wpg/templates/config_rofi_config.base +++ b/.config/wpg/templates/config_rofi_config.base @@ -4,7 +4,7 @@ rofi.color-urgent: #fbf8f1, #d6b48d, #22231D, #d6b48d, #2A1A17 rofi.color-active: #fbf8f1, #E1B959, #fbf8f1, #E1B959, #fbf8f1 rofi.color-window: #fbf8f1, #ff923b, #DD712E #rofi.font: TamzenForPowerline 12 -rofi.font: Ubuntu Mono derivative Powerline 20 +rofi.font: UbuntuMono Nerd Font Mono 22 rofi.color-enabled: true rofi.fake-transparency: true rofi.lines: 12 diff --git a/.zshrc b/.zshrc index 6fe2265..412753d 100644 --- a/.zshrc +++ b/.zshrc @@ -28,7 +28,7 @@ fi # source $HOME/.zshenv #fi -ZSH_THEME="powerlevel9k/powerlevel9k" +ZSH_THEME="powerlevel10k/powerlevel10k" #ZSH_THEME="agnoster" # Auto completion @@ -116,87 +116,83 @@ if [ -f '/home/hate/google-cloud-sdk/path.zsh.inc' ]; then source '/home/hate/go if [ -f '/home/hate/google-cloud-sdk/completion.zsh.inc' ]; then source '/home/hate/google-cloud-sdk/completion.zsh.inc'; fi # Powerlevel9k -#POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(icons_test) POWERLEVEL9K_MODE=nerdfont-complete -POWERLEVEL9K_PROMPT_ADD_NEWLINE=true -# LEFT_PROMPT -# =========================================================== -POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(os_icon battery ram time newline dir_joined) -POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='' -POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR=' ' -POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS='' +# Prompt elements +POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(custom_user dir vcs) +POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(battery time) -# status -# POWERLEVEL9K_STATUS_VERBOSE=false +# Prompt settings +POWERLEVEL9K_PROMPT_ON_NEWLINE=false +POWERLEVEL9K_RPROMPT_ON_NEWLINE=false +#POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX_ICON=$'%K{white}%k' +#POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX_ICON=$'%K{green}%F{black} \uf155 %f%F{green}%k\ue0b0%f ' -# os_icon custom -POWERLEVEL9K_OS_ICON_BACKGROUND='none' -POWERLEVEL9K_OS_ICON_FOREGROUND='004' +# Separators +POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR_ICON=$'\ue0b0' +POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR_ICON=$'\ue0b1' +POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR_ICON=$'\ue0b2' +POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR_ICON=$'\ue0b7' -# battery -POWERLEVEL9K_BATTERY_LOW_BACKGROUND='none' -POWERLEVEL9K_BATTERY_LOW_FOREGROUND='001' -POWERLEVEL9K_BATTERY_CHARGING_BACKGROUND='none' -POWERLEVEL9K_BATTERY_CHARGING_FOREGROUND='076' -POWERLEVEL9K_BATTERY_CHARGED_BACKGROUND='none' -POWERLEVEL9K_BATTERY_CHARGED_FOREGROUND='076' -POWERLEVEL9K_BATTERY_DISCONNECTED_BACKGROUND='none' -POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND='003' -POWERLEVEL9K_BATTERY_LOW_THRESHOLD=15 -POWERLEVEL9K_BATTERY_VERBOSE=false +# Dir colours +#POWERLEVEL9K_DIR_HOME_BACKGROUND='black' +#POWERLEVEL9K_DIR_HOME_FOREGROUND='white' +#POWERLEVEL9K_DIR_HOME_SUBFOLDER_BACKGROUND='black' +#POWERLEVEL9K_DIR_HOME_SUBFOLDER_FOREGROUND='white' +#POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='yellow' +#POWERLEVEL9K_DIR_DEFAULT_FOREGROUND='black' +POWERLEVEL9K_DIR_SHORTEN_LENGTH=2 +POWERLEVEL9K_DIR_SHORTEN_STRATEGY="truncate_from_right" + +# OS segment +POWERLEVEL9K_OS_ICON_BACKGROUND='black' +POWERLEVEL9K_LINUX_ICON='%F{cyan} \uf303 %F{white} arch %F{cyan}linux%f' + +# VCS icons +POWERLEVEL9K_VCS_GIT_ICON=$'\uf1d2 ' +POWERLEVEL9K_VCS_GIT_GITHUB_ICON=$'\uf113 ' +POWERLEVEL9K_VCS_GIT_GITLAB_ICON=$'\uf296 ' +POWERLEVEL9K_VCS_BRANCH_ICON=$'\uf322 ' +POWERLEVEL9K_VCS_STAGED_ICON=$'\uf055' +POWERLEVEL9K_VCS_UNSTAGED_ICON=$'\uf421' +POWERLEVEL9K_VCS_UNTRACKED_ICON=$'\uf00d' +POWERLEVEL9K_VCS_INCOMING_CHANGES_ICON=$'\uf0ab ' +POWERLEVEL9K_VCS_OUTGOING_CHANGES_ICON=$'\uf0aa ' + +# VCS colours +POWERLEVEL9K_VCS_MODIFIED_BACKGROUND='yellow' +POWERLEVEL9K_VCS_MODIFIED_FOREGROUND='black' +POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND='green' +POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND='black' +POWERLEVEL9K_VCS_CLEAN_BACKGROUND='green' +POWERLEVEL9K_VCS_CLEAN_FOREGROUND='black' + +# VCS CONFIG +POWERLEVEL9K_VCS_SHOW_CHANGESET=true + +# Status +POWERLEVEL9K_STATUS_OK_ICON=$'\uf164' +POWERLEVEL9K_STATUS_ERROR_ICON=$'\uf165' +POWERLEVEL9K_STATUS_ERROR_CR_ICON=$'\uf165' + +# Battery +POWERLEVEL9K_BATTERY_LOW_FOREGROUND='black' +POWERLEVEL9K_BATTERY_LOW_BACKGROUND='red' +POWERLEVEL9K_BATTERY_CHARGING_FOREGROUND='black' +POWERLEVEL9K_BATTERY_CHARGING_BACKGROUND='blue' +POWERLEVEL9K_BATTERY_CHARGED_FOREGROUND='black' +POWERLEVEL9K_BATTERY_CHARGED_BACKGROUND='green' +POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND='blue' +POWERLEVEL9K_BATTERY_VERBOSE=true POWERLEVEL9K_BATTERY_STAGES='' +POWERLEVEL9K_BATTERY_LOW_THRESHOLD=15 -# time -# POWERLEVEL9K_TIME_FORMAT="%D{%d.%m.%y %H:%M:%S}" -POWERLEVEL9K_TIME_ICON='' -POWERLEVEL9K_TIME_BACKGROUND='none' -POWERLEVEL9K_TIME_FOREGROUND='006' - -# ram -POWERLEVEL9K_RAM_ICON='' -POWERLEVEL9K_RAM_BACKGROUND='none' -POWERLEVEL9K_RAM_FOREGROUND='006' - -# dir -POWERLEVEL9K_SHORTEN_DELIMITER='' -POWERLEVEL9K_SHORTEN_DIR_LENGTH=7 -# POWERLEVEL9K_SHORTEN_STRATEGY='truncate_to_first_and_last' - -POWERLEVEL9K_ETC_ICON='' -POWERLEVEL9K_FOLDER_ICON='' -POWERLEVEL9K_HOME_ICON='' -POWERLEVEL9K_HOME_SUB_ICON='' - -POWERLEVEL9K_DIR_ETC_BACKGROUND='none' -POWERLEVEL9K_DIR_ETC_FOREGROUND='005' -POWERLEVEL9K_DIR_HOME_BACKGROUND='none' -POWERLEVEL9K_DIR_HOME_FOREGROUND='004' -POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='none' -POWERLEVEL9K_DIR_DEFAULT_FOREGROUND='005' -POWERLEVEL9K_DIR_HOME_SUBFOLDER_BACKGROUND='none' -POWERLEVEL9K_DIR_HOME_SUBFOLDER_FOREGROUND='004' - -# customization -# POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='' - -# RIGHT_PROMP -# =========================================================== -POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(vcs) -POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='' -POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR=' ' -POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS='' - -# vcs -POWERLEVEL9K_SHOW_CHANGESET=true -POWERLEVEL9K_CHANGESET_HASH_LENGTH=6 - -POWERLEVEL9K_VCS_CLEAN_BACKGROUND='none' -POWERLEVEL9K_VCS_CLEAN_FOREGROUND='076' -POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND='none' -POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND='005' -POWERLEVEL9K_VCS_MODIFIED_BACKGROUND='none' -POWERLEVEL9K_VCS_MODIFIED_FOREGROUND='003' - -POWERLEVEL9K_VCS_GIT_HOOKS=(vcs-detect-changes git-untracked git-aheadbehind git-remotebranch git-tagname) +# Programming languages +POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW=true +POWERLEVEL9K_GO_VERSION_PROMPT_ALWAYS_SHOW=true +# User with skull +user_with_skull() { + echo -n "\uf303 $(whoami)" +} +POWERLEVEL9K_CUSTOM_USER="user_with_skull"