added sway

- scape swap for sway
- added urxvt to sway config
- added window rules to sway
- added set wallpaper to autostart for swaybg
- switched to vesktop on autostart
- changed split binds
- border toggle
- added sway
- added sway stuff
- changed reqs to use /etc/os-release ID

README.md

@@ -35,12 +35,13 @@ i liked how primagen did his dev environment and deploying of scripts. so im mak
     - cd into respective directory
     - sudo make clean install
     - startx # for dwm
-- hyprland
+- hyprland or sway
     - wayland
     - waybar
     - grim # needed for flameshot to work on wayland
     - xdg-deskop=portal
     - xdg-deskop=portal-hyprland
+    - xdg-deskop=portal-wlr # for sway
     - xdg-deskop=portal-gtk
     - hyprpaper
     - hyprlock

env/.config/.profile

@@ -79,6 +79,10 @@ alias astro="astroterm --color --constellations --speed 10000 --fps 64 --unicode
 alias anim="hyprctl keyword animations:enabled "
 alias swap="hyprctl keyword input:kb_options caps:swapescape"
 alias nswap="hyprctl keyword input:kb_options null"
+if [ "$XDG_CURRENT_DESKTOP" = "sway:wlroots" ]; then
+    alias swap="swaymsg 'input \"type:keyboard\" xkb_options \"caps:swapescape\"'"
+    alias nswap="swaymsg 'input \"type:keyboard\" xkb_options \"\"'"
+fi
 
 # mounting
 alias umsu="fukn umount u"

env/.config/sway/config

@@ -0,0 +1,303 @@
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+exec ~/.local/bin/system/start-scripts/autostart.sh
+
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+# Your preferred terminal emulator
+set $term wezterm
+set $term2 urxvt
+# Your preferred application launcher
+set $menu rofi -show drun
+
+### Output configuration
+
+output "HDMI-A-1" scale 0.7
+
+workspace 1 output HDMI-A-1
+workspace 2 output HDMI-A-1
+workspace 3 output HDMI-A-1
+workspace 4 output HDMI-A-1
+workspace 5 output HDMI-A-1
+workspace 6 output HDMI-A-1
+workspace 7 output HDMI-A-1
+workspace 8 output HDMI-A-1
+workspace 9 output HDMI-A-1
+workspace 10 output HDMI-A-1
+
+workspace 11 output DP-1
+workspace 12 output DP-1
+workspace 13 output DP-1
+workspace 14 output DP-1
+workspace 15 output DP-1
+workspace 16 output DP-1
+workspace 17 output DP-1
+workspace 18 output DP-1
+workspace 19 output DP-1
+workspace 20 output DP-1
+
+### Idle configuration
+#
+# Example configuration:
+#
+# exec swayidle -w \
+#          timeout 300 'swaylock -f -c 000000' \
+#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
+#          before-sleep 'swaylock -f -c 000000'
+#
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# your displays after another 300 seconds, and turn your screens back on when
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+### Input configuration
+#
+# Example configuration:
+#
+#   input "2:14:SynPS/2_Synaptics_TouchPad" {
+#       dwt enabled
+#       tap enabled
+#       natural_scroll enabled
+#       middle_emulation enabled
+#   }
+#
+# You can get the names of your inputs by running: swaymsg -t get_inputs
+# Read `man 5 sway-input` for more information about this section.
+
+# or input <identifier>
+input "type:keyboard" {
+    xkb_layout us,de
+    xkb_variant ,nodeadkeys
+    xkb_options caps:swapescape
+}
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+    bindsym $mod+Shift+Return exec $term2
+
+    # Kill focused window
+    bindsym $mod+q kill
+
+    # Start your launcher
+    bindsym $mod+d exec $menu
+    bindsym $mod+SHIFT+D exec $HOME/.local/bin/system/rofi-search-web.sh
+
+    # Drag floating windows by holding down $mod and left mouse button.
+    # Resize them with right mouse button + $mod.
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
+
+    #toggle border
+    bindsym $mod+Shift+b border toggle
+
+    # Reload the configuration file
+    bindsym $mod+Shift+r reload
+
+    # Exit sway (logs you out of your Wayland session)
+    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+
+    bindsym $mod+Escape exec grim -g "$(slurp -b 00000088 -c cba6f7; sleep 0.5)" - | wl-copy
+    bindsym $mod+Shift+Escape exec grim -o HDMI-A-1 - | wl-copy
+#
+# Moving around:
+#
+    # Move your focus around
+    bindsym $mod+$left focus left
+    bindsym $mod+$down focus down
+    bindsym $mod+$up focus up
+    bindsym $mod+$right focus right
+
+    # Move the focused window with the same, but add Shift
+    bindsym $mod+Shift+$left move left
+    bindsym $mod+Shift+$down move down
+    bindsym $mod+Shift+$up move up
+    bindsym $mod+Shift+$right move right
+#
+# Workspaces:
+#
+    # Switch to workspace
+    bindsym $mod+1 workspace number 1
+    bindsym $mod+2 workspace number 2
+    bindsym $mod+3 workspace number 3
+    bindsym $mod+4 workspace number 4
+    bindsym $mod+5 workspace number 5
+    bindsym $mod+6 workspace number 6
+    bindsym $mod+7 workspace number 7
+    bindsym $mod+8 workspace number 8
+    bindsym $mod+9 workspace number 9
+    bindsym $mod+0 workspace number 10
+    # Move focused container to workspace
+    bindsym $mod+Shift+1 move container to workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8
+    bindsym $mod+Shift+9 move container to workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 10
+    # Note: workspaces can have any name you want, not just numbers.
+    # We just use 1-10 as the default.
+
+mode "mon2" {
+    bindsym $mod+1 workspace number 11
+    bindsym $mod+2 workspace number 12
+    bindsym $mod+3 workspace number 13
+    bindsym $mod+4 workspace number 14
+    bindsym $mod+5 workspace number 15
+    bindsym $mod+6 workspace number 16
+    bindsym $mod+7 workspace number 17
+    bindsym $mod+8 workspace number 18
+    bindsym $mod+9 workspace number 19
+    bindsym $mod+0 workspace number 20
+    bindsym $mod+Shift+1 move container to workspace number 11
+    bindsym $mod+Shift+2 move container to workspace number 12
+    bindsym $mod+Shift+3 move container to workspace number 13
+    bindsym $mod+Shift+4 move container to workspace number 14
+    bindsym $mod+Shift+5 move container to workspace number 15
+    bindsym $mod+Shift+6 move container to workspace number 16
+    bindsym $mod+Shift+7 move container to workspace number 17
+    bindsym $mod+Shift+8 move container to workspace number 18
+    bindsym $mod+Shift+9 move container to workspace number 19
+    bindsym $mod+Shift+0 move container to workspace number 20
+
+    bindsym $mod+o mode "default"
+}
+bindsym $mod+o mode "mon2"
+
+#
+# Layout stuff:
+#
+    bindsym $mod+Control+l splith
+    bindsym $mod+Control+j splitv
+
+    # Switch the current container between different layout styles
+    bindsym $mod+s layout stacking
+    bindsym $mod+w layout tabbed
+    bindsym $mod+e layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+f fullscreen
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+space floating toggle
+
+    # Swap focus between the tiling area and the floating area
+    bindsym $mod+Shift+space focus mode_toggle
+
+    # Move focus to the parent container
+    bindsym $mod+a focus parent
+#
+# Scratchpad:
+#
+    # Sway has a "scratchpad", which is a bag of holding for windows.
+    # You can send windows there and get them back later.
+
+    # Move the currently focused window to the scratchpad
+    bindsym $mod+Shift+minus move scratchpad
+
+    # Show the next scratchpad window or hide the focused scratchpad window.
+    # If there are multiple scratchpad windows, this command cycles through them.
+    bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 20px
+    bindsym $down resize grow height 20px
+    bindsym $up resize shrink height 20px
+    bindsym $right resize grow width 20px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+#
+# Utilities:
+#
+    # Special keys to adjust volume via PulseAudio
+    bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+    bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+    bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+    bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
+    # Special keys to adjust brightness via brightnessctl
+    bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+    bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
+    # Special key to take a screenshot with grim
+    bindsym Print exec grim
+
+client.focused #8568e6 #222222 #8568e6 #e598ff #8568e6
+client.unfocused #222222 #222222 #8568e6 #e598ff #222222
+gaps inner 8
+
+# Gajim
+for_window [title="Gajim"] \
+    floating enable, \
+    border pixel, \
+    move to workspace 11, \
+    resize set 1200 800, \
+    move position 700 0
+
+# Vesktop
+for_window [class="vesktop"] \
+    floating enable, \
+    border none, \
+    move to workspace 11, \
+    resize set 1500 900, \
+    move position 0 0
+
+# discord
+for_window [app_id="discord"] \
+    floating enable, \
+    border none, \
+    move to workspace 11, \
+    resize set 1500 900, \
+    move position 0 0
+
+# Mumble
+for_window [title="Mumble"] \
+    floating enable, \
+    border pixel, \
+    move to workspace 11, \
+    resize set 1000 800, \
+    move position 900 230
+
+# Steam Friends List
+#for_window [title="Friends List"] \
+#    floating enable, \
+#    resize set 1000 1000, \
+#    move position 0 0
+
+for_window [app_id="showmethekey-gtk"] \
+    floating enable, \
+    sticky enable, \
+    border none, \
+    move position 257 1664, \
+    resize set 1487 50, \
+
+# im-emoji-picker window
+for_window [title="im-emoji-picker"] \
+    focus disable

env/.config/sway/config.bak

@@ -0,0 +1,243 @@
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+exec ~/.local/bin/system/start-scripts/autostart.sh
+
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+# Your preferred terminal emulator
+set $term wezterm
+# Your preferred application launcher
+set $menu rofi -show drun
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
+output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
+#
+# Example configuration:
+#
+#   output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# You can get the names of your outputs by running: swaymsg -t get_outputs
+
+output "HDMI-A-1" scale 0.7
+
+### Idle configuration
+#
+# Example configuration:
+#
+# exec swayidle -w \
+#          timeout 300 'swaylock -f -c 000000' \
+#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
+#          before-sleep 'swaylock -f -c 000000'
+#
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# your displays after another 300 seconds, and turn your screens back on when
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+### Input configuration
+#
+# Example configuration:
+#
+#   input "2:14:SynPS/2_Synaptics_TouchPad" {
+#       dwt enabled
+#       tap enabled
+#       natural_scroll enabled
+#       middle_emulation enabled
+#   }
+#
+# You can get the names of your inputs by running: swaymsg -t get_inputs
+# Read `man 5 sway-input` for more information about this section.
+
+# or input <identifier>
+input "type:keyboard" {
+    xkb_layout us,de
+    xkb_variant ,nodeadkeys
+    xkb_options caps:swapescape
+}
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+
+    # Kill focused window
+    bindsym $mod+q kill
+
+    # Start your launcher
+    bindsym $mod+d exec $menu
+
+    # Drag floating windows by holding down $mod and left mouse button.
+    # Resize them with right mouse button + $mod.
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
+
+    # Reload the configuration file
+    bindsym $mod+Shift+c reload
+
+    # Exit sway (logs you out of your Wayland session)
+    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+
+    bindsym $mod+Escape exec grim -g "$(slurp -b 00000088 -c cba6f7; sleep 0.5)" - | wl-copy
+    bindsym $mod+Shift+Escape exec grim -o HDMI-A-1 - | wl-copy
+#
+# Moving around:
+#
+    # Move your focus around
+    bindsym $mod+$left focus left
+    bindsym $mod+$down focus down
+    bindsym $mod+$up focus up
+    bindsym $mod+$right focus right
+    # Or use $mod+[up|down|left|right]
+    bindsym $mod+Left focus left
+    bindsym $mod+Down focus down
+    bindsym $mod+Up focus up
+    bindsym $mod+Right focus right
+
+    # Move the focused window with the same, but add Shift
+    bindsym $mod+Shift+$left move left
+    bindsym $mod+Shift+$down move down
+    bindsym $mod+Shift+$up move up
+    bindsym $mod+Shift+$right move right
+    # Ditto, with arrow keys
+    bindsym $mod+Shift+Left move left
+    bindsym $mod+Shift+Down move down
+    bindsym $mod+Shift+Up move up
+    bindsym $mod+Shift+Right move right
+#
+# Workspaces:
+#
+    # Switch to workspace
+    bindsym $mod+1 workspace number 1
+    bindsym $mod+2 workspace number 2
+    bindsym $mod+3 workspace number 3
+    bindsym $mod+4 workspace number 4
+    bindsym $mod+5 workspace number 5
+    bindsym $mod+6 workspace number 6
+    bindsym $mod+7 workspace number 7
+    bindsym $mod+8 workspace number 8
+    bindsym $mod+9 workspace number 9
+    bindsym $mod+0 workspace number 10
+    # Move focused container to workspace
+    bindsym $mod+Shift+1 move container to workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8
+    bindsym $mod+Shift+9 move container to workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 10
+    # Note: workspaces can have any name you want, not just numbers.
+    # We just use 1-10 as the default.
+#
+# Layout stuff:
+#
+    # You can "split" the current object of your focus with
+    # $mod+b or $mod+v, for horizontal and vertical splits
+    # respectively.
+    bindsym $mod+b splith
+    bindsym $mod+v splitv
+
+    # Switch the current container between different layout styles
+    bindsym $mod+s layout stacking
+    bindsym $mod+w layout tabbed
+    bindsym $mod+e layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+f fullscreen
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+space floating toggle
+
+    # Swap focus between the tiling area and the floating area
+    bindsym $mod+Shift+space focus mode_toggle
+
+    # Move focus to the parent container
+    bindsym $mod+a focus parent
+#
+# Scratchpad:
+#
+    # Sway has a "scratchpad", which is a bag of holding for windows.
+    # You can send windows there and get them back later.
+
+    # Move the currently focused window to the scratchpad
+    bindsym $mod+Shift+minus move scratchpad
+
+    # Show the next scratchpad window or hide the focused scratchpad window.
+    # If there are multiple scratchpad windows, this command cycles through them.
+    bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+#
+# Utilities:
+#
+    # Special keys to adjust volume via PulseAudio
+    bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+    bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+    bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+    bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
+    # Special keys to adjust brightness via brightnessctl
+    bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+    bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
+    # Special key to take a screenshot with grim
+    bindsym Print exec grim
+
+#
+# Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+bar {
+    position bottom
+
+    # When the status_command prints a new line to stdout, swaybar updates.
+    # The default just shows the current date and time.
+    status_command while date +'%Y-%m-%d %X'; do sleep 1; done
+
+    colors {
+        statusline #ffffff
+        background #323232
+        inactive_workspace #32323200 #32323200 #5c5c5c
+    }
+}
+
+include /etc/sway/config.d/*

env/.config/waybar/config.jsonc

@@ -1,7 +1,8 @@
 {
     "layer": "top",
     "position": "bottom",
-    "modules-left": ["hyprland/workspaces"],
+    // "modules-left": ["hyprland/workspaces"],
+    "modules-left": [ "sway/workspaces", "sway/mode" ],
 
     //"modules-center": ["clock", ], //"custom/weather"],
 
@@ -72,6 +73,33 @@
         "sort-by-name": true
     },
 
+    "sway/workspaces": {
+        "format": "{icon}",
+        "format-icons": {
+            "1":"  ",
+            "2":"  ",
+            "3":"  ",
+            "4":"  ",
+            "5":"  ",
+            "6":"  ",
+            "7":"  ",
+            "8":"  ",
+            "9":"  ",
+            "10":"  ",
+            "11":"  ",
+            "12":"  ",
+            "13":"  ",
+            "14":"  ",
+            "15":"  ",
+            "16":"  ",
+            "17":"  ",
+            "18":"  ",
+            "19":"  ",
+            "20":"  "
+        },
+        "sort-by-name": true
+    },
+
     "tray": {
         "icon-size": 16,
         "spacing": 10

env/.config/waybar/style.css

@@ -31,6 +31,11 @@
   border-radius: 5px;
 }
 
+#workspaces button.focused {
+  color: #00c5ba;
+  border-radius: 5px;
+}
+
 button {
   background: transparent;
 }

env/.local/bin/system/start-scripts/autostart.sh

@@ -1,17 +1,16 @@
 #!/bin/bash
 cd "$(dirname "$0")"
 
-extra=0
-if [ "$(cat /etc/hostname)" == "Kasino" ]; then
-    extra=0
-fi
-if [ "$(cat /etc/hostname)" == "Witchen" ]; then
-    extra=1
-fi
-
 sleep 0.1
 xset s 0
 nitrogen --restore &
+if [ "$XDG_CURRENT_DESKTOP" == "sway:wlroots" ]; then
+    PID=$(pidof swaybg)
+    swaybg -o HDMI-A-1 -i "/home/iceyrazor/stuff/media/wallpapers/6b06108fa3bc46f5.jpg" -m fill -o DP-1 -i "/home/iceyrazor/stuff/media/wallpapers/tumblr_06bbd355f3e355049446dac24f6e7c44_2c486f77_1280 ninesols.jpg" -m fill & disown
+    sleep 0.4s
+    kill $PID
+fi
+
 xrdb -merge /home/iceyrazor/.Xresources &
 
 if [ -z "$WAYLAND_DISPLAY" ]; then
@@ -19,11 +18,9 @@ if [ -z "$WAYLAND_DISPLAY" ]; then
     setxkbmap -option caps:swapescape
 fi
 
-# if [ $extra == 1 ]; then
 #     if [ -z $(pgrep -f stbar.sh) ]; then
 #         # ~/stuff/scripts/system/stbar/stbar.sh &
 #     fi
-# fi
 
 # added openrc services... may go back to this later
 # pipewire & disown
@@ -33,9 +30,6 @@ fi
 # pipewire-pulse & disown
 sleep 0.5s
 
-# fcitx5 -d
-# this program running all the time causes weird key input bugs and lag. i only want to use this when typing special stuff.
-
 if [ "$WAYLAND_DISPLAY" ] && [ -z "$(pgrep -f waybar)" ]; then
     waybar & disown
 fi
@@ -56,7 +50,7 @@ fi
 if [ "$(cat /etc/hostname)" == "Kasino" ]; then
     if [ -z "$(pgrep vesktop)" ]; then
         sleep 2s
-        dbus-run-session discord & disown
+        dbus-run-session vesktop & disown
     fi
 
     if [ -z "$(pgrep gajim)" ]; then

runs-all/get-reqs-arch.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
-arch="$(uname -r | grep arch)"
-artix="$(uname -r | grep artix)"
-if [ $artix ] || [ $arch ]; then
+. /etc/os-release
+if [ "$ID" == "artix" ] || [ "$ID" == "arch" ]; then
     sudo="sudo"
     [ doas ] && sudo="doas"
 
@@ -99,7 +98,7 @@ if [ $artix ] || [ $arch ]; then
     [ $doall == 1 ] || [ $audio == 1 ] && $sudo pacman -S --noconfirm pipewire-pulse pipewire-alsa pipewire-jack qpwgraph
 
     # hyprland
-    [ $doall == 1 ] || [ $hyprland == 1 ] && $sudo pacman -S --noconfirm wayland hyprland waybar wlogout hyprlock xdg-desktop-portal xdg-desktop-portal-hyprland xdg-desktop-portal-gtk qt6-wayland qt5-wayland
+    [ $doall == 1 ] || [ $hyprland == 1 ] && $sudo pacman -S --noconfirm wayland hyprland waybar wlogout hyprlock xdg-desktop-portal xdg-desktop-portal-hyprland xdg-desktop-portal-gtk xdg-desktop-portal-wlr qt6-wayland qt5-wayland sway
     [ $doall == 1 ] || [ $hyprland == 1 ] && $aurm -S --noconfirm dunst-git sddm-theme-tokyo-night-git
 
     # vpn stuff

runs/get-reqs-arch.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
-arch="$(uname -r | grep arch)"
-artix="$(uname -r | grep artix)"
-if [ $artix ] || [ $arch ]; then
+. /etc/os-release
+if [ "$ID" == "artix" ] || [ "$ID" == "arch" ]; then
     sudo="sudo"
     [ doas ] && sudo="doas"