diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 333729b..ce56f4d 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -21,7 +21,6 @@ exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = waybar exec-once = hypridle exec-once = /usr/local/bin/pypr --debug /tmp/pypr.log -exec-once = flatpak run org.remmina.Remmina -i exec-once = systemctl --user start sunshine exec-once = [workspace 1 silent] $terminal @@ -162,9 +161,8 @@ bind = $mainMod, X, fullscreen bind = $mainMod, C, killactive, bind = $mainMod, M, exit, bind = $mainMod, G, exec, flatpak run com.moonlight_stream.Moonlight +bind = $mainMod, R, exec, flatpak run org.remmina.Remmina bind = $mainMod, F, togglefloating, -# bind = $mainMod, D, exec, $menu -bind = $mainMod, Z, exec, [float] kitty -e fzfmenu bind = ALT, Tab, workspace, m+1 bind = ALT SHIFT, Tab, workspace, emptyn @@ -202,6 +200,7 @@ bind = $mainMod SUPER, 0, movetoworkspace, 10 bind = $mainMod, S, togglespecialworkspace, scratchpad bind = $mainMod, B, togglespecialworkspace, btop bind = $mainMod, D, togglespecialworkspace, discord +# bind = $mainMod, R, togglespecialworkspace, remmina # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow @@ -242,6 +241,15 @@ windowrulev2 = float, onworkspace:special:btop windowrulev2 = size 80% 80%, onworkspace:special:btop workspace = special:btop, on-created-empty:kitty btop +# Remmina +# windowrulev2 = float, onworkspace:special:remmina +# windowrulev2 = size 80% 80%, onworkspace:special:remmina +# workspace = special:remmina, on-created-empty:flatpak run org.remmina.Remmina +# windowrulev2 = float, initialClass:^(.*Remmina.*)$ +# windowrulev2 = dimaround, initialClass:^(.*Remmina.*)$ +# windowrulev2 = size 80% 80%, $initialClass:^(.*Remmina.*)$ +windowrulev2 = workspace 6, $initialClass:^(.*Remmina.*)$ + # Discord windowrulev2 = opacity 1.0 0.7, initialTitle:^(Discord Popout)$ windowrulev2 = float, initialTitle:^(Discord Popout)$ @@ -255,24 +263,22 @@ windowrulev2 = workspace special:discord, initialTitle:^(.*• Discord.*)$ windowrulev2 = float, initialTitle:^(.*• Discord.*)$ windowrulev2 = size 80% 80%, initialTitle:^(.*• Discord.*)$ -# Floating windows +# Pipewire windowrulev2 = float, title:^(volume control)$ windowrulev2 = dimaround, title:^(Volume Control)$ windowrulev2 = float, title:^(Helvum - Pipewire Patchbay)$ windowrulev2 = dimaround, title:^(Helvum - Pipewire Patchbay)$ + +# Kicad +windowrulev2 = workspace 4, class:^(.*kicad.*)$ windowrulev2 = float, initialTitle:^(3D Viewer)$ windowrulev2 = dimaround, initialTitle:^(3D Viewer)$ windowrulev2 = size 80% 80%, $initialTitle:^(3D Viewer)$ -windowrulev2 = float, initialClass:^(.*Remmina.*)$ -windowrulev2 = dimaround, initialClass:^(.*Remmina.*)$ -windowrulev2 = size 80% 80%, $initialClass:^(.*Remmina.*)$ -#Misc -layerrule = dimaround, rofi - -# Workspace definitions +# Moonlight windowrulev2 = workspace 3, class:^(.*moonlight.*)$ -windowrulev2 = workspace 4, class:^(.*kicad.*)$ + +# FreeCad windowrulev2 = workspace 5, class:^(.*org.freecad.FreeCAD.*)$ # Ignore maximize requests from apps. You'll probably like this. diff --git a/update_arch.sh b/update_arch.sh index d18eded..0facb05 100755 --- a/update_arch.sh +++ b/update_arch.sh @@ -16,14 +16,14 @@ echo -e ' \e[H\e[2J ' # Create backup/snapshot if pacman -Qs timeshift >/dev/null; then - CONFIG_FILE="/etc/timeshift/timeshift.json" - if [ -f "$CONFIG_FILE" ]; then - BTRFS_MODE=$(jq '.btrfs_mode' "$CONFIG_FILE") - if [ "$BTRFS_MODE" == '"true"' ]; then - printf -- '\033[33m Creating backup/snapshot\n\033[37m' - sudo timeshift --create --comments "Update script" - fi - fi + CONFIG_FILE="/etc/timeshift/timeshift.json" + if [ -f "$CONFIG_FILE" ]; then + BTRFS_MODE=$(jq '.btrfs_mode' "$CONFIG_FILE") + if [ "$BTRFS_MODE" == '"true"' ]; then + printf -- '\033[33m Creating backup/snapshot\n\033[37m' + sudo timeshift --create --comments "Update script" + fi + fi fi # Update all pacman packages @@ -32,25 +32,25 @@ sudo pacman -Suyy --noconfirm # Update all AUR packages printf -- '\033[33m Updating AUR packages\n\033[37m' if pacman -Qs yay >/dev/null; then - yay --noconfirm --aur + yay --noconfirm --aur else - sudo pacman -S --needed --noconfirm git base-devel - if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi - cd ~ - git clone https://aur.archlinux.org/yay-bin.git - cd yay-bin - makepkg --noconfirm -si - cd ~ - if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi + sudo pacman -S --needed --noconfirm git base-devel + if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi + cd ~ + git clone https://aur.archlinux.org/yay-bin.git + cd yay-bin + makepkg --noconfirm -si + cd ~ + if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi fi # Update all Flatpak packages printf -- '\033[33m Updating Flatpak packages\n\033[37m' if pacman -Qs flatpak >/dev/null; then - flatpak update -y + flatpak update -y else - sudo pacman --noconfirm --needed -S flatpak - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install -y flathub com.github.tchx84.Flatseal + sudo pacman --noconfirm --needed -S flatpak + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + flatpak install -y flathub com.github.tchx84.Flatseal fi # Install initial system packages @@ -83,10 +83,6 @@ ln -sf ~/code_server/config/qt5ct/qt5ct.conf ~/.config/qt5ct/qt5ct.conf ln -sf ~/code_server/config/qt6ct/qt6ct.conf ~/.config/qt6ct/qt6ct.conf ln -sf ~/code_server/config/dunst/dunstrc ~/.config/dunst/dunstrc -# Install rofi -printf -- '\033[33m Installing rofi\n\033[37m' -sudo pacman --noconfirm --needed -S rofi-wayland - # Install waybar printf -- '\033[33m Installing waybar\n\033[37m' sudo pacman --noconfirm --needed -S waybar @@ -158,12 +154,12 @@ sudo mv virtualhereclient.service /etc/systemd/system/virtualhereclient.service # Install teensy udev rules (only for non docker system) if [ ! -f /.dockerenv ]; then - printf -- '\033[33m Installing teensy udev rules\n\033[37m' - sudo rm -f /tmp/00-teensy.rules /etc/udev/rules.d/00-teensy.rules /lib/udev/rules.d/00-teensy.rules - sudo wget -O /tmp/00-teensy.rules https://www.pjrc.com/teensy/00-teensy.rules - sudo install -o root -g root -m 0664 /tmp/00-teensy.rules /lib/udev/rules.d/00-teensy.rules - sudo udevadm control --reload-rules - sudo udevadm trigger + printf -- '\033[33m Installing teensy udev rules\n\033[37m' + sudo rm -f /tmp/00-teensy.rules /etc/udev/rules.d/00-teensy.rules /lib/udev/rules.d/00-teensy.rules + sudo wget -O /tmp/00-teensy.rules https://www.pjrc.com/teensy/00-teensy.rules + sudo install -o root -g root -m 0664 /tmp/00-teensy.rules /lib/udev/rules.d/00-teensy.rules + sudo udevadm control --reload-rules + sudo udevadm trigger fi # Install neovim @@ -283,9 +279,9 @@ printf -- '\033[33m Installing starship\n\033[37m' cargo install starship --locked ln -sf ~/code_server/config/starship.toml ~/.config/starship.toml -# Install Discord (Vesktop) -printf -- '\033[33m Installing Discord (Vesktop)\n\033[37m' -flatpak install -y flathub dev.vencord.Vesktop +# Install Discord (Equibop) +printf -- '\033[33m Installing Discord (Equibop)\n\033[37m' +flatpak install -y flathub io.github.equicord.equibop # Install Krita printf -- '\033[33m Installing Krita\n\033[37m' @@ -317,7 +313,6 @@ sudo pacman --noconfirm --needed -S code # Install remmina printf -- '\033[33m Installing remmina\n\033[37m' -# sudo pacman --noconfirm --needed -S remmina freerdp libvncserver gtk-vnc kwallet5 spice-gtk webkit2gtk flatpak install flathub org.remmina.Remmina # Install feh @@ -357,6 +352,7 @@ printf -- '\033[33m Installing Sunshine\n\033[37m' # wget https://github.com/LizardByte/Sunshine/releases/latest/download/sunshine.pkg.tar.zst # sudo pacman -U --noconfirm sunshine.pkg.tar.zst # if [ -d ~/sunshine.pkg.tar.zst ]; then rm -rf ~/sunshine.pkg.tar.zst; fi +sudo pacman --noconfirm --needed -S intel-media-driver yay --noconfirm --needed -S sunshine echo 'KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"' | sudo tee /etc/udev/rules.d/60-sunshine.rules sudo udevadm control --reload-rules @@ -366,7 +362,6 @@ sudo setcap cap_sys_admin+p $(readlink -f $(which sunshine)) mkdir -p ~/.config/systemd/user cp -f ~/code_server/config/systemd/user/sunshine.service ~/.config/systemd/user/sunshine.service sudo systemctl daemon-reload -systemctl --user enable sunshine systemctl --user start sunshine # Symlink update script