diff --git a/computers/work-xps/Xresources.docked b/computers/archive/work-xps/Xresources.docked similarity index 100% rename from computers/work-xps/Xresources.docked rename to computers/archive/work-xps/Xresources.docked diff --git a/computers/work-xps/Xresources.undocked b/computers/archive/work-xps/Xresources.undocked similarity index 100% rename from computers/work-xps/Xresources.undocked rename to computers/archive/work-xps/Xresources.undocked diff --git a/computers/work-xps/custom-bashrc.sh b/computers/archive/work-xps/custom-bashrc.sh similarity index 100% rename from computers/work-xps/custom-bashrc.sh rename to computers/archive/work-xps/custom-bashrc.sh diff --git a/computers/work-xps/docked.sh b/computers/archive/work-xps/docked.sh similarity index 100% rename from computers/work-xps/docked.sh rename to computers/archive/work-xps/docked.sh diff --git a/computers/work-xps/environment b/computers/archive/work-xps/environment similarity index 100% rename from computers/work-xps/environment rename to computers/archive/work-xps/environment diff --git a/computers/work-xps/install.sh b/computers/archive/work-xps/install.sh similarity index 100% rename from computers/work-xps/install.sh rename to computers/archive/work-xps/install.sh diff --git a/computers/work-xps/undocked.sh b/computers/archive/work-xps/undocked.sh similarity index 100% rename from computers/work-xps/undocked.sh rename to computers/archive/work-xps/undocked.sh diff --git a/computers/work-xps/xprofile.sh b/computers/archive/work-xps/xprofile.sh similarity index 100% rename from computers/work-xps/xprofile.sh rename to computers/archive/work-xps/xprofile.sh diff --git a/config/mimeapps.list b/config/mimeapps.list index cf0266c..a51494d 100644 --- a/config/mimeapps.list +++ b/config/mimeapps.list @@ -28,7 +28,7 @@ x-scheme-handler/tidal=tidal-hifi.desktop # files #-------------- -inode/director=Nautilus.desktop +inode/director=thunar.desktop [Added Associations] # browser-stuff @@ -68,7 +68,7 @@ application/javascript=visual-studio-code-insiders.desktop; # other #-------------- -application/zip=org.gnome.Nautilus.desktop;xarchiver.desktop; +application/zip=thunar,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; diff --git a/dependencies/pacman.txt b/dependencies/pacman.txt index 41d10f4..e2b7711 100644 --- a/dependencies/pacman.txt +++ b/dependencies/pacman.txt @@ -10,7 +10,6 @@ scrot arandr xfce4-terminal ttf-font-awesome -sushi libconfig compton lxappearance @@ -56,13 +55,10 @@ wavpack x264 xvidcore gvfs-smb -gnome-screenshot bash-completion flameshot otf-font-awesome -openvpn networkmanager -networkmanager-openvpn networkmanager-l2tp strongswan w3m @@ -99,3 +95,6 @@ duf picom ttf-ubuntu-font-family xorg-xkill +thunar +thunar-archive-plugin +engrampa diff --git a/i3/i3blocks.conf b/i3/i3blocks.conf index 3db53bd..c5fe504 100644 --- a/i3/i3blocks.conf +++ b/i3/i3blocks.conf @@ -51,42 +51,12 @@ 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 separator=true color=#999999 -# Memory usage -# -# The type defaults to "mem" if the instance is not specified. -[memory] -label= -separator=true -interval=30 -color=#999999 - -# Disk usage -# The directory defaults to $HOME if the instance is not specified. -# The script may be called with a optional argument to set the alert -# (defaults to 10 for 10%). -[disk] -label= -instance=/ -interval=5 -separator=true -color=#999999 - # Updates [updates] label= @@ -114,20 +84,6 @@ interval=60 separator=true color=#999999 -# Volume indicator -# -# The first parameter sets the step (and units to display) -# The second parameter overrides the mixer selection -# See the script for details. -[volume] -label= -instance=Master -interval=1 -command=/usr/lib/i3blocks/volume/volume 5 pulse -signal=10 -separator=true -color=#999999 - # Battery indicator # The battery instance defaults to 0. [battery2] diff --git a/i3/scripts/blocks/temp.sh b/i3/scripts/blocks/temp.sh index 3f0c525..9a30ed9 100644 --- a/i3/scripts/blocks/temp.sh +++ b/i3/scripts/blocks/temp.sh @@ -1,20 +1,19 @@ #!/bin/bash -intelTemp=$(sensors | # execute sensors -grep -w "Core 0:" | # grep for the first core -sed 's/([^)]*)//g' | # filter -tr -s " " | # remove whitespace -sed -e 's/Core 0\(.*\):/\1/' | # get value between Core 0 and : -cut -c 3- | rev | cut -c 7- | rev #remove clutter +intelTemp=$( + sensors | # execute sensors + grep -w "Core 0:" | # grep for the first core + sed 's/([^)]*)//g' | # filter + tr -s " " | # remove whitespace + 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) +amdTemp=$(sensors | grep -iw "tctl:" | sed 's/([^)]*)//g' | tr -s " " | cut -c 8- | rev | cut -c 2- | rev) # echo out the result -if [ -z "$intelTemp" ] -then +if [ -z "$intelTemp" ]; then echo $amdTemp else echo $intelTemp°C fi - diff --git a/wallpapers/images/code.jpeg b/wallpapers/images/code.jpeg deleted file mode 100644 index 01e5a4d..0000000 Binary files a/wallpapers/images/code.jpeg and /dev/null differ