Merge branch 'main' into golbat

hyprland/.config/hypr/dms/.gitignore

@@ -1 +1,4 @@
 colors.conf
+cursor.conf
+layout.conf
+outputs.conf

hyprland/.config/hypr/dms/cursor.conf

@@ -1,6 +0,0 @@
-# Auto-generated by DMS - do not edit manually
-
-env = HYPRCURSOR_THEME,Sweet-cursors
-env = XCURSOR_THEME,Sweet-cursors
-env = HYPRCURSOR_SIZE,24
-env = XCURSOR_SIZE,24

hyprland/.config/hypr/dms/layout.conf

@@ -1,11 +0,0 @@
-# Auto-generated by DMS - do not edit manually
-
-general {
-    gaps_in = 4
-    gaps_out = 4
-    border_size = 2
-}
-
-decoration {
-    rounding = 12
-}

hyprland/.config/hypr/dms/outputs.conf

@@ -1,4 +0,0 @@
-# Auto-generated by DMS - do not edit manually
-
-monitor = DP-1, 2560x1440@59.951, 2560x0, 1, vrr, 1
-monitor = DP-2, 2560x1440@180.002, 0x0, 1

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 \
-      noto-fonts-emoji
+      ly
     # 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 \
-      noto-fonts-emoji
+      ly
 
     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/config.kdl

@@ -5,53 +5,6 @@
 config-notification {
     disable-failed
 }
-// Outputs from existing configuration
-output "eDP-1" {
-    // Uncomment this line to disable this output.
-    // off
-
-    // Resolution and, optionally, refresh rate of the output.
-    // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
-    // If the refresh rate is omitted, niri will pick the highest refresh rate
-    // for the resolution.
-    // If the mode is omitted altogether or is invalid, niri will pick one automatically.
-    // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
-    mode "1920x1080@144"
-
-    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
-    scale 1
-
-    // Transform allows to rotate the output counter-clockwise, valid values are:
-    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
-    transform "normal"
-
-    // Position of the output in the global coordinate space.
-    // This affects directional monitor actions like "focus-monitor-left", and cursor movement.
-    // The cursor can only move between directly adjacent outputs.
-    // Output scale and rotation has to be taken into account for positioning:
-    // outputs are sized in logical, or scaled, pixels.
-    // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
-    // so to put another output directly adjacent to it on the right, set its x to 1920.
-    // If the position is unset or results in an overlap, the output is instead placed
-    // automatically.
-    position x=0 y=0
-}
-
-// Main Screen
-output "DP-2" {
-  mode "2560x1440@180.002"
-  scale 1
-  transform "normal"
-  position x=0 y=0
-}
-
-// Secondary Screen
-output "DP-1" {
-  mode "2560x1440@59.951"
-  scale 1
-  transform "normal"
-  position x=2560 y=140
-}
 
 gestures {
     hot-corners {

niri/.config/niri/dms/.gitignore

@@ -1 +1,6 @@
+alttab.kdl
 colors.kdl
+cursor.kdl
+layout.kdl
+outputs.kdl
+wpblur.kdl

niri/.config/niri/dms/alttab.kdl

@@ -1,10 +0,0 @@
-// ! DO NOT EDIT !
-        // ! AUTO-GENERATED BY DMS !
-        // ! CHANGES WILL BE OVERWRITTEN !
-        // ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
-
-        recent-windows {
-        highlight {
-        corner-radius 12
-        }
-        }

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";

niri/.config/niri/dms/cursor.kdl

@@ -1,9 +0,0 @@
-// ! DO NOT EDIT !
-// ! AUTO-GENERATED BY DMS !
-// ! CHANGES WILL BE OVERWRITTEN !
-// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
-
-cursor {
-    xcursor-theme "Sweet-cursors"
-    xcursor-size 24
-}

niri/.config/niri/dms/layout.kdl

@@ -1,22 +0,0 @@
-// ! DO NOT EDIT !
-        // ! AUTO-GENERATED BY DMS !
-        // ! CHANGES WILL BE OVERWRITTEN !
-        // ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
-
-        layout {
-        gaps 4
-
-        border {
-        width 2
-        }
-
-        focus-ring {
-        width 2
-        }
-        }
-        window-rule {
-        geometry-corner-radius 12
-        clip-to-geometry true
-        tiled-state true
-        draw-border-with-background false
-        }

niri/.config/niri/dms/outputs.kdl

@@ -1,14 +0,0 @@
-// Auto-generated by DMS - do not edit manually
-
-output "DP-2" {
-    mode "2560x1440@180.002"
-    scale 1
-    position x=0 y=0
-}
-
-output "DP-1" {
-    mode "2560x1440@59.951"
-    scale 1
-    position x=2560 y=140
-}
-

niri/.config/niri/dms/wpblur.kdl

@@ -1,9 +0,0 @@
-// ! DO NOT EDIT !
-// ! AUTO-GENERATED BY DMS !
-// ! CHANGES WILL BE OVERWRITTEN !
-// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
-
-layer-rule {
-    match namespace="dms:blurwallpaper"
-    place-within-backdrop true
-}

nvim/.config/nvim/.gitignore

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