From 71c8ad9ca85892114951b8d790cfaf4002f09c03 Mon Sep 17 00:00:00 2001 From: Harri Lahtinen Date: Wed, 31 Jul 2019 19:56:54 +0300 Subject: [PATCH] lot of changes.. --- .Xresources | 8 ++++++-- .config/Scripts/on | 8 ++++---- .config/Scripts/showip | 3 ++- .config/i3/config | 3 ++- .config/nvim/init.vim | 6 +++--- .config/polybar/bottom-bar | 4 +++- .config/polybar/config | 18 ++++++++--------- .config/polybar/top-bar | 4 +++- .config/rofi/config | 5 +++-- .config/rofi/wifi | 2 +- .../wpg/templates/config_polybar_config.base | 20 +++++++++---------- .tmux.conf | 11 +++++----- 12 files changed, 51 insertions(+), 41 deletions(-) diff --git a/.Xresources b/.Xresources index bae63c6..15d354a 100644 --- a/.Xresources +++ b/.Xresources @@ -26,8 +26,12 @@ !! Transparency (0-1): st.alpha: 0.9 !! Set a default font and font size as below: -st.font: TamzenForPowerline:pixelsize=14:antialias=true:autohint=true; -st.boldFont: TamzenForPowerline:pixelsize=14:bold:antialias=true:autohint=true; +!st.font: TamzenForPowerline:pixelsize=14:antialias=true:autohint=true; +!st.boldFont: TamzenForPowerline:pixelsize=14:bold:antialias=true:autohint=true; +!st.font: Source Code Pro:pixelsize=12:antialias=true:autohint=true; +!st.boldFont: Source Code Pro:pixelsize=12:bold:antialias=true:autohint=true; +st.font: Ubuntu Mono derivative Powerline:pixelsize=14:antialias=true:autohint=true; +st.boldFont: Ubuntu Mono derivative Powerline:pixelsize=14:bold:antialias=true:autohint=true; st.bold_font: 1 st.borderpx: 10 ! This option is can be preedit style. Available values: `root` `overthespot` ( Default taken `root`) diff --git a/.config/Scripts/on b/.config/Scripts/on index bf14ec7..0f412ed 100755 --- a/.config/Scripts/on +++ b/.config/Scripts/on @@ -6,15 +6,15 @@ # back to your editor. # https://www.reddit.com/r/qtools/comments/amswu9/autoloading_rofi_for_quick_themeing_experience/ -options="  lock -  logout -  sleep +options="  lock +  logout +  sleep  hibernate  reboot  shutdown" themes_dir=$HOME/.config/rofi theme=${1:-$themes_dir/colors-rofi-dark.rasi} -selection=$(echo -e "${options}" | rofi -dmenu -config ~/.config/rofi/config $theme -columns 6 -lines 1 -width 800) +selection=$(echo -e "${options}" | rofi -dmenu -config ~/.config/rofi/config $theme -columns 6 -lines 1 -width 1000) echo "This is your selection: $selection" diff --git a/.config/Scripts/showip b/.config/Scripts/showip index 59b7226..3804258 100755 --- a/.config/Scripts/showip +++ b/.config/Scripts/showip @@ -1,3 +1,4 @@ #!/usr/bin/env bash -ip addr show dev wlp2s0 | grep "inet[^6]" | awk '{print $2}' +ip a | awk ' !/[0-9]+\: lo/ && /^[0-9]\:/ || /inet / && !/127\.0\.0\.1/ {print $2}' | perl -i -pe "s/:\n/: /g;" -pe "s/\/[\d]+$//" +#ip route get 8.8.8.8 | head -1 | awk '{print $7}' diff --git a/.config/i3/config b/.config/i3/config index e3ce876..d56a731 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -8,7 +8,8 @@ hide_edge_borders both for_window [class="^.*"] border pixel 0 gaps inner 15 gaps outer 15 -font pango:TamzenForPowerline 12 +#font pango:TamzenForPowerline 12 +font pango:Ubuntu Mono derivative Powerline 10 set $mod Mod4 set $term st diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index bf7d52e..54bd4c6 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -60,9 +60,9 @@ let g:tmuxline_preset = { \'a' : '#S', \'b' : '#W', \'c' : ['#(~/.config/Scripts/showip)'], - \'win' : '#I #W', - \'cwin' : '#I #W', - \'y' : '#W %R', + \'win' : ['#I', '#W'], + \'cwin' : ['#I', '#W', '#F'], + \'y' : ['%R', '%a', '%Y'], \'z' : '#H'} " Run xrdb whenever Xdefaults or Xresources are updated. diff --git a/.config/polybar/bottom-bar b/.config/polybar/bottom-bar index a956264..43cd7ff 100644 --- a/.config/polybar/bottom-bar +++ b/.config/polybar/bottom-bar @@ -13,7 +13,9 @@ padding-left = 1 padding-right = 1 module-margin-left = 1 module-margin-right = 1 -font-1 = TamzenForPowerline:size=12;1 +;font-1 = TamzenForPowerline:size=12;1 +;font-1 = Source Code Pro:size=8;1 +font-1 = Ubuntu Mono derivative Powerline:size=10;1 font-0 = FontAwesome:size=10.5;1 font-2 = Material Icons:size=12;3 ;font-2 = "Font Awesome 5 Free:style=Regular:size=12;3" diff --git a/.config/polybar/config b/.config/polybar/config index b33b84b..7214cc5 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -10,7 +10,7 @@ background = #00000000 ;background = #8a8061 background-alt = #88C0D0 ;foreground = ${{xrdb:color7}} -foreground = #D08770 +foreground = #5E81AC foreground-alt = #D08770 highlight = #E5E9F0 ;error = ${{xrdb:color9:#DD712E}} @@ -75,7 +75,7 @@ spacing = 4 format-mounted = format-unmounted = label-mounted =  %percentage_used%% -label-mounted-foreground = ${colors.foreground-alt} +label-mounted-foreground = ${colors.foreground} label-unmounted = %mountpoint%: not mounted label-unmounted-foreground = ${colors.foreground-alt} @@ -135,7 +135,7 @@ thermal-zone = 0 ;hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input warn-temperature = 65 format =