some changes

2020-02-02 11:27:49 +02:00 · 2020-02-02 11:27:49 +02:00 · c39181b2fe
parent 49343a15b5
commit c39181b2fe
13 changed files with 208 additions and 39 deletions
--- a/.config/Scripts/expressvpn-status.sh
+++ b/.config/Scripts/expressvpn-status.sh
@ -0,0 +1,19 @@
+
+#!/bin/sh
+
+STATUS=$(expressvpn status | cut -d " " -f 1)
+IP=$(ip route get 8.8.8.8 | head -1 | awk '{print $7}')
+SSID=$(nmcli -f SSID | head -1 | cut -d " " -f 4)
+
+if [ "$STATUS" != "Not" ]; then
+    echo " ${IP} "
+
+elif [ "$SSID" = "ASUS_5G" ] || [ "$SSID" = "ASUS" ]; then  
+    echo " ${IP} "
+
+elif [ "$SSID" = "OP3T" ] || [ "$SSID" = "Samsung" ]; then  
+    echo " ${IP} "
+
+elif [ "$SSID" != "ASUS_5G" || "ASUS" || "OP3T" || "Samsung" ]; then  
+    echo " ${IP} "
+fi
--- a/.config/Scripts/on
+++ b/.config/Scripts/on
@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# to edit themes in place with live reload:
+# ag -l | entr -r $HOME/.config/rofi/on
+# use -normal-window flag on rofi if you want to not have to close rofi to get
+# back to your editor.
+# https://www.reddit.com/r/qtools/comments/amswu9/autoloading_rofi_for_quick_themeing_experience/
+
+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 1700)
+
+echo "This is your selection: $selection"
+
+case "${selection}" in
+    "     lock")
+        betterlockscreen -l dim;;
+    "     logout")
+        i3-msg exit;;
+    "      sleep")
+        systemctl suspend;;
+    "      hibernate")
+        systemctl hibernate;;
+    "      reboot")
+        systemctl reboot;;
+    "      shutdown")
+        systemctl poweroff -i;;
+esac
+
+exit 0
--- a/.config/Scripts/startupuv
+++ b/.config/Scripts/startupuv
@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This script uses a config file at this location to adjust the
+# undervoltage of the core/cache and GPU. Source references the 
+# alisas from that location so the the undervolt can be easily changed.
+# This can be deleted and the desired undervolt can be applyed directly from here.
+
+source "/home/hate/.config/Scripts/config"
+
+/home/hate/.config/Scripts/undervolt.py --core "${CORE2}" --cache "${CORE2}" --gpu "${GPU2}"
+
+exit 0
--- a/.config/Scripts/sysinfo
+++ b/.config/Scripts/sysinfo
@ -0,0 +1,55 @@
+#!/bin/bash
+# Source : https://github.com/Morgareth99/Funtoo-Dots/blob/master/Funtoo-Dots/Scripts/sysinfo.sh
+# Edited : Erik Dubois - changed to work on ArcoLinux
+#
+# install software
+# sudo pacman -S wmctrl
+# awesome font displays in Termite not in urxvt
+
+OS=$(cat /etc/lsb-release | awk -F '=' '/DISTRIB_ID/ {print $2}')
+KERNEL=$(uname -r)
+ARCH=$(uname -m)
+VERSION=$(cat /etc/lsb-release | awk -F '=' '/DISTRIB_RELEASE/ {print $2}')
+UPTIME=$(awk '{printf("%d:%02d:%02d:%02d",($1/60/60/24),($1/60/60%24),($1/60%60),($1%60))}' /proc/uptime)
+MODEL=$(cat /sys/devices/virtual/dmi/id/board_{name,vendor} | awk '!(NR%2){print$1,p}{p=$0}')
+DE=$(wmctrl -m | awk 'NR==1 {print $2}' | perl -nle 'print ucfirst lc')
+CPU=$(awk < /proc/cpuinfo '/model name/{gsub(/[(TMR)]/,"");print $4,$5,$6}' | head -1)
+#GPU=$(nvidia-smi --query-gpu=gpu_name --format=csv|sed -n 2p)
+SHELL=$(echo "$SHELL" | awk -F/ '{for ( i=1; i <= NF; i++) sub(".", substr(toupper($i),1,1) , $i); print $NF}')
+RESOLUTION=$(xdpyinfo | awk '/dimensions:/ {printf $2}')
+BIRTH=$(ls -alct /|sed '$!d'|awk '{print $7, $6, $8}')
+
+
+GtkTheme=$(awk < ~/.gtkrc-2.0 -F'"' '/gtk-theme-name/{print $2}')
+GtkIcon=$(awk < ~/.gtkrc-2.0 -F'"' '/gtk-icon-theme-name/{print $2}' )
+GtkFont=$(awk < ~/.gtkrc-2.0 -F'"' '/gtk-font-name/{print $2}')
+
+
+Packages=$(checkupdates | wc -l)
+Layout=$(setxkbmap -print | awk -F"+" '/xkb_symbols/{for ( i=1; i <= NF; i++) sub(".", substr(toupper($i),1,1) , $i); print $2}')
+
+
+ echo  ""
+ echo -e "\e[91m   --------------------"
+ echo "   SYSTEM INFORMATION"
+ echo "   --------------------"
+ echo  ""
+ echo -e "\e[91m     $USER"
+ echo -e "\e[94m     \e[39m$MODEL"
+ echo -e "\e[94m     \e[39m$OS $ARCH $VERSION"
+ echo -e "\e[94m     \e[39m$KERNEL"
+ echo -e "\e[94m     \e[39m$UPTIME"
+ echo -e "\e[94m     \e[39m$SHELL"
+ echo -e "\e[94m     \e[39m$RESOLUTION"
+ echo -e "\e[94m     \e[39m$CPU"
+ #echo -e "\e[94m     \e[39m$GPU"
+ echo -e "\e[91m   --------------------"
+ echo -e "\e[91m     \e[31m$DE"
+ echo -e "\e[94m     \e[39m$GtkTheme"
+ echo -e "\e[94m     \e[39m$GtkIcon"
+ echo -e "\e[94m     \e[39m$GtkFont"
+ echo -e "\e[94m     \e[39m$BIRTH"
+ echo -e "\e[91m   --------------------"
+ echo -e "\e[91m     \e[31m$Packages"
+ echo -e "\e[94m     \e[39m$Layout"
+ echo  ""
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@ -35,7 +35,7 @@ selection_background #d75f5f
 #cursor           #8fee96

 # The cursor shape can be one of (block, beam, underline)
-cursor_shape     block
+cursor_shape     underline

 # The interval (in seconds) at which to blink the cursor. Set to zero to
 # disable blinking.
--- a/.config/networkmanager-dmenu/config.ini
+++ b/.config/networkmanager-dmenu/config.ini
@ -0,0 +1,30 @@
+[dmenu]
+fn = -*-UbuntuMono Nerd Font Mono*-*-*-20-*-*-*-*-*-*-*
+dmenu_command = rofi -width 15
+# # Note that dmenu_command can contain arguments as well like `rofi -width 30`
+# # Rofi and dmenu are set to case insensitive by default `-i`
+# l = number of lines to display, defaults to number of total network options
+# fn = font string
+# nb = normal background (name, #RGB, or #RRGGBB)
+# nf = normal foreground
+# sb = selected background
+# sf = selected foreground
+# b =  (just set to empty value and menu will appear at the bottom
+# m = number of monitor to display on
+# p = Custom Prompt for the networks menu
+pinentry = /usr/bin/pinentry
+rofi_highlight = True
+# (Default: False) use rofi highlighting instead of '**'
+
+# # override normal foreground and background colors (dmenu) or use the
+# # -password option (rofi) to obscure passphrase entry
+# [dmenu_passphrase]
+# nf = #222222
+# nb = #222222
+rofi_obscure = True
+
+[editor]
+terminal = kitty
+gui_if_available = True
+# terminal = <name of terminal program>
+# gui_if_available = <True or False>
--- a/.config/nvim/config/main.vim
+++ b/.config/nvim/config/main.vim
@ -6,11 +6,20 @@
 "                                                                 /___/
 "
 "***********************************************************************************
+" Colorscheme and highlight settings
+" General settings about colors
+" Enable true colors support. Do not use this option if your terminal does not
+" support true colors! For a comprehensive list of terminals supporting true
+" colors, see https://github.com/termstandard/colors and https://bit.ly/2InF97t.
+if $TERM == "xterm-256color" || exists('g:started_by_firenvim')
+    set termguicolors
+endif

-
+" Use dark background
+set background=dark

 " Colorscheme
-colorscheme gruvbox
+colorscheme gruvbox8

 augroup specify_filetype
    autocmd!
--- a/.config/nvim/config/plugins.vim
+++ b/.config/nvim/config/plugins.vim
@ -93,4 +93,5 @@ Plug 'deviantfero/wpgtk.vim'
 Plug 'nanotech/jellybeans.vim'
 Plug 'cocopon/iceberg.vim'
 Plug 'morhetz/gruvbox'
+ Plug 'lifepillar/vim-gruvbox8'
 call plug#end()
--- a/.config/picom.conf
+++ b/.config/picom.conf
@ -71,8 +71,10 @@ blur-background-exclude = [
 ];
 opacity-rule = [
    #"0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'",
-    "99:class_g = 'kitty' && !focused",
-    "90:class_g = 'kitty' && focused",
+    "99:class_g = 'kitty' && _NET_WM_STATE@:32a",
+    "90:class_g = 'kitty' && !_NET_WM_STATE@:32a",
+    #"99:class_g = 'kitty' && !focused",
+    #"90:class_g = 'kitty' && focused",
 ];

 ##############
--- a/.config/polybar/config
+++ b/.config/polybar/config
@ -222,7 +222,7 @@ label-background = ${colors.blue}
 [module/temperature]
 type = internal/temperature
 thermal-zone = 1
-hwmon-path = /sys/devices/virtual/hwmon/hwmon1/temp1_input
+hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon5/temp1_input
 warn-temperature = 65
 format = <ramp> <label>
 format-underline = ${colors.foreground}
--- a/.config/wpg/templates/config_twmn_twmn.conf.base
+++ b/.config/wpg/templates/config_twmn_twmn.conf.base
@ -4,7 +4,7 @@ always_on_top=true
 background_color={color0}
 bounce=true
 bounce_duration=500
-font=Ubuntu Mono derivative Powerline
+font=UbuntuMono Nerd Font Mono
 font_size=12
 font_variant=medium
 foreground_color=#999999
--- a/.p10k.zsh
+++ b/.p10k.zsh
@ -48,8 +48,8 @@
  # automatically hidden when the input line reaches it. Right prompt above the
  # last prompt line gets hidden if it would overlap with left prompt.
  typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(
-    #status                  # exit code of the last command
-    command_execution_time  # duration of the last command
+    # status                  # exit code of the last command
+    # command_execution_time  # duration of the last command
    background_jobs         # presence of background jobs
    direnv                  # direnv status (https://direnv.net/)
    virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
@ -159,18 +159,20 @@

  # Connect left prompt lines with these symbols. You'll probably want to use the same color
  # as POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND below.
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%242F╭─'
-  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%242F├─'
-  typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%242F╰─'
+  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%015F╭─'
+  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%015F├─'
+  typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%015F╰─'
  # Connect right prompt lines with these symbols.
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX='%242F─╮'
-  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX='%242F─┤'
-  typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX='%242F─╯'
+  # typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX='%242F─╮'
+  # typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX='%242F─┤'
+  # typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX='%242F─╯'

  # Filler between left and right prompt on the first prompt line. You can set it to ' ', '·' or
  # '─'. The last two make it easier to see the alignment between left and right prompt and to
  # separate prompt from command output. You might want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false
  # for more compact prompt if using using this option.
+  typeset -g POWERLEVEL9K_PROMPT_ON_NEWLINE=true
+  typeset -g POWERLEVEL9K_RPROMPT_ON_NEWLINE=true
  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR=' '
  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_BACKGROUND=
  if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then
@ -184,7 +186,7 @@
  fi

  # Default background color.
-  typeset -g POWERLEVEL9K_BACKGROUND=238
+  typeset -g POWERLEVEL9K_BACKGROUND=012

  # Separator between same-color segments on the left.
  typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='%246F\uE0B1'
@ -236,19 +238,19 @@

  ##################################[ dir: current directory ]##################################
  # Default current directory color.
-  typeset -g POWERLEVEL9K_DIR_FOREGROUND=31
+  typeset -g POWERLEVEL9K_DIR_FOREGROUND=233
  # If directory is too long, shorten some of its segments to the shortest possible unique
  # prefix. The shortened directory can be tab-completed to the original.
  typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique
  # Replace removed segment suffixes with this symbol.
  typeset -g POWERLEVEL9K_SHORTEN_DELIMITER=
  # Color of the shortened directory segments.
-  typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=103
+  typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=233
  # Color of the anchor directory segments. Anchor segments are never shortened. The first
  # segment is always an anchor.
-  typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=39
+  typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=233
  # Display anchor directory segments in bold.
-  typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true
+  typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=false
  # Don't shorten directories that contain any of these files. They are anchors.
  local anchor_files=(
    .bzr
@ -335,16 +337,16 @@

  #####################################[ vcs: git status ]######################################
  # Branch icon. Set this parameter to '\uF126 ' for the popular Powerline branch icon.
-  typeset -g POWERLEVEL9K_VCS_BRANCH_ICON='\uF126 '
+  typeset -g POWERLEVEL9K_VCS_BRANCH_ICON=' \uF126 '
  POWERLEVEL9K_VCS_BRANCH_ICON=${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}

  # VCS icons
-  typeset -g POWERLEVEL9K_VCS_GIT_ICON=' '
-  typeset -g POWERLEVEL9K_VCS_GIT_GITHUB_ICON=' '
-  typeset -g POWERLEVEL9K_VCS_GIT_GITLAB_ICON=' '
+  typeset -g POWERLEVEL9K_VCS_GIT_ICON=' '
+  typeset -g POWERLEVEL9K_VCS_GIT_GITHUB_ICON='  '
+  typeset -g POWERLEVEL9K_VCS_GIT_GITLAB_ICON='  '
  typeset -g POWERLEVEL9K_VCS_STAGED_ICON=' '
  typeset -g POWERLEVEL9K_VCS_UNSTAGED_ICON=' '
-  typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON=' '
+  typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON=' '
  typeset -g POWERLEVEL9K_VCS_INCOMING_CHANGES_ICON=' '
  typeset -g POWERLEVEL9K_VCS_OUTGOING_CHANGES_ICON=' '
  # Untracked files icon. It's really a question mark, your font isn't broken.
@ -379,11 +381,11 @@

    if (( $1 )); then
      # Styling for up-to-date Git status.
-      local       meta='%248F'  # grey foreground
-      local      clean='%76F'   # green foreground
-      local   modified='%178F'  # yellow foreground
-      local  untracked='%39F'   # blue foreground
-      local conflicted='%196F'  # red foreground
+      local       meta='%233F'  # grey foreground
+      local      clean='%233F'   # green foreground
+      local   modified='%233F'  # yellow foreground
+      local  untracked='%233F'   # blue foreground
+      local conflicted='%233F'  # red foreground
    else
      # Styling for incomplete and stale Git status.
      local       meta='%244F'  # grey foreground
@ -450,7 +452,7 @@
  typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1

  # Icon color.
-  typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76
+  typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=233
  typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=244
  # Custom icon.
  # typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION='⭐'
@ -464,9 +466,12 @@

  # These settings are used for respositories other than Git or when gitstatusd fails and
  # Powerlevel10k has to fall back to using vcs_info.
-  typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=76
-  typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=76
-  typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=178
+  typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=233
+  typeset -g POWERLEVEL9K_VCS_CLEAN_BACKGROUND=155
+  typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=233
+  typeset -g POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND=160
+  typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=233
+  typeset -g POWERLEVEL9K_VCS_MODIFIED_BACKGROUND=220

  ##########################[ status: exit code of the last command ]###########################
  # Enable OK_PIPE, ERROR_PIPE and ERROR_SIGNAL status states to allow us to enable, disable and
@ -1045,7 +1050,7 @@
  typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20
  typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=160
  # Show battery in green when it's charging or fully charged.
-  typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=70
+  typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=155
  # Show battery in yellow when it's discharging.
  typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178
  # Battery pictograms going from low to high level of charge.
--- a/.zshrc
+++ b/.zshrc
@ -31,9 +31,9 @@ if [ -r $HOME/.zaliases ] ; then
    source $HOME/.zaliases
 fi

-if [ -r $HOME/.powerlevelrc ] ; then
-source $HOME/.powerlevelrc
-fi
+#if [ -r $HOME/.powerlevelrc ] ; then
+#    source $HOME/.powerlevelrc
+#fi

 ZSH_THEME="powerlevel10k/powerlevel10k"

@ -125,4 +125,4 @@ if [ -f '/home/hate/google-cloud-sdk/completion.zsh.inc' ]; then source '/home/h
 #[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-#[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh