Merge branch 'master' of https://github.com/mastermindzh/dotfiles

Added the isos mountpoint to the mounts script
Switched to powerline-rs

README.md

@@ -4,11 +4,12 @@ This repository holds my Linux config files.
 
 ## Mandatory unixporn screenshots
 
-New version as of dec 2018:
+New version as of dec 2021:
-[![dotfiles](media/dotfiles3.png)](https://raw.githubusercontent.com/Mastermindzh/dotfiles/master/media/dotfiles3.png)
+
+[![dotfiles](media/dotfiles4.jpg)](https://raw.githubusercontent.com/Mastermindzh/dotfiles/master/media/dotfiles4.jpg)
 
 Older versions:
-
+- [dotfiles](media/dotfiles3.png)
 - [dotfiles](media/dotfiles.png)
 - [dotfiles2](media/dotfiles2.png)
 
@@ -36,3 +37,14 @@ I've grown tired of this approach however so I added a "pc specific" setup in th
 
 The pc specific setup bit will read the folder names in computers, offer you a choice, and execute the install.sh inside that folder.
 This allows me to get pc specific settings synced with git and applied easily.
+
+## Getting x info to use in i3
+
+Some things are handled by window class/title or have custom resolutions set, the tools below help obtaining the info required:
+
+- xprop -> displays static xwindow info including Window class
+- xwininfo -> displays xwindow info including current size/position
+
+## getting icons
+
+Copy/paste icons from this url: [https://fontawesome.com/v5/cheatsheet](https://fontawesome.com/v5/cheatsheet)

bash/.alias.sh

@@ -17,20 +17,23 @@ alias docker-clean-all='stop-dockers && docker-clean-containers && docker-clean-
 alias mkubectl='microk8s.kubectl'
 alias kubestart='microk8s.start'
 alias kubestop='microk8s.stop'
+alias kubecontexts='kubectl config get-contexts'
 
 #dotnet core
 alias efupdate="dotnet ef database update"
 alias efmigrate="dotnet ef migrations add"
 alias efremove="dotnet ef migrations remove"
 alias dotnetnew="dotnet new webapi -o "
+alias nuget-force-clear-cache="nuget locals all -clear && nuget locals all -list | awk '{split($0,a,\": \"); print a[2];}' | xargs rm -rf"
 
 # git
 alias gitremovelocalbranches='git branch --merged | egrep -v "(^\*|master|dev)" | xargs git branch -d'
 alias untangle-line-endings='find ./ -type f -exec dos2unix {} \;'
+alias undo-commit='git reset --soft HEAD^'
 
 ## pacman and trizen
 alias aur='trizen --noconfirm'
-alias update='trizen -Syyu --noconfirm'
+alias update='trizen -Syu --noconfirm'
 alias remove-orphans='sudo pacman -Rns $(pacman -Qtdq)'
 alias updatekeys='sudo pacman-key --refresh-key'
 alias clean-pacmancache='sudo paccache -rk 1 && sudo paccache -ruk0'
@@ -58,7 +61,19 @@ alias pretty-json='python -m json.tool'
 alias addpgpkey='gpg --recv-keys'
 alias clean-trash='sudo rm -rf ~/.local/share/Trash/*'
 alias clean-journal='sudo journalctl --vacuum-time=2d'
-alias clean-all='clean-trash && clean-journal && clean-pacmancache && docker-clean-all'
+alias clean-all='clean-trash && clean-journal && clean-pacmancache && docker-clean-all && clean-node-modules'
+alias dotnet-install='~/.dotnet-install.sh --install-dir /usr/share/dotnet/ -channel Current -version '
+alias mountshares='sudo bash ~/dotfiles/bash/mounts.sh'
+alias echo-server='npx http-echo-server'
+alias mountcalibre='sudo mount.cifs //10.10.1.11/books /mnt/calibre -o nobrl,user=mastermindzh,noperm,rw'
+alias xpid="xprop _NET_WM_PID | cut -d' ' -f3"
+alias clean-node-modules='find . -name "node_modules" -type d -print0 |xargs -0 rm -r --'
+alias nomachine='/usr/NX/bin/nxplayer'
+alias unlockuser='faillock --reset --user'
+alias npm-list-links='npm ls -g --depth=0 --link=true'
+
+# might be useful in demos...
+alias oopsie='fuck'
 
 # cli tools
 alias crypto='curl -s rate.sx?qF | head -n -2 | tail -n +10'
@@ -84,13 +99,16 @@ alias cmyip='curl -s http://ipecho.net/plain; echo'
 ## default command fixes :P
 alias mkdir='mkdir -p'
 alias wget='wget -c'
-alias ls='ls -l --color=auto'
+alias ls='ls -lh --color=auto'
 alias installed='sudo pacman -Qetq'
 alias aurinstalled='sudo pacman -Qmq'
 alias sudo='sudo '
 alias markdown-toc='markdown-toc --bullets="-" -i'
 alias tree='tree --dirsfirst'
 alias handbrake='ghb'
+alias cal='cal -mw --color'
+alias chrome='google-chrome-stable'
+alias teams='teams-insiders --disable-seccomp-filter-sandbox'
 
 # grub
 alias update-grub='grub-mkconfig -o /boot/grub/grub.cfg'
@@ -161,7 +179,7 @@ killport () {
 }
 
 # function to switch kubernetes namespace
-kubeswitch () {
+kubenamespaceswitch () {
     if [ -z "$1" ] ; then
         echo "please specify a namespace to switch to"
     else
@@ -169,6 +187,16 @@ kubeswitch () {
     fi
 }
 
+# function to switch kubernetes context
+kubecontextswitch () {
+    if [ -z "$1" ] ; then
+        echo "please specify a context to switch to, the following contexts are available:"
+        kubectl config get-contexts
+    else
+        kubectl config use-context "$1"
+    fi
+}
+
 # function to switch to a different azure kubernetes cluster
 azkubeswitch () {
     if [ -z "$2" ] ; then

bash/.bashrc

@@ -1,22 +1,49 @@
+#!/bin/bash
 # if powerline-shell is available use it.
 function _update_ps1() {
-    if hash powerline-shell 2>/dev/null; then
+    if hash powerline-rs 2>/dev/null; then
-        PS1=$(powerline-shell $?)
+        PS1="$(powerline-rs --shell bash $?)"
     fi
 }
 
+# sourceIfExists
+function sourceIfExists () {
+    [[ -f "$1" ]] && source "$1"
+}
+
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
 source ~/.alias
 source ~/.custom
 source ~/.variables
+sourceIfExists ~/lib/azure-cli/az.completion
+eval "$(thefuck --alias)"
+
+# load keychain with private key
+if test -f "$HOME/.ssh/id_ed25519"; then
+    eval "$(keychain --eval --quiet ~/.ssh/id_ed25519)"
+else
+    # fallback to older rsa
+    eval "$(keychain --eval --quiet ~/.ssh/id_rsa)"
+fi
+
+eval "$(pyenv init -)"
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+if hash dotnet 2>/dev/null; then
+    export DOTNET_ROOT=/usr/share/dotnet
+    export MSBuildSDKsPath=$DOTNET_ROOT/sdk/$(${DOTNET_ROOT}/dotnet --version)/Sdks
+    export PATH="${PATH}:${DOTNET_ROOT}:~/.dotnet/tools"
+fi
 
-#... :P fancy stuffs
-#screenfetch -t -A "UBUNTU"
-neofetch
 PS1='[\u@\h \W]\$ '
 
 if [[ $TERM != linux && ! $PROMPT_COMMAND =~ _update_ps1 ]]; then
     PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
 fi
+
+export PATH=$PATH:/home/mastermindzh/bin

bash/.powerline-shell.json

@@ -1,11 +1,3 @@
 {
-  "segments": [
+  "segments": ["virtual_env", "ssh", "cwd", "git", "hg", "jobs", "root"]
-    "virtual_env",
-    "ssh",
-    "cwd",
-    "git",
-    "hg",
-    "jobs",
-    "root"
-  ]
 }

bash/mounts.sh

@@ -7,7 +7,7 @@ if [ "$EUID" -ne 0 ]; then
 fi
 
 # declare variables
-MY_SERVER_LOCATION="//192.168.1.3"
+MY_SERVER_LOCATION="//10.10.1.11"
 MOUNT_PREFIX="/mnt"
 USERNAME="mastermindzh"
 
@@ -41,7 +41,36 @@ declare -A MOUNTS3=(
   [share]='appdata'
   [mount]='appdata'
 )
-
+declare -A MOUNTS4=(
+  [server]="$MY_SERVER_LOCATION"
+  [share]='isos'
+  [mount]='isos'
+)
+declare -A MOUNTS5=(
+  [server]="$MY_SERVER_LOCATION"
+  [share]='books'
+  [mount]='books'
+)
+declare -A MOUNTS6=(
+  [server]="$MY_SERVER_LOCATION"
+  [share]='pictures'
+  [mount]='pictures'
+)
+declare -A MOUNTS7=(
+  [server]="$MY_SERVER_LOCATION"
+  [share]='nvme1'
+  [mount]='nvme1'
+)
+declare -A MOUNTS8=(
+  [server]="$MY_SERVER_LOCATION"
+  [share]="downloads"
+  [mount]="downloads"
+)
+declare -A MOUNTS9=(
+  [server]="$MY_SERVER_LOCATION"
+  [share]="emulation"
+  [mount]="emulation"
+)
 # declare array with "objects"
 declare -n MOUNTS
 

computers/dev-pc/xprofile.sh

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/sh
-xrandr --output DVI-I-0 --off --output DVI-I-1 --off --output HDMI-0 --mode 1920x1080 --pos 1920x0 --rotate normal --output DP-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-1 --off --output DVI-D-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal
+xrandr --output DVI-I-0 --off --output DVI-I-1 --off --output HDMI-0 --primary --mode 1920x1080 --pos 0x0 --rotate normal --output DP-0 --off --output DP-1 --off --output DVI-D-0 --off

computers/work-xps/custom-bashrc.sh

@@ -7,3 +7,4 @@ alias unmountdata='sudo umount /home/mastermindzh/data && sudo cryptsetup close
 # useful kubernetes (AZURE) commands
 alias kubernetes-qa='azkubeswitch Inforit.Cloud InforitCluster'
 alias kubernetes-prod='azkubeswitch Inforit.Cloud Production'
+alias kubernetes-dev='azkubeswitch Inforit.Cloud Development'

config/.gitconfig

@@ -12,3 +12,7 @@
 [core]
 	autocrlf = input
 	editor = nano
+[pull]
+	rebase = false
+[init]
+	defaultBranch = master

config/gtk-3.0/settings.ini

@@ -1,8 +1,8 @@
 gtk-application-prefer-dark-theme=0
-gtk-theme-name=Arc
+gtk-theme-name="Adwaita-dark"
-gtk-icon-theme-name=Numix
+gtk-icon-theme-name="Numix"
-gtk-font-name=System San Francisco Display 12
+gtk-font-name="Cantarell 11"
-gtk-cursor-theme-name=Breeze
+gtk-cursor-theme-name="elementary"
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
@@ -12,5 +12,5 @@ gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
+gtk-xft-hintstyle="hintmedium"
-gtk-xft-rgba=rgb
+gtk-xft-rgba="none"

config/mimeapps.list

@@ -0,0 +1,76 @@
+[Default Applications]
+
+# browser
+#--------------
+text/html=firefox.desktop
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+x-scheme-handler/about=firefox.desktop
+x-scheme-handler/unknown=firefox.desktop
+x-scheme-handler/webcal=firefox.desktop
+x-scheme-handler/chrome=firefox.desktop
+application/x-extension-htm=firefox.desktop
+application/x-extension-html=firefox.desktop
+application/x-extension-shtml=firefox.desktop
+application/xhtml+xml=firefox.desktop
+application/x-extension-xhtml=firefox.desktop
+application/x-extension-xht=firefox.desktop
+
+# apps
+#--------------
+x-scheme-handler/postman=Postman.desktop
+x-scheme-handler/ssh=ktelnetservice5.desktop
+x-scheme-handler/msteams=teams-insiders.desktop
+x-scheme-handler/discord-478576776990425110=discord-478576776990425110.desktop
+x-scheme-handler/mailspring=Mailspring.desktop
+x-scheme-handler/etcher=balena-etcher-electron.desktop
+
+# files
+#--------------
+inode/director=Nautilus.desktop
+
+[Added Associations]
+# browser-stuff
+#--------------
+x-scheme-handler/http=firefox.desktop;
+x-scheme-handler/https=firefox.desktop;
+text/html=firefox.desktop;
+
+# text
+#--------------
+text/plain=gnome.gedit.desktop;
+application/pdf=mupdf.desktop;firefox.desktop;
+text/vnd.qt.linguist=org.gnome.gedit.desktop;
+text/x-nfo=gnome.gedit.desktop;
+text/x-log=code-insiders.desktop;
+
+# images
+#--------------
+image/jpeg=org.gnome.eog.desktop;feh.desktop;
+image/png=org.gnome.eog.desktop;feh.desktop;
+image/svg+xml=org.gnome.eog.desktop;feh.desktop;
+image/gif=org.gnome.eog.desktop;feh.desktop;
+
+# video
+#--------------
+video/mp4=mpv.desktop;
+video/x-matroska=mpv.desktop;
+video/x-msvideo=vlc.desktop;
+
+# code-related
+#--------------
+application/json=code-insiders.desktop;visual-studio-code-insiders.desktop;
+application/x-shellscript=visual-studio-code.desktop;
+application/sql=visual-studio-code.desktop;
+application/xml=visual-studio-code.desktop;
+application/javascript=visual-studio-code-insiders.desktop;
+
+# other
+#--------------
+application/zip=org.gnome.Nautilus.desktop;xarchiver.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=wps-office-wps.desktop;
+application/x-remmina=org.gnome.gedit.desktop;org.kde.krdc.desktop;remmina-file.desktop;org.remmina.Remmina.desktop;
+
+# newly added
+#--------------
+

config/package-managers/pacman.conf

@@ -33,7 +33,7 @@ Architecture = auto
 #UseSyslog
 Color
 ILoveCandy
-TotalDownload
+#TotalDownload
 CheckSpace
 VerbosePkgLists
 

config/package-managers/trizen.conf

@@ -17,7 +17,7 @@ our $CONFIG = {
   flip_results                 => 0,                             # bool -- Show the search results in reverse order.
   force                        => 0,                             # bool -- Pass the `--force` flag to `pacman`.
   git_clone_depth              => 0,                             #  int -- Pass the `--depth int` flag to `git clone`. (0 means no limit)
-  install_built_with_noconfirm => 0,                             # bool -- Install built packages with `--noconfirm`.
+  install_built_with_noconfirm => 1,                             # bool -- Install built packages with `--noconfirm`.
   lwp_env_proxy                => 1,                             # bool -- Use proxy settings defined in `env` (if any).
   lwp_show_progress            => 0,                             # bool -- Show the HTTPS requests made by LWP::UserAgent to the AUR servers.
   lwp_timeout                  => 60,                            #  int -- Seconds after which an HTTPS connection is aborted.
@@ -45,8 +45,8 @@ our $CONFIG = {
   split_packages               => 1,                             # bool -- Ask about installing the other parts of a split package.
   ssl_verify_hostname          => 1,                             # bool -- Ensure LWP::UserAgent connects to servers that have a valid certificate.
   su_command                   => "/usr/bin/su -c",              #  str -- Command used when special permissions are required and `use_sudo` is set to 0.
-  sudo_autorepeat              => 0,                             # bool -- Automatically repeat `sudo -v` in the background after a `sudo` command was first executed.
+  sudo_autorepeat              => 1                              # bool -- Automatically repeat `sudo -v` in the background after a `sudo` command was first executed.
-  sudo_autorepeat_at_runtime   => 0,                             # bool -- Execute `sudo -v` when `trizen` is first executed and apply the behavior of `sudo_autorepeat`.
+  sudo_autorepeat_at_runtime   => 1,                             # bool -- Execute `sudo -v` when `trizen` is first executed and apply the behavior of `sudo_autorepeat`.
   sudo_autorepeat_interval     => 180,                           #  int -- Interval, in seconds, after which `sudo -v` is executed in background (with `sudo_autorepeat`).
   sudo_command                 => "/usr/bin/sudo",               #  str -- Command used when special permissions are required and `use_sudo` is set to 1.
   use_sudo                     => 1,                             # bool -- Use the `sudo` command when special permissions are required.

config/picom.conf

@@ -0,0 +1,6 @@
+#################################
+#   Transparency / Opacity      #
+#################################
+
+# Opacity of inactive windows. (0.1 - 1.0)
+inactive-opacity = 1.0;

config/rofi

@@ -1,12 +0,0 @@
-rofi.color-window: #1e1e1e, #333333, #333333
-rofi.color-normal: #1e1e1e, #848484, #1e1e1e, #333333, #f6f6f7
-rofi.color-active: #333333, #ef5350, #0000ff, #333333, #f6f6f7
-rofi.color-urgent: #333333, #ef5350, #0000ff, #333333, #f6f6f7
-
-rofi.lines: 10
-rofi.line-padding: 5
-rofi.font: monospace 10
-
-rofi.terminal:             xfce4-terminal
-rofi.ssh-client:           ssh
-rofi.ssh-command:          {terminal} -e "{ssh-client} {host}"

config/rofi/mytheme.rasi

@@ -0,0 +1,162 @@
+/* 
+    old color theme
+    ----------------
+    State:           'bg',     'fg',     'bgalt',  'hlbg',   'hlfg'
+    ----------------------------------------------------------------
+    color-normal: "#1e1e1e, #848484, #1e1e1e, #333333, #f6f6f7";
+    color-urgent: "#333333, #ef5350, #0000ff, #333333, #f6f6f7";
+    color-active: "#333333, #ef5350, #0000ff, #333333, #f6f6f7";
+    color-window: "#1e1e1e, #333333, #333333";
+*/
+
+* {
+    /* my vars */
+    background:                  #1e1e1e;
+    background-color:            @background;
+    foreground:                  #848484;
+    foreground-normal:           @foreground;
+    urgent:                      #333333;
+    active-fg:                   #ef5350;
+
+    /* background */
+    normal-background:           @background;
+    alternate-urgent-background: @background;
+    lightbg:                     @background;
+    alternate-active-background: @background;
+    alternate-normal-background: @background;
+    selected-normal-background:  rgba ( 57, 66, 73, 100 % );
+
+    /* foreground */
+    normal-foreground:           @foreground-normal;
+    alternate-normal-foreground: @foreground;
+    selected-normal-foreground:  rgba ( 255, 255, 255, 100 % );
+    selected-urgent-foreground:  @urgent;
+    active-foreground:           @active-fg;
+    urgent-foreground:           @red;
+    alternate-urgent-foreground: @urgent-foreground;
+    alternate-active-foreground: @active-foreground;
+
+
+    /* borders */
+    bordercolor:                 @background;
+    border-color:                @background;
+
+    selected-active-foreground:  rgba ( 128, 203, 196, 100 % );
+    
+    lightfg:                     rgba ( 88, 104, 117, 100 % );
+    spacing:                     2;
+    separatorcolor:              rgba ( 30, 37, 41, 100 % );
+    urgent-background:           rgba ( 39, 50, 56, 100 % );
+    selected-urgent-background:  rgba ( 57, 66, 73, 100 % );
+    active-background:           rgba ( 39, 50, 56, 100 % );
+    selected-active-background:  rgba ( 57, 66, 73, 100 % );
+}
+window {
+    background-color: @background;
+    border:           1;
+    padding:          5;
+}
+mainbox {
+    border:  0;
+    padding: 0;
+}
+message {
+    border:       1px dash 0px 0px ;
+    border-color: @separatorcolor;
+    padding:      1px ;
+}
+textbox {
+    text-color: @foreground;
+}
+listview {
+    fixed-height: 0;
+    border:       2px dash 0px 0px ;
+    border-color: @separatorcolor;
+    spacing:      2px ;
+    scrollbar:    true;
+    padding:      2px 0px 0px ;
+}
+element {
+    border:  0;
+    padding: 1px ;
+}
+element-text {
+    background-color: inherit;
+    text-color:       inherit;
+}
+element.normal.normal {
+    background-color: @normal-background;
+    text-color:       @normal-foreground;
+}
+element.normal.urgent {
+    background-color: @urgent-background;
+    text-color:       @urgent-foreground;
+}
+element.normal.active {
+    background-color: @active-background;
+    text-color:       @active-foreground;
+}
+element.selected.normal {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+element.selected.urgent {
+    background-color: @selected-urgent-background;
+    text-color:       @selected-urgent-foreground;
+}
+element.selected.active {
+    background-color: @selected-active-background;
+    text-color:       @selected-active-foreground;
+}
+element.alternate.normal {
+    background-color: @alternate-normal-background;
+    text-color:       @alternate-normal-foreground;
+}
+element.alternate.urgent {
+    background-color: @alternate-urgent-background;
+    text-color:       @alternate-urgent-foreground;
+}
+element.alternate.active {
+    background-color: @alternate-active-background;
+    text-color:       @alternate-active-foreground;
+}
+scrollbar {
+    width:        4px ;
+    border:       0;
+    handle-width: 8px ;
+    padding:      0;
+}
+mode-switcher {
+    border:       2px dash 0px 0px ;
+    border-color: @separatorcolor;
+}
+button.selected {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+inputbar {
+    spacing:    0;
+    text-color: @normal-foreground;
+    padding:    1px ;
+}
+case-indicator {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+entry {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+prompt {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+inputbar {
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
+}
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3em 0em 0em ;
+    text-color: @normal-foreground;
+}

config/rofi/rofi.rasi

@@ -0,0 +1,14 @@
+configuration {
+        modi: "window,run,ssh,combi";
+        font: "monospace 10";
+        terminal: "xfce4-terminal";
+        ssh-client: "ssh";
+        ssh-command: "{terminal} -e "{ssh-client} {host}"";
+        
+/* ! State:           'bg',     'fg',     'bgalt',  'hlbg',   'hlfg'
+        lines: 10;
+        line-padding: 5;
+        */
+}
+
+@theme "~/.config/rofi/mytheme.rasi"

dependencies/aur.txt

@@ -1,14 +1,20 @@
-notify-osd-customizable
+visual-studio-code-bin
-notifyconf
+i3blocks-contrib
 enpass-bin
 insync
-visual-studio-code-insiders
 ttf-font-awesome-4
 awesome-terminal-fonts-git
 otf-droid-sans-mono-powerline-git
 downgrade
+powerline-rs
 dive
 xorg-xev
 networkmanager-l2tp
 snapd
-i3blocks-contrib
+azure-cli
+notify-osd-customizable
+notifyconf
+dotnet-host-bin
+sysmontask
+keychain
+nomachine

dependencies/pacman.txt

@@ -1,3 +1,4 @@
+base-devel
 xorg-server
 xorg-xinit
 mesa
@@ -7,8 +8,8 @@ i3lock
 feh
 scrot
 arandr
-chromium
 xfce4-terminal
+ttf-font-awesome
 sushi
 libconfig
 compton
@@ -26,7 +27,6 @@ python-pip
 gdm
 neofetch
 git
-networkmanager
 scrot
 acpi
 imagemagick
@@ -68,5 +68,22 @@ networkmanager-openvpn
 ranger
 w3m
 system-config-printer
-thunar
+nautilus 
-thunar-archive-plugin
+nautilus-share
+wget
+pyenv
+jq
+firefox
+dotnet-host 
+dotnet-runtime
+dotnet-sdk
+aspnet-runtime
+clamav
+clamtk
+keychain
+thefuck
+peek
+blueman
+pulseaudio-bluetooth
+bluez
+bluez-libs

dependencies/pip.txt

@@ -1 +1,5 @@
-powerline-shell
+msrestazure
+azure.common
+azure.mgmt
+azure.mgmt.containerservice
+azure.graphrbac

i3/config

@@ -13,7 +13,7 @@ floating_modifier $mod
 #    Constants                             #
 ############################################
 
-set $urgentTextColour           #101218
+set $urgentTextBackgroundColour           #a6a6a6
 set $primaryBackgroundColour    #1e1e1e
 set $secondaryBackgroundColour  #252526
 set $tertiaryBackgroundColour   #333333
@@ -22,7 +22,7 @@ set $textColour                 #848484
 set $focusedTextColour          #f6f6f7
 
 set $statusLineColour           #d1d4e0
-set $urgentBackground           #ef5350
+set $urgentTextColour           #ef5350
 set $indicatorColour            #fcc09e
 
 set $workspace1 "1: "
@@ -31,11 +31,11 @@ set $workspace3 "3: "
 set $workspace4 "4: "
 set $workspace5 "5: "
 set $workspace6 "6: "
-set $workspace7 "7: "
+set $workspace7 "7: "
 set $workspace8 "8: "
 set $workspace9 "9: "
-set $workspace10 "10:  "
+set $workspace10 "10: "
-set $workspace11 " Virtualbox" 
+set $workspace11 " VM/Remote" 
 set $workspace12 " Enpass"
 
 # scripts
@@ -112,23 +112,25 @@ bindsym $mod+r mode "resize"
 # Lock the computer
 bindsym $mod+l exec /bin/bash ~/.config/i3/scripts/i3lock.sh
 
-# Lock the computer
+# Suspend the computer
 bindsym $mod+shift+l exec /bin/bash ~/.config/i3/scripts/suspend.sh
 
 ############################################
 #    Application Keys                      #
 ############################################
 bindsym $mod+Return exec xfce4-terminal                                 # terminal
-bindsym $mod+e exec xfce4-terminal -e ranger                            # File manager
+bindsym $mod+e exec nautilus                                            # File manager
 bindsym Print exec  flameshot screen -d 0 -p ~/Pictures/Screenshots     # Fullscreen screenshot
 bindsym $mod+Print exec flameshot gui					# Show screenshot window
 bindsym $mod+shift+b exec /bin/bash ~/.config/i3/scripts/brightness.sh
+bindsym control+shift+Escape exec sysmontask
 
 # Rofi
 bindsym $mod+d exec "rofi -show run"
 bindsym $mod+Tab exec "rofi -show"
 bindsym $mod+s exec "rofi -show ssh"
 bindsym $mod+n exec $vpnmanager
+bindsym $mod+shift+v exec "rofi -modi 'clipboard:greenclip print' -show clipboard -run-command '{cmd}'"
 
 ############################################
 #    Media keys                            #
@@ -187,8 +189,7 @@ bindsym $mod+Shift+p move container to workspace $workspace12
 #    Appearance settings                   #
 ############################################
 # Set the default font
-#font pango:DejaVu Sans Mono 8
+font pango:Liberation sans 13
-font pango:System San Francisco Display 10
 
 # Bar decoration
 bar {
@@ -204,7 +205,7 @@ bar {
                 focused_workspace  $primaryBackgroundColour $primaryBackgroundColour    $focusedTextColour
                 active_workspace   $primaryBackgroundColour $secondaryBackgroundColour  $textColour
                 inactive_workspace $primaryBackgroundColour $primaryBackgroundColour    $textColour
-                urgent_workspace   $primaryBackgroundColour $primaryBackgroundColour    $urgentBackground
+                urgent_workspace   $primaryBackgroundColour $primaryBackgroundColour    $urgentTextColour
     }
 }
 
@@ -216,13 +217,16 @@ hide_edge_borders both
 client.focused          $primaryBackgroundColour   $primaryBackgroundColour    $focusedTextColour $indicatorColour
 client.focused_inactive $secondaryBackgroundColour $secondaryBackgroundColour  $textColour        $indicatorColour
 client.unfocused        $secondaryBackgroundColour $secondaryBackgroundColour  $textColour        $indicatorColour
-client.urgent           $secondaryBackgroundColour $urgentBackground           $urgentTextColour  $indicatorColour
+client.urgent           $secondaryBackgroundColour $urgentTextBackgroundColour $urgentTextColour  $indicatorColour
 
 # Floating windows
 for_window [class="Pavucontrol"] floating enable
 for_window [class="Lxappearance"] floating enable
 for_window [class="Arandr"] floating enable
 for_window [class="Eog"] floating enable
+for_window [title="Tidal-hifi - settings"] floating enable
+for_window [class="Sysmontask"] floating enable
+for_window [class="Sysmontask"] resize set 930 665
 
 ############################################
 #    Workspace specific tools              #
@@ -230,7 +234,6 @@ for_window [class="Eog"] floating enable
 ############################################
 assign [class="Franz"] $workspace9
 assign [class="Enpass-Desktop"] $workspace12
-assign [class="Enpass"] $workspace12
 assign [class="VirtualBox Machine"] $workspace11
 
 # database stuff
@@ -303,10 +306,11 @@ mode "$mode_gaps_outer" {
 #    Autorun                               #
 ############################################
 exec --no-startup-id i3-msg 'workspace $workspace2; exec xfce4-terminal' && i3-msg 'workspace $workspace1'
-exec 'enpass'
+exec --no-startup-id i3-msg 'workspace $workspace12; exec enpass'
 exec --no-startup-id nm-applet
-exec_always feh --bg-scale ~/Pictures/Wallpapers/wallpaper.jpg
+exec_always feh --bg-scale $(find ~/Pictures/wallpapers/ -type f -name "*" | shuf -n 1)
 exec /usr/bin/compton
 exec /bin/bash ~/.config/i3/scripts/startup.sh
+exec --no-startup-id greenclip daemon
 
 bindsym $mod+Shift+a border normal

i3/i3blocks.conf

@@ -28,18 +28,11 @@ command=/usr/lib/i3blocks/$BLOCK_NAME/$BLOCK_NAME
 separator_block_width=15
 markup=none
 
-# Currently playing song
-[play_music]
-command=python ~/.config/i3/scripts/blocks/currentSong.py --layout t-A
-separator_block_width=13
-interval=1
-color=#e29e0b
-
 [tidal]
 command=bash ~/.config/i3/scripts/blocks/tidal.sh
 separator_block_width=13
 interval=1
-color=#4293f5
+color=#00ffff
 
 [weather]
 command=curl wttr.in?format=1
@@ -58,6 +51,16 @@ label=
 interval=1
 color=#999999
 
+# CPU usage
+#
+# The script may be called with -w and -c switches to specify thresholds,
+# see the script for details.
+[cpu_usage]
+label= 
+interval=1
+#min_width=CPU:100.00%
+separator=true
+
 [load_average]
 label= 
 interval=10
@@ -125,15 +128,6 @@ signal=10
 separator=true
 color=#999999
 
-# Battery indicator
-# The battery instance defaults to 0.
-# [battery]
-# label=
-# #instance=1
-# interval=30
-# separator=true
-# color=#999999
-
 # Battery indicator
 # The battery instance defaults to 0.
 [battery2]

i3/scripts/blocks/temp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-temp=$(sensors | # execute sensors
+intelTemp=$(sensors | # execute sensors
 grep -w "Core 0:" | # grep for the first core
 sed 's/([^)]*)//g' | # filter
 tr -s " " | # remove whitespace
@@ -8,5 +8,13 @@ sed -e 's/Core 0\(.*\):/\1/' | #  get value between Core 0 and :
 cut -c 3- | rev | cut -c 7- | rev #remove clutter
 )
 
+amdTemp=$(sensors | grep -w "Tdie:" | sed 's/([^)]*)//g' | tr -s " " | cut -c 8- | rev | cut -c 6- | rev)
+
 # echo out the result
-echo $temp°C
+if [ -z "$intelTemp" ]
+then
+      echo $amdTemp
+else
+      echo $intelTemp°C
+fi
+

i3/scripts/startup.sh

@@ -6,3 +6,10 @@ insync start
 # Wait for the programs to start then remove attention (e.g red blinking)
 sleep 1
 wmctrl -r "Enpass" -b remove,demands_attention
+
+
+# Start gkraken if the command exists
+if command -v gkraken &> /dev/null
+then
+    gkraken --hide-window &
+fi

install.sh

@@ -22,7 +22,7 @@ ask() {
             default=
         fi
         echo -n "$1 [$prompt] "
-        read reply </dev/tty
+        read -r reply </dev/tty
 
         if [ -z "$reply" ]; then
             reply=$default
@@ -38,20 +38,20 @@ ask() {
 
 # delete target, create dirs if they don't exist yet and finally symlink the dir
 function linkDir {
-	rm -rf $2;
+	rm -rf "$2";
 	mkdir -p "${2%/*}"
-	ln -sf $1 $2
+	ln -sf "$1" "$2"
 }
 
 # replace line endings with a space (for use in package managers)
 function fileToList {
-    echo $(cat $1 | sed ':a;N;$!ba;s/\n/ /g')
+    echo $(cat "$1" | sed ':a;N;$!ba;s/\n/ /g')
 }
 
 # create and copy files to directory
 function copyToDir {
-	echo $2 | sed 's%/[^/]*$%/%' | xargs mkdir -p
+	echo "$2" | sed 's%/[^/]*$%/%' | xargs mkdir -p
-	cp $1 $2
+	cp "$1" "$2"
 }
 
 # =======================================
@@ -62,16 +62,16 @@ function copyToDir {
 function install_fonts {
 	mkdir -p ~/.fonts
 	mkdir -p ~/.local/share/fonts
-	yes | cp -rf ./fonts/* ~/.fonts
+	cp -rf ./fonts/* ~/.fonts
-	yes | cp -rf ./fonts/* ~/.local/share/fonts
+	cp -rf ./fonts/* ~/.local/share/fonts
 }
 
 # install trizen, a aur helper
 function install_trizen {
     git clone https://aur.archlinux.org/trizen.git
-    pushd trizen
+    pushd trizen || return
     makepkg -si
-    popd
+    popd || return
     sudo rm -dRf trizen/
 }
 
@@ -79,8 +79,8 @@ function install_trizen {
 function install_config {
 
 	# link directories
-	linkDir "$PWD"/wallpapers ~/Pictures/Wallpapers
+	linkDir "$PWD"/wallpapers/images ~/Pictures/wallpapers
-	linkDir "$PWD"/i3/ ~/.config/i3
+	linkDir "$PWD"/i3 ~/.config/i3
 	linkDir "$PWD"/config/notify-osd/notify-osd ~/.notify-osd
 	linkDir "$PWD"/config/terminal/xfce4-term ~/.config/xfce4/terminal
 	linkDir "$PWD"/config/gtk-3.0/settings.ini ~/.config/gtk-3.0/.config
@@ -88,17 +88,23 @@ function install_config {
 
 	# link user files
 	ln -sf "$PWD"/bash/.bashrc ~/.bashrc
+  ln -sf "$PWD"/bash/.dotnet-install.sh ~/.dotnet-install.sh
 	ln -sf "$PWD"/bash/.alias.sh ~/.alias
 	ln -sf "$PWD"/config/nano/.nanorc ~/.nanorc
 	ln -sf "$PWD"/bash/.powerline-shell.json ~/.powerline-shell.json
-	ln -sf "$PWD"/wallpapers/butterflies-in-space.jpg ~/Pictures/Wallpapers/wallpaper.jpg
+	ln -sf "$PWD"/config/gtk-3.0/settings.ini ~/.gtkrc-2.0.mine
-	mkdir -p ~/.config/rofi
+	ln -sf "$PWD"/config/mimeapps.list ~/.config/mimeapps.list
-	ln -sf "$PWD"/config/rofi ~/.config/rofi/config
+  
+  mkdir -p ~/.config/rofi
+	ln -sf "$PWD"/config/rofi/rofi.rasi ~/.config/rofi/config.rasi
+	ln -sf "$PWD"/config/rofi/mytheme.rasi ~/.config/rofi/mytheme.rasi
+
 	ln -sf "$PWD"/config/.gitconfig ~/.gitconfig
 	ln -sf "$PWD"/config/.npmrc ~/.npmrc
 	ln -sf "$PWD"/config/user-dirs.dirs ~/.config/user-dirs.dirs
 	mkdir -p ~/.pulse
 	ln -sf "$PWD"/config/pulse/daemon.conf ~/.pulse/daemon.conf
+  ln -sf "$PWD"/config/picom.conf ~/.config/picom.conf
 
 	# link system files / directories
 	sudo ln -sf "$PWD"/config/package-managers/pacman.conf /etc/pacman.conf
@@ -117,7 +123,7 @@ function install_config {
 
 # Installs the dependencies on Arch Linux
 function install_dependencies {
-	fileToList dependencies/pacman.txt | xargs sudo pacman --noconfirm --force -S
+	fileToList dependencies/pacman.txt | xargs sudo pacman --noconfirm -S
 
 	install_trizen
 	fileToList dependencies/aur.txt | xargs trizen --force -S --noconfirm
@@ -132,20 +138,6 @@ function install_dependencies {
 # User output functions
 # =======================================
 
-# list the dependencies file
-function list_dependencies {
-	echo ""
-	echo "=========================="
-	echo ""
-	cat dependencies/pacman.txt
-	cat dependencies/aur.txt
-	cat dependencies/pip.txt
-	cat dependencies/npm.txt
-	echo ""
-	echo "=========================="
-	echo ""
-}
-
 # Run the intro bit
 function intro {
 	echo "___  ___          _                      _           _     _     _ "
@@ -197,8 +189,7 @@ intro
 ask "Do you want to continue installing my config and rice?" Y &&
 
 # Ask for dependency installation
-list_dependencies
+if ask "Do you want to install the applications listen in ./dependencies? (might prompt for password)" Y; then
-if ask "Do you want to install the list of applications above? (might prompt for password)" Y; then
     install_dependencies
 fi
 
@@ -220,7 +211,7 @@ fi
 clear
 computer
 # ask for pc specific install
-prompt=`echo $'\n> ' Please select a specific computer to install or q to finish the install`
+prompt=$(echo $'\n> ' "Please select a specific computer to install or q to finish the install")
 
 PS3="$prompt: "
 select opt in "$PWD/computers"/*; do 

wallpapers/README.md

@@ -0,0 +1,4 @@
+# wallpaper display
+
+![]()
+by 

wallpapers/data.json

@@ -0,0 +1,24 @@
+[
+  {
+    "images": ["blue-butterflies.jpg"],
+    "by": "https://pixabay.com/users/stergo-4163614/"
+  },
+  {
+    "images": [
+      "forest.jpg",
+      "lake-thunder.jpg",
+      "dark-hedges.jpg",
+      "thunderstorm-sea.jpg",
+      "sunset-dawn.jpg"
+    ],
+    "by": "https://pixabay.com/users/jplenio-7645255/"
+  },
+  {
+    "images": ["starman.jpg", "friends.jpg"],
+    "by": "https://pixabay.com/users/free-photos-242387/"
+  },
+  {
+    "images": ["ping-cherryblossom.jpg", "winter-tree.jpg"],
+    "by": "https://pixabay.com/users/hans-2/"
+  }
+]

wallpapers/wallpaper.jpg

@@ -1 +0,0 @@
-/home/mastermindzh/dotfiles/wallpapers/butterflies-in-space.jpg