Added new floating windows to xmonad config, changed zsh config and added new env variables to .profile

3 files changed, 30 insertions, 24 deletions

diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs
index 45da22e..45d6944 100644
--- a/.config/xmonad/xmonad.hs
+++ b/.config/xmonad/xmonad.hs
@@ -266,6 +266,8 @@ myManageHook = composeAll
     , className =? "Gimp"           --> doFloat
     , resource  =? "desktop_window" --> doIgnore
     , resource  =? "kdesktop"       --> doIgnore
+    , className  =? "Tk"            --> doFloat
+    , className  =? "Matplotlib"    --> doFloat
     , (className =? "PacketTracer" <&&> title =? "Cisco Packet Tracer") --> idHook
     , (className =? "PacketTracer" <&&> title /=? "Cisco Packet Tracer") --> doFloat
     ]
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 21a4648..b892f48 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,34 +1,13 @@
-# Lines configured by zsh-newuser-install
-HISTFILE=~/.cache/zsh/histfile
-HISTSIZE=1000
-SAVEHIST=1000
-setopt extendedglob nomatch
-unsetopt autocd beep
-bindkey -e
-# End of lines configured by zsh-newuser-install
-# The following lines were added by compinstall
-zstyle :compinstall filename '/home/andrew/.zshrc'
-
-autoload -Uz compinit
-#compinit
-compinit -d $XDG_CACHE_HOME/zsh/zcompdump
-# End of lines added by compinstall
-
-# Turn on clint prompt
-autoload -Uz promptinit
-promptinit
-prompt suse
-
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
     test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
     alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
+    alias gcc='gcc -fdiagnostics-color=always'
     alias grep='grep --color=auto'
     alias fgrep='fgrep --color=auto'
     alias egrep='egrep --color=auto'
+    alias pacman='pacman --color=always'
+    alias yay='yay --color=always'
 fi
 
 # Aliases
@@ -41,3 +20,25 @@ alias  dotdiff="/usr/bin/git --git-dir='$HOME/.dotfiles' --work-tree='$HOME' dif
 alias   dotadd="/usr/bin/git --git-dir='$HOME/.dotfiles' --work-tree='$HOME' add -f"
 alias vim="nvim"
 
+# ZSH config
+HISTFILE=~/.cache/zsh/histfile
+HISTSIZE=1000
+SAVEHIST=1000
+setopt extendedglob nomatch
+unsetopt autocd beep
+bindkey -e
+zstyle :compinstall filename '/home/andrew/.zshrc'
+autoload -Uz compinit
+compinit -d $XDG_CACHE_HOME/zsh/zcompdump
+
+set_ps1() {
+    # red color if current user us root, otherwise - green
+    [ "$USER" = "root" ] && UCOLOR="%B%F{red}" || UCOLOR="%B%F{green}"
+    [ "$USER" = "root" ] && END="#" || END="$"
+    BLUE="%B%F{blue}"
+    PURPLE="%B%F{magenta}"
+    STOP="%f%b"
+    export PS1="%T $UCOLOR%n$STOP@$PURPLE%m$STOP:$BLUE%~$STOP $END "
+}
+
+set_ps1
diff --git a/.profile b/.profile
index fd1fb9a..2624bc8 100644
--- a/.profile
+++ b/.profile
@@ -36,7 +36,10 @@ export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
 export STACK_ROOT="$XDG_DATA_HOME/stack"
 export R_ENVIRON="$XDG_CONFIG_HOME/r/.Renviron"
+export GOPATH="$XDG_DATA_HOME/go"
 
 export XMONAD_CONFIG_HOME="$XDG_CONFIG_HOME/xmonad"
 export XMONAD_DATA_HOME="$XDG_DATA_HOME/xmonad"
 export XMONAD_CACHE_HOME="$XDG_CACHE_HOME/xmonad"
+
+export PATH="$PATH:$CARGO_HOME/bin"