Merge branch 'main' into rotom

install.sh

@@ -60,7 +60,6 @@ mapfile -t tools < <(
 
 mapfile -t extratools < <(
   gum choose --header="Choose extra tools to install:" --no-limit \
-    "General fonts" \
     "Godot" \
     "Btop" \
     "Fuzzel" \
@@ -86,7 +85,7 @@ for choice in "${desktop[@]}"; do
     sudo -v || exit 1
     yay -S --needed --noconfirm \
       niri \
-      dolphin \
+      nautilus \
       gnome-keyring \
       brightnessctl \
       cava \
@@ -104,13 +103,13 @@ for choice in "${desktop[@]}"; do
       qt6-multimedia \
       dms-shell-bin \
       xwayland-satellite \
-      ly
+      ly \
+      noto-fonts-emoji
     # greetd-dms-greeter-git
 
     stow niri qt6ct --adopt
 
-    # xdg-mime default org.gnome.nautilus.desktop inode/directory
-    xdg-mime default org.kde.dolphin.desktop inode/directory
+    xdg-mime default org.gnome.nautilus.desktop inode/directory
 
     mkdir -p "$HOME"/.config/environment.d
     # echo "QT_QPA_PLATFORMTHEME=qt6ct" >>"$HOME"/.config/environment.d/90-qt.conf
@@ -129,8 +128,8 @@ for choice in "${desktop[@]}"; do
     sudo -v || exit 1
     yay -S --needed --noconfirm \
       hyprland \
-      uwsm \
-      dolphin \
+      uswm \
+      nautilus \
       gnome-keyring \
       brightnessctl \
       cava \
@@ -148,12 +147,12 @@ for choice in "${desktop[@]}"; do
       qt6-multimedia \
       dms-shell-bin \
       xwayland-satellite \
-      ly
+      ly \
+      noto-fonts-emoji
 
     stow hyprland qt6ct --adopt
 
-    # xdg-mime default org.gnome.nautilus.desktop inode/directory
-    xdg-mime default org.kde.dolphin.desktop inode/directory
+    xdg-mime default org.gnome.nautilus.desktop inode/directory
 
     mkdir -p "$HOME"/.config/environment.d
     # echo "QT_QPA_PLATFORMTHEME=qt6ct" >>"$HOME"/.config/environment.d/90-qt.conf
@@ -225,7 +224,6 @@ for choice in "${tools[@]}"; do
       wine \
       protontricks \
       protonup-qt \
-      protonplus \
       goverlay \
       vkbasalt \
       vulkan-tools
@@ -286,9 +284,6 @@ extrapkgs=()
 
 for choice in "${extratools[@]}"; do
   case "$choice" in
-  "General Fonts")
-    extrapkgs+=("noto-fonts" "noto-fonts-cjk" "noto-fonts-emoji")
-    ;;
   "Godot")
     extrapkgs+=("godots-bin")
     stow godot --adopt

niri/.config/niri/dms/binds.kdl

@@ -1,5 +1,5 @@
 binds {
-    Mod+E repeat=false { spawn "dolphin"; }
+    Mod+E repeat=false { spawn "nautilus"; }
     
     xF86AudioPlay {
      spawn-sh "dms ipc call mpris playPause";