From d83c845b85fc34fa382762299feb197cd9fcf3c2 Mon Sep 17 00:00:00 2001 From: Rick van Lieshout Date: Wed, 10 Sep 2025 10:38:02 +0200 Subject: [PATCH] fixed flameshot, removed old configs, some other small tweaks --- bash/.alias.sh | 5 ++++- bash/.bashrc | 1 + computers/archfw/.bashrc | 1 + computers/archive/work-xps/Xresources.docked | 4 ---- computers/archive/work-xps/Xresources.undocked | 4 ---- computers/archive/work-xps/custom-bashrc.sh | 10 ---------- computers/archive/work-xps/docked.sh | 3 --- computers/archive/work-xps/environment | 1 - computers/archive/work-xps/install.sh | 16 ---------------- computers/archive/work-xps/undocked.sh | 3 --- computers/archive/work-xps/xprofile.sh | 18 ------------------ config/gtk/settings.ini | 5 +++-- config/xfce4/thunar.xml | 4 ++-- i3/config | 4 ++-- install.sh | 4 ++++ 15 files changed, 17 insertions(+), 66 deletions(-) delete mode 100644 computers/archive/work-xps/Xresources.docked delete mode 100644 computers/archive/work-xps/Xresources.undocked delete mode 100644 computers/archive/work-xps/custom-bashrc.sh delete mode 100755 computers/archive/work-xps/docked.sh delete mode 100644 computers/archive/work-xps/environment delete mode 100644 computers/archive/work-xps/install.sh delete mode 100755 computers/archive/work-xps/undocked.sh delete mode 100644 computers/archive/work-xps/xprofile.sh diff --git a/bash/.alias.sh b/bash/.alias.sh index b7d1878..f889339 100644 --- a/bash/.alias.sh +++ b/bash/.alias.sh @@ -16,7 +16,8 @@ alias undo-commit='git reset --soft HEAD^' ## pacman and trizen alias aur='trizen --noconfirm' -alias update='trizen --sudo_remove_timestamp=0 --sudo_autorepeat=1 --sudo_autorepeat_at_runtime=1 -Syu --noconfirm' +alias update='trizen --sudo_remove_timestamp=0 --sudo_autorepeat=1 --sudo_autorepeat_at_runtime=1 -Syu --noconfirm && update-av' +alias update-av='sudo freshclam || exit 0' alias remove-orphans='sudo pacman -Rns $(pacman -Qtdq)' alias updatekeys='sudo pacman-key --refresh-key' alias updatemirrors='sudo reflector --latest 20 --protocol http,https --sort rate --save /etc/pacman.d/mirrorlist' @@ -62,6 +63,8 @@ alias clean-all='sudo pacman -R $(pacman -Qtdq) && sudo paccache -rk 1 && sudo p alias delete-empty='find . -type d -empty -delete' alias addwireguard='sudo nmcli connection import type wireguard file ' alias defaultfonts='for family in serif sans-serif monospace Arial Helvetica Verdana "Times New Roman" "Courier New"; do echo -e "\033[1m$family: \033[0m" && fc-match "$family" && echo ""; done' +alias syncthinggui="xdg-open http://localhost:8384/" +alias disableHistory="set +o history" # might be useful in demos... alias oopsie='fuck' diff --git a/bash/.bashrc b/bash/.bashrc index 506e343..6c0084d 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -36,3 +36,4 @@ if hash dotnet 2>/dev/null; then fi export PATH=$PATH:/home/mastermindzh/bin + diff --git a/computers/archfw/.bashrc b/computers/archfw/.bashrc index e7a97be..3ec6dd0 100644 --- a/computers/archfw/.bashrc +++ b/computers/archfw/.bashrc @@ -2,3 +2,4 @@ alias dock='bash ~/dotfiles/computers/archfw/displaySwitch.sh docked' alias undock='bash ~/dotfiles/computers/archfw/displaySwitch.sh undocked' alias displaySwitch='bash ~/dotfiles/computers/archfw/displaySwitch.sh' +alias deps='docker-compose -f /home/mastermindzh/code/tfx-workspace/docker-compose.yml up -d' diff --git a/computers/archive/work-xps/Xresources.docked b/computers/archive/work-xps/Xresources.docked deleted file mode 100644 index 9a2ffc5..0000000 --- a/computers/archive/work-xps/Xresources.docked +++ /dev/null @@ -1,4 +0,0 @@ -Xft.dpi: 108 -Xft.antialias: 1 -rofi.dpi: 150 -Xcursor.size: 12 diff --git a/computers/archive/work-xps/Xresources.undocked b/computers/archive/work-xps/Xresources.undocked deleted file mode 100644 index c1302dc..0000000 --- a/computers/archive/work-xps/Xresources.undocked +++ /dev/null @@ -1,4 +0,0 @@ -Xft.dpi: 200 -Xft.antialias: 1 -rofi.dpi: 250 -Xcursor.size: 18 \ No newline at end of file diff --git a/computers/archive/work-xps/custom-bashrc.sh b/computers/archive/work-xps/custom-bashrc.sh deleted file mode 100644 index 2b56393..0000000 --- a/computers/archive/work-xps/custom-bashrc.sh +++ /dev/null @@ -1,10 +0,0 @@ -alias vm='su -c "export QT_AUTO_SCREEN_SCALE_FACTOR= QT_SCREEN_SCALE_FACTORS= QT_SCALE_FACTOR= QT_DEVICE_PIXEL_RATIO= && VBoxManage setextradata Windows10 GUI/HiDPI/UnscaledOutput 1 && sudo VBoxManage startvm Windows10" && exit' -alias dock='bash ~/.docked.sh && i3-msg restart' -alias undock='bash ~/.undocked.sh && i3-msg restart' -alias mountdata='sudo cryptsetup open --type luks /dev/nvme0n1p7 data && sudo mount -t ext4 /dev/mapper/data /home/mastermindzh/data' -alias unmountdata='sudo umount /home/mastermindzh/data && sudo cryptsetup close data && sudo sysctl --write vm.drop_caches=3' - -# 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' diff --git a/computers/archive/work-xps/docked.sh b/computers/archive/work-xps/docked.sh deleted file mode 100755 index 0f62df0..0000000 --- a/computers/archive/work-xps/docked.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -xrandr --output eDP-1 --mode 2560x1440 --pos 0x0 --rotate normal --output DP-1-2 --off --output HDMI-2 --off --output HDMI-1 --off --output DP-1 --off --output DP-1-3 --off --output DP-2 --off --output DP-1-1 --primary --mode 2560x1440 --pos 2560x0 --rotate normal -xrdb -merge ~/.Xresources.docked diff --git a/computers/archive/work-xps/environment b/computers/archive/work-xps/environment deleted file mode 100644 index 9db5492..0000000 --- a/computers/archive/work-xps/environment +++ /dev/null @@ -1 +0,0 @@ -QT_AUTO_SCREEN_SCALE_FACTOR=1 \ No newline at end of file diff --git a/computers/archive/work-xps/install.sh b/computers/archive/work-xps/install.sh deleted file mode 100644 index 824ddf7..0000000 --- a/computers/archive/work-xps/install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#/bin/bash - -MYPATH=$PWD/computers/work-xps - -# set up hiDPI -sudo ln -sf "$MYPATH/environment" /etc/environment - -# set up docking -ln -sf "$MYPATH/Xresources.docked" ~/.Xresources.docked -ln -sf "$MYPATH/Xresources.undocked" ~/.Xresources.undocked -ln -sf "$MYPATH/docked.sh" ~/.docked.sh -ln -sf "$MYPATH/undocked.sh" ~/.undocked.sh -ln -sf "$MYPATH/xprofile.sh" ~/.xprofile - -# custom (laptop specific) bashrc thingies :) -ln -sf "$MYPATH/custom-bashrc.sh" ~/.custom \ No newline at end of file diff --git a/computers/archive/work-xps/undocked.sh b/computers/archive/work-xps/undocked.sh deleted file mode 100755 index 6c1520b..0000000 --- a/computers/archive/work-xps/undocked.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -xrandr --output eDP-1 --primary --mode 3840x2160 --pos 0x0 --rotate normal --output DP-1-2 --off --output HDMI-2 --off --output HDMI-1 --off --output DP-1 --off --output DP-1-3 --off --output DP-2 --off --output DP-1-1 --off -xrdb -merge /home/mastermindzh/.Xresources.undocked diff --git a/computers/archive/work-xps/xprofile.sh b/computers/archive/work-xps/xprofile.sh deleted file mode 100644 index 73befe7..0000000 --- a/computers/archive/work-xps/xprofile.sh +++ /dev/null @@ -1,18 +0,0 @@ -if [ `xrandr | grep -c ' connected '` -eq 2 ]; then - source ~/.docked.sh -else - source ~/.undocked.sh -fi - -# startup stuffs -displays=($(xrandr | awk '/ connected /{print $1}')) -selected_display="${displays[0]}" - -xrandr --output "$selected_display" --brightness 0.75 - -# power savings -echo 'min_power' > '/sys/class/scsi_host/host0/link_power_management_policy'; -echo 'min_power' > '/sys/class/scsi_host/host1/link_power_management_policy'; -echo '1500' > '/proc/sys/vm/dirty_writeback_centisecs'; -echo 'auto' > '/sys/bus/usb/devices/1-9/power/control'; -echo 'auto' > '/sys/bus/pci/devices/0000:01:00.0/power/control'; diff --git a/config/gtk/settings.ini b/config/gtk/settings.ini index 9a4c92e..cd098e0 100644 --- a/config/gtk/settings.ini +++ b/config/gtk/settings.ini @@ -1,5 +1,7 @@ [Settings] -gtk-theme-name="Dracula" +gtk-application-prefer-dark-theme=1 +gtk-theme-name=Adwaita-dark +; gtk-theme-name="Dracula" gtk-font-name="Ubuntu 12" gtk-cursor-theme-name="Dracula-cursors" gtk-cursor-theme-size=12 @@ -13,6 +15,5 @@ gtk-xft-antialias=1 gtk-xft-hinting=1 gtk-xft-hintstyle="hintfull" gtk-xft-rgba="none" -gtk-application-prefer-dark-theme=1 gtk-decoration-layout=icon:close gtk-enable-animations=true diff --git a/config/xfce4/thunar.xml b/config/xfce4/thunar.xml index 5344500..6752b43 100644 --- a/config/xfce4/thunar.xml +++ b/config/xfce4/thunar.xml @@ -5,8 +5,8 @@ - - + + diff --git a/i3/config b/i3/config index 71ba0a1..87a263a 100644 --- a/i3/config +++ b/i3/config @@ -130,7 +130,7 @@ bindsym $mod+Return exec xfce4-terminal # termin bindsym $mod+shift+Return exec xfce4-terminal --drop-down # terminal bindsym $mod+e exec thunar # 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+Print exec QT_QPA_PLATFORM=xcb && QT_AUTO_SCREEN_SCALE_FACTOR=0 && QT_ENABLE_HIGHDPI_SCALING=0 && QT_SCALE_FACTOR=1 && flameshot gui # Show screenshot window bindsym $mod+shift+Print exec flameshot launcher # Show settings window (delay) then show screenshot window bindsym $mod+shift+b exec /bin/bash ~/.config/i3/scripts/brightness.sh # set brightness bindsym control+shift+Escape exec sysmontask # system monitor @@ -231,6 +231,7 @@ for_window [class="Sysmontask"] floating enable for_window [class="Sysmontask"] resize set 930 665 for_window [instance="Godot_Engine"] floating enable for_window [class="Alert"] floating enable +for_window [class="org.gnome.FileRoller"] floating enable ############################################ # Workspace specific tools # @@ -319,7 +320,6 @@ exec --no-startup-id i3-msg 'workspace $workspace12; exec bitwarden-desktop' exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec --no-startup-id nm-applet exec --no-startup-id greenclip daemon -exec --no-startup-id seafile-applet exec --no-startup-id obsidian exec /usr/bin/compton exec /bin/bash ~/.config/i3/scripts/startup.sh diff --git a/install.sh b/install.sh index 6176746..19f8441 100644 --- a/install.sh +++ b/install.sh @@ -97,6 +97,9 @@ function install_gtk { ln -sf "$PWD"/config/gtk/settings.ini ~/.gtkrc-2.0.mine ln -sf "$PWD"/config/gtk/settings.ini ~/.config/gtk-3.0/settings.ini ln -sf "$PWD"/config/gtk/settings.ini ~/.config/gtk-4.0/settings.ini + + gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' + gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark' } function install_docker { @@ -204,6 +207,7 @@ function setup_groups { sudo usermod -a -G video "$user" } + # ======================================= # User output functions # =======================================