Merge branch 'main' into golbat

ghostty/.config/ghostty/themes/.gitignore

@@ -0,0 +1 @@
+dankcolors

ghostty/.config/ghostty/themes/dankcolors

@@ -1,22 +0,0 @@
-background = #1a1018
-foreground = #f0dde9
-cursor-color = #ffabf1
-selection-background = #82007e
-selection-foreground = #f0dde9
-
-palette = 0=#1a1018
-palette = 1=#d95b3c
-palette = 2=#6ed680
-palette = 3=#d2db7b
-palette = 4=#c857b5
-palette = 5=#bf8cb6
-palette = 6=#ffabf1
-palette = 7=#abb2bf
-palette = 8=#5c6370
-palette = 9=#e0775f
-palette = 10=#86e095
-palette = 11=#e1e897
-palette = 12=#ffbdf9
-palette = 13=#b255b2
-palette = 14=#aa6194
-palette = 15=#ffffff

hyprland/.config/hypr/dms/.gitignore

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

hyprland/.config/hypr/dms/colors.conf

@@ -1,25 +0,0 @@
-# ! Auto-generated file. Do not edit directly.
-# Remove source = ./dms/colors.conf from your config to override.
-
-$primary  = rgb(ffabf1)
-$outline  = rgb(9c8c97)
-$error    = rgb(ffb4ab)
-
-general {
-  col.active_border   = $primary
-  col.inactive_border = $outline
-}
-
-group {
-  col.border_active   = $primary
-  col.border_inactive = $outline
-  col.border_locked_active   = $error
-  col.border_locked_inactive = $outline
-
-  groupbar {
-    col.active         = $primary
-    col.inactive       = $outline
-    col.locked_active   = $error
-    col.locked_inactive = $outline
-  }
-}

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

@@ -4,47 +4,31 @@ set -e
 
 DOTSDIR=$(pwd)
 
-#########################
-## gum style variables ##
-#########################
-
-# GUM_SPIN_SPINNER="minidot"
-# GUM_SPIN_SHOW_OUTPUT="true"
-
 sudo -v || exit 1
 
-####################
-## Updating Repos ##
-####################
+#####################
+## Updating System ##
+#####################
 
-sudo pacman -Syy
+sudo pacman -Syyu --noconfirm
 
-####################
-## Installing gum ##
-####################
+#############################
+## Installing dependencies ##
+#############################
 
-if ! command -v gum &>/dev/null; then
-  echo "Installing gum"
-  sudo pacman -S --needed --noconfirm gum
-fi
+sudo pacman -S --noconfirm --needed gum stow base-devel git
 
 ###################################
 ## Installing yay & dependencies ##
 ###################################
 
 if ! command -v yay &>/dev/null; then
-  sudo -v || exit 1
-  # gum spin --title "Installing yay dependencies" -- \
-  sudo pacman -S base-devel git --needed --noconfirm
-
   TEMP_DIR=$(mktemp -d)
 
-  # gum spin --title "Cloning yay-bin from AUR" -- \
   git clone https://aur.archlinux.org/yay-bin.git "$TEMP_DIR"/yay
   cd "$TEMP_DIR"/yay
 
   sudo -v || exit 1
-  # gum spin --title "Installing yay" -- \
   makepkg -si --noconfirm
 fi
 
@@ -76,6 +60,7 @@ mapfile -t tools < <(
 
 mapfile -t extratools < <(
   gum choose --header="Choose extra tools to install:" --no-limit \
+    "General fonts" \
     "Godot" \
     "Btop" \
     "Fuzzel" \
@@ -89,26 +74,19 @@ mapfile -t extratools < <(
     "MPV"
 )
 
-#####################
-## Installing stow ##
-#####################
-
-sudo -v || exit 1
-# gum spin --title "Installing GNU Stow" -- \
-yay -S --needed --noconfirm stow
-
 ######################
 ## Applying configs ##
 ######################
 
+env_to_set=()
+
 for choice in "${desktop[@]}"; do
   case "$choice" in
   "Niri")
     sudo -v || exit 1
-    # gum spin --title "Installing niri alongside required packages" -- \
     yay -S --needed --noconfirm \
       niri \
-      nautilus \
+      dolphin \
       gnome-keyring \
       brightnessctl \
       cava \
@@ -126,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
@@ -151,7 +130,7 @@ for choice in "${desktop[@]}"; do
     yay -S --needed --noconfirm \
       hyprland \
       uwsm \
-      nautilus \
+      dolphin \
       gnome-keyring \
       brightnessctl \
       cava \
@@ -170,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
@@ -192,7 +172,6 @@ for choice in "${desktop[@]}"; do
     ;;
   "KDE Plasma")
     sudo -v || exit 1
-    # gum spin --title "Installing KDE Plasma" -- \
     pacman -S --needed --noconfirm plasma kde-applications
     sudo systemctl enable sddm
     ;;
@@ -203,7 +182,6 @@ for choice in "${tools[@]}"; do
   case "$choice" in
   "Terminal")
     sudo -v || exit 1
-    # gum spin --title "Installing Terminal packages..." -- \
     yay -S --needed --noconfirm \
       fastfetch \
       hyfetch \
@@ -221,11 +199,8 @@ for choice in "${tools[@]}"; do
       imagemagick \
       tree
 
-    # sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-    # git clone https://github.com/ohmyzsh/ohmyzsh "$HOME"/.oh-my-zsh
     stow fastfetch hyfetch nvim zsh --adopt
 
-    # gum spin --title "Updating Tealdeer database" -- \
     tldr --update
 
     chsh -s /bin/zsh "$USER"
@@ -233,7 +208,6 @@ for choice in "${tools[@]}"; do
 
   "Terminal Emulator")
     sudo -v || exit 1
-    # gum spin --title "Installing Terminal Emulator..." -- \
     yay -S --needed --noconfirm \
       ghostty
     stow ghostty --adopt
@@ -241,7 +215,6 @@ for choice in "${tools[@]}"; do
 
   "Gaming")
     sudo -v || exit 1
-    # gum spin --title "Installing Gaming Packages..." -- \
     yay -S --needed --noconfirm \
       mangohud \
       gamemode \
@@ -253,6 +226,7 @@ for choice in "${tools[@]}"; do
       wine \
       protontricks \
       protonup-qt \
+      protonplus \
       goverlay \
       vkbasalt \
       vulkan-tools
@@ -261,14 +235,12 @@ for choice in "${tools[@]}"; do
 
     sudo -v || exit 1
 
-    # gum spin --spinner minidot --title "Applying arrpy systemd fix..." -- \
     sudo cp /usr/lib/systemd/user/arrpc.service /etc/systemd/system/arrpc.service
     sudo systemctl enable arrpc --now
     ;;
 
   "VR Gaming")
     sudo -v || exit 1
-    # gum spin --title "Installing VR Gaming Packages..." -- \
     yay -S --needed --noconfirm \
       alvr-launcher-bin \
       wayvr
@@ -276,7 +248,6 @@ for choice in "${tools[@]}"; do
 
   "Hamr Sticker Picker")
     sudo -v || exit 1
-    # gum spin --title "Installing hamr..." -- \
     yay -S --needed --noconfirm \
       hamr
 
@@ -316,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
@@ -362,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

@@ -0,0 +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/colors.kdl

@@ -1,39 +0,0 @@
-// ! Auto-generated file. Do not edit directly.
-// Remove `include "dms/colors.kdl"` from your config to override.
-
-layout {
-    background-color "transparent"
-
-    focus-ring {
-        active-color   "#ffabf1"
-        inactive-color "#9c8c97"
-        urgent-color   "#ffb4ab"
-    }
-
-    border {
-        active-color   "#ffabf1"
-        inactive-color "#9c8c97"
-        urgent-color   "#ffb4ab"
-    }
-
-    shadow {
-        color "#00000070"
-    }
-
-    tab-indicator {
-        active-color   "#ffabf1"
-        inactive-color "#9c8c97"
-        urgent-color   "#ffb4ab"
-    }
-
-    insert-hint {
-        color "#ffabf180"
-    }
-}
-
-recent-windows {
-    highlight {
-        active-color   "#82007e"
-        urgent-color   "#ffb4ab"
-    }
-}

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

qt6ct/.config/qt6ct/colors/.gitignore

@@ -0,0 +1 @@
+matugen.conf

qt6ct/.config/qt6ct/colors/matugen.conf

@@ -1,144 +0,0 @@
-[ColorScheme]
-active_colors=#f0dde9, #1a1018, #271c24, #9c8c97, #50434c, #50434c, #f0dde9, #5c0059, #f0dde9, #1a1018, #1a1018, #000000, #ffabf1, #5c0059, #eab9d1, #eab9d1, #231820, #1a1018, #1a1018, #d4c1cd, #d4c1cd
-disabled_colors=#d4c1cd, #50434c, #271c24, #9c8c97, #50434c, #50434c, #d4c1cd, #d4c1cd, #d4c1cd, #50434c, #50434c, #000000, #50434c, #d4c1cd, #d4c1cd, #d4c1cd, #50434c, #50434c, #50434c, #d4c1cd, #d4c1cd
-inactive_colors=#d4c1cd, #1a1018, #271c24, #9c8c97, #50434c, #50434c, #d4c1cd, #d4c1cd, #d4c1cd, #1a1018, #1a1018, #000000, #eab9d1, #472639, #eab9d1, #eab9d1, #231820, #1a1018, #1a1018, #d4c1cd, #d4c1cd
-
-[ColorEffects:Disabled]
-Color=212,193,205
-ColorAmount=0
-ColorEffect=0
-ContrastAmount=0.65
-ContrastEffect=1
-IntensityAmount=0.1
-IntensityEffect=2
-
-[ColorEffects:Inactive]
-ChangeSelectionColor=true
-Color=156,140,151
-ColorAmount=0.025
-ColorEffect=2
-ContrastAmount=0.1
-ContrastEffect=2
-Enable=false
-IntensityAmount=0
-IntensityEffect=0
-
-[Colors:Button]
-BackgroundAlternate=39,28,36
-BackgroundNormal=26,16,24
-DecorationFocus=255,171,241
-DecorationHover=255,171,241
-ForegroundActive=255,171,241
-ForegroundInactive=212,193,205
-ForegroundLink=252,178,199
-ForegroundNegative=255,180,171
-ForegroundNeutral=234,185,209
-ForegroundNormal=240,221,233
-ForegroundPositive=252,178,199
-ForegroundVisited=234,185,209
-
-[Colors:Complementary]
-BackgroundAlternate=39,28,36
-BackgroundNormal=26,16,24
-DecorationFocus=255,171,241
-DecorationHover=255,171,241
-ForegroundActive=255,171,241
-ForegroundInactive=212,193,205
-ForegroundLink=252,178,199
-ForegroundNegative=255,180,171
-ForegroundNeutral=234,185,209
-ForegroundNormal=240,221,233
-ForegroundPositive=252,178,199
-ForegroundVisited=234,185,209
-
-[Colors:Header]
-BackgroundAlternate=26,16,24
-BackgroundNormal=26,16,24
-DecorationFocus=255,171,241
-DecorationHover=255,171,241
-ForegroundActive=255,171,241
-ForegroundInactive=212,193,205
-ForegroundLink=252,178,199
-ForegroundNegative=255,180,171
-ForegroundNeutral=234,185,209
-ForegroundNormal=240,221,233
-ForegroundPositive=252,178,199
-ForegroundVisited=234,185,209
-
-[Colors:Header][Inactive]
-BackgroundAlternate=26,16,24
-BackgroundNormal=26,16,24
-DecorationFocus=255,171,241
-DecorationHover=255,171,241
-ForegroundActive=255,171,241
-ForegroundInactive=212,193,205
-ForegroundLink=252,178,199
-ForegroundNegative=255,180,171
-ForegroundNeutral=234,185,209
-ForegroundNormal=240,221,233
-ForegroundPositive=252,178,199
-ForegroundVisited=234,185,209
-
-[Colors:Selection]
-BackgroundAlternate=130,0,126
-BackgroundNormal=255,171,241
-DecorationFocus=255,171,241
-DecorationHover=255,171,241
-ForegroundActive=92,0,89
-ForegroundInactive=212,193,205
-ForegroundLink=252,178,199
-ForegroundNegative=255,180,171
-ForegroundNeutral=234,185,209
-ForegroundNormal=92,0,89
-ForegroundPositive=252,178,199
-ForegroundVisited=234,185,209
-
-[Colors:Tooltip]
-BackgroundAlternate=26,16,24
-BackgroundNormal=26,16,24
-DecorationFocus=255,171,241
-DecorationHover=255,171,241
-ForegroundActive=255,171,241
-ForegroundInactive=212,193,205
-ForegroundLink=252,178,199
-ForegroundNegative=255,180,171
-ForegroundNeutral=234,185,209
-ForegroundNormal=240,221,233
-ForegroundPositive=252,178,199
-ForegroundVisited=234,185,209
-
-[Colors:View]
-BackgroundAlternate=35,24,32
-BackgroundNormal=26,16,24
-DecorationFocus=255,171,241
-DecorationHover=255,171,241
-ForegroundActive=255,171,241
-ForegroundInactive=212,193,205
-ForegroundLink=252,178,199
-ForegroundNegative=255,180,171
-ForegroundNeutral=234,185,209
-ForegroundNormal=240,221,233
-ForegroundPositive=252,178,199
-ForegroundVisited=234,185,209
-
-[Colors:Window]
-BackgroundAlternate=26,16,24
-BackgroundNormal=26,16,24
-DecorationFocus=255,171,241
-DecorationHover=255,171,241
-ForegroundActive=255,171,241
-ForegroundInactive=212,193,205
-ForegroundLink=252,178,199
-ForegroundNegative=255,180,171
-ForegroundNeutral=234,185,209
-ForegroundNormal=240,221,233
-ForegroundPositive=252,178,199
-ForegroundVisited=234,185,209
-
-[WM]
-activeBackground=26,16,24
-activeBlend=240,221,233
-activeForeground=240,221,233
-inactiveBackground=26,16,24
-inactiveBlend=212,193,205
-inactiveForeground=212,193,205

zsh/.omz-custom/aliases.zsh

@@ -17,3 +17,4 @@ alias update-submodules="git submodules update --recursive --init"
 
 alias cherry-merge="$ZSH_CUSTOM/scripts/cherry-merge.sh"
 alias push-main-current="$ZSH_CUSTOM/scripts/push-main-current.sh"
+alias update-mirrorlist="$ZSH_CUSTOM/scripts/update-mirrorlist.sh"

zsh/.omz-custom/scripts/update-mirrorlist.sh

@@ -0,0 +1,3 @@
+sudo cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist_"$(date +%Y-%m-%d_%H-%M-%S)".bak
+sudo reflector -c DE --protocol https --sort rate --latest 50 --download-timeout 5 --threads 5 --save /etc/pacman.d/mirrorlist
+sudo pacman -Sy