diff --git a/.vscode/settings.json b/.vscode/settings.json index 62c2677..02bc7aa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,13 +1,21 @@ { "cSpell.words": [ "autohint", + "autorandr", "dunst", "dunstrc", "greenclip", + "gtkrc", "hintstyle", + "inotify", + "keygen", + "makepkg", "mimeapps", "nanorc", + "networkmanager", + "noconfirm", "pacman", + "picom", "polkit", "polybar", "poshthemes", @@ -16,7 +24,13 @@ "rofi", "seafile", "terminalrc", - "Xresources" + "timedatectl", + "trizen", + "usermod", + "xbacklight", + "xfconf", + "Xresources", + "zokugun" ], "sonarlint.connectedMode.project": { "connectionId": "public-sonarcloud", diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 068ab36..0000000 --- a/TODO.md +++ /dev/null @@ -1,2 +0,0 @@ -docker-credential-pass -> add to AUR -^ set up `pass` diff --git a/computers/archfw/.Xresources b/computers/archfw/.Xresources index 0b8f0c1..faca92b 100644 --- a/computers/archfw/.Xresources +++ b/computers/archfw/.Xresources @@ -1,7 +1,8 @@ Xft.hinting: true -rofi.dpi: 150 -Xcursor.size: 20 +rofi.dpi: 110 +dpi: 110 +Xcursor.size: 25 Xft.hintstyle: hintslight Xft.rgba: rgba Xft.antialias: true -Xft.dpi: 150 +Xft.dpi: 110 diff --git a/computers/archfw/displaySwitch.sh b/computers/archfw/displaySwitch.sh index 67f5934..cba2fbf 100644 --- a/computers/archfw/displaySwitch.sh +++ b/computers/archfw/displaySwitch.sh @@ -9,9 +9,10 @@ declare -A undocked_settings=( ["Xft.hinting"]="true" ["Xft.rgba"]="rgba" ["Xft.hintstyle"]="hintslight" - ["Xcursor.size"]="20" - ["Xft.dpi"]="150" - ["rofi.dpi"]="150" + ["Xcursor.size"]="50" + ["Xft.dpi"]="160" + ["rofi.dpi"]="160" + ["dpi"]="150" ) declare -A docked_settings=( @@ -19,9 +20,10 @@ declare -A docked_settings=( ["Xft.hinting"]="true" ["Xft.rgba"]="rgba" ["Xft.hintstyle"]="hintslight" - ["Xcursor.size"]="20" - ["Xft.dpi"]="120" - ["rofi.dpi"]="120" + ["Xcursor.size"]="25" + ["Xft.dpi"]="110" + ["rofi.dpi"]="110" + ["dpi"]="110" ) function updateXSettings() { @@ -37,12 +39,12 @@ function applyLayout() { "undocked") xrandr --output eDP --primary --mode 2880x1920 --pos 0x0 --rotate normal --output DisplayPort-0 --off --output DisplayPort-1 --off --output DisplayPort-2 --off --output DisplayPort-3 --off --output DisplayPort-4 --off --output DisplayPort-5 --off --output DisplayPort-6 --off --output DisplayPort-7 --off updateXResources undocked_settings - updateXSettings 150 + updateXSettings ${undocked_settings["dpi"]} ;; "docked") xrandr --output eDP --off --output DisplayPort-0 --off --output DisplayPort-1 --off --output DisplayPort-2 --off --output DisplayPort-3 --primary --mode 2560x1440 --pos 0x0 --rotate normal --output DisplayPort-4 --off --output DisplayPort-5 --off --output DisplayPort-6 --off --output DisplayPort-7 --off updateXResources docked_settings - updateXSettings 120 + updateXSettings ${docked_settings["dpi"]} ;; *) echo "Unknown layout: $layout" diff --git a/config/xfce4/thunar.xml b/config/xfce4/thunar.xml index 54a579b..15ee00a 100644 --- a/config/xfce4/thunar.xml +++ b/config/xfce4/thunar.xml @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/dependencies/aur.txt b/dependencies/aur.txt index 3c4c226..8a00fe8 100644 --- a/dependencies/aur.txt +++ b/dependencies/aur.txt @@ -13,6 +13,7 @@ seafile networkmanager-l2tp xorg-xev nvm +hadolint-bin dotnet-host-bin keychain diff --git a/dependencies/pacman.txt b/dependencies/pacman.txt index 09eb30a..243f520 100644 --- a/dependencies/pacman.txt +++ b/dependencies/pacman.txt @@ -21,6 +21,8 @@ reflector gtk-engines kubectl less +smartmontools +ethtool # # i3wm diff --git a/i3/scripts/brightness.sh b/i3/scripts/brightness.sh index b7bcc1c..b814606 100644 --- a/i3/scripts/brightness.sh +++ b/i3/scripts/brightness.sh @@ -1,18 +1,16 @@ #! /bin/bash -displays=($(xrandr | awk '/ connected /{print $1}')) +mapfile -t displays < <(xrandr | awk '/ connected /{print $1}') -if (( ${#displays[@]} > 1 )) -then - selected_display="$(zenity --list --title 'Select Display' --radiolist --column '' --column 'Display' $(xrandr | awk '/ connected /{print NR,$1}'))" +if ((${#displays[@]} > 1)); then + selected_display="$(zenity --list --title 'Select Display' --radiolist --column '' --column 'Display' $(xrandr | awk '/ connected /{print NR,$1}'))" else - selected_display="${displays[0]}" + selected_display="${displays[0]}" fi -current_brightness=($(xrandr --current --verbose | grep -m1 Brightness | awk '{print $2}' | sed 's/0.//' | sed 's/.0/00/' )) +current_brightness=$(xbacklight -display "$selected_display" -get) zenity --scale --title "Set brightness of $selected_display" --value=$current_brightness --print-partial | -while read brightness -do - xrandr --output "$selected_display" --brightness $(awk '{print $1/100}' <<<"$brightness"}) -done \ No newline at end of file + while read brightness; do + xbacklight -display "$selected_display" -set "$brightness" + done diff --git a/install.sh b/install.sh index abb29b8..6176746 100644 --- a/install.sh +++ b/install.sh @@ -101,7 +101,7 @@ function install_gtk { function install_docker { sudo systemctl enable docker - sudo usermod -aG docker $USER + sudo usermod -aG docker "$USER" } @@ -169,6 +169,7 @@ function install_config { mkdir -p ~/Pictures/Screenshots setDateTimeConfig + setup_groups mastermindzh } # Installs the dependencies on Arch Linux @@ -197,6 +198,12 @@ function setup_pass { pass init info@rickvanlieshout.com } +# set up groups for specific user +function setup_groups { + local user=${1:-mastermindzh} + sudo usermod -a -G video "$user" +} + # ======================================= # User output functions # =======================================