Merge branch 'main' into golbat

install.sh

@@ -60,6 +60,7 @@ mapfile -t tools < <(
 
 mapfile -t extratools < <(
   gum choose --header="Choose extra tools to install:" --no-limit \
+    "General fonts" \
     "Godot" \
     "Btop" \
     "Fuzzel" \
@@ -77,13 +78,15 @@ mapfile -t extratools < <(
 ## Applying configs ##
 ######################
 
+env_to_set=()
+
 for choice in "${desktop[@]}"; do
   case "$choice" in
   "Niri")
     sudo -v || exit 1
     yay -S --needed --noconfirm \
       niri \
-      nautilus \
+      dolphin \
       gnome-keyring \
       brightnessctl \
       cava \
@@ -101,16 +104,17 @@ 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.gnome.nautilus.desktop inode/directory
+    xdg-mime default org.kde.dolphin.desktop inode/directory
 
     mkdir -p "$HOME"/.config/environment.d
-    echo "QT_QPA_PLATFORMTHEME=qt6ct" >>"$HOME"/.config/environment.d/90-qt.conf
+    # echo "QT_QPA_PLATFORMTHEME=qt6ct" >>"$HOME"/.config/environment.d/90-qt.conf
+    env_to_set+=("QT_QPA_PLATFORMTHEME=qt6ct")
     systemctl --user daemon-reload
 
     systemctl --user enable dms
@@ -126,7 +130,7 @@ for choice in "${desktop[@]}"; do
     yay -S --needed --noconfirm \
       hyprland \
       uwsm \
-      nautilus \
+      dolphin \
       gnome-keyring \
       brightnessctl \
       cava \
@@ -145,15 +149,16 @@ 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.gnome.nautilus.desktop inode/directory
+    xdg-mime default org.kde.dolphin.desktop inode/directory
 
     mkdir -p "$HOME"/.config/environment.d
-    echo "QT_QPA_PLATFORMTHEME=qt6ct" >>"$HOME"/.config/environment.d/90-qt.conf
+    # echo "QT_QPA_PLATFORMTHEME=qt6ct" >>"$HOME"/.config/environment.d/90-qt.conf
+    env_to_set+=("QT_QPA_PLATFORMTHEME=qt6ct")
     systemctl --user daemon-reload
 
     systemctl --user enable dms
@@ -221,6 +226,7 @@ for choice in "${tools[@]}"; do
       wine \
       protontricks \
       protonup-qt \
+      protonplus \
       goverlay \
       vkbasalt \
       vulkan-tools
@@ -281,6 +287,9 @@ 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
@@ -327,6 +336,12 @@ for choice in "${extratools[@]}"; do
   esac
 done
 
+mkdir -p "$HOME"/.config/environment.d
+echo "$(
+  IFS=$'\n'
+  printf "%s\n" "${env_to_set[@]}" | sort -u
+)" >"$HOME"/.config/environment.d/90-dots.conf
+
 extpkgstr=$(
   IFS=" "
   echo "${extrapkgs[*]}"

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

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

nvim/.config/nvim/.gitignore

@@ -1 +1,2 @@
 lazy-lock.json
+dankcolors.lua