Merge branch 'main' into rotom

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "zsh/.omz-custom/plugins/zsh-autosuggestions"]
 	path = zsh/.omz-custom/plugins/zsh-autosuggestions
 	url = https://github.com/zsh-users/zsh-autosuggestions
+[submodule "zsh/.oh-my-zsh"]
+	path = zsh/.oh-my-zsh
+	url = https://github.com/ohmyzsh/ohmyzsh

ghostty/.config/ghostty/themes/.gitignore

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

godot/.config/godot/editor_settings-4.5.tres

@@ -79,7 +79,7 @@ _script_setup_templates_dictionary = {
 "Node2D": "0NodeDefault"
 }
 _use_favorites_root_selection = false
-_script_setup_use_script_templates = false
+_script_setup_use_script_templates = true
 shortcuts = [{
 "name": "spatial_editor/viewport_zoom_modifier_1",
 "shortcuts": [SubResource("InputEventKey_xf3c6")]

hyprland/.config/hypr/dms/.gitignore

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

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
+sudo pacman -S --noconfirm --needed gum stow base-devel git
-  echo "Installing gum"
-  sudo pacman -S --needed --noconfirm gum
-fi
 
 ###################################
 ## 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
 
@@ -57,6 +41,7 @@ cd "$DOTSDIR"
 mapfile -t desktop < <(
   gum choose --header="Choose desktop configuration:" \
     "Niri" \
+    "Hyprland" \
     "KDE Plasma" \
     "None"
 )
@@ -88,23 +73,16 @@ 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 \
@@ -117,8 +95,7 @@ for choice in "${desktop[@]}"; do
       xdg-desktop-portal-gnome \
       xdg-desktop-portal-gtk \
       xdg-desktop-portal-wlr \
-      quickshell \
+      quickshell-git \
-      cava \
       cliphist \
       wl-clipboard \
       dgop \
@@ -135,7 +112,8 @@ for choice in "${desktop[@]}"; do
     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
+    # 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
@@ -146,10 +124,52 @@ for choice in "${desktop[@]}"; do
     # dms greeter sync
     sudo systemctl enable ly@tty1
     ;;
+  "Hyprland")
+    sudo -v || exit 1
+    yay -S --needed --noconfirm \
+      hyprland \
+      uswm \
+      nautilus \
+      gnome-keyring \
+      brightnessctl \
+      cava \
+      candy-icons-git \
+      power-profiles-daemon \
+      qt6ct-kde \
+      xdg-desktop-portal-gnome \
+      xdg-desktop-portal-gtk \
+      xdg-desktop-portal-wlr \
+      quickshell-git \
+      cliphist \
+      wl-clipboard \
+      dgop \
+      matugen-bin \
+      qt6-multimedia \
+      dms-shell-bin \
+      xwayland-satellite \
+      ly \
+      noto-fonts-emoji
 
+    stow hyprland qt6ct --adopt
+
+    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
+    env_to_set+=("QT_QPA_PLATFORMTHEME=qt6ct")
+    systemctl --user daemon-reload
+
+    systemctl --user enable dms
+    systemctl --user add-wants hyprland-session.target dms
+    systemctl --user add-wants hyprland-session.target gnome-keyring-daemon.service
+
+    # dms greeter enable
+    # dms greeter sync
+    sudo systemctl enable ly@tty1
+
+    ;;
   "KDE Plasma")
     sudo -v || exit 1
-    # gum spin --title "Installing KDE Plasma" -- \
     pacman -S --needed --noconfirm plasma kde-applications
     sudo systemctl enable sddm
     ;;
@@ -160,7 +180,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 \
@@ -178,11 +197,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"
@@ -190,7 +206,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
@@ -198,7 +213,6 @@ for choice in "${tools[@]}"; do
 
   "Gaming")
     sudo -v || exit 1
-    # gum spin --title "Installing Gaming Packages..." -- \
     yay -S --needed --noconfirm \
       mangohud \
       gamemode \
@@ -218,14 +232,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
@@ -233,7 +245,6 @@ for choice in "${tools[@]}"; do
 
   "Hamr Sticker Picker")
     sudo -v || exit 1
-    # gum spin --title "Installing hamr..." -- \
     yay -S --needed --noconfirm \
       hamr
 
@@ -319,6 +330,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 {
@@ -74,6 +27,7 @@ input {
     }
     mouse {
       accel-profile "flat"
+      accel-speed 0.5
     }
     trackpoint {
     }
@@ -265,6 +219,12 @@ window-rule {
   default-column-width { proportion 1.0; }
 }
 
+// Steam notification
+window-rule {
+    match app-id="steam" title=r#"^notificationtoasts_\d+_desktop$"#
+    default-floating-position x=10 y=10 relative-to="bottom-right"
+}
+
 debug {
     honor-xdg-activation-with-invalid-serial
 }
@@ -284,3 +244,7 @@ include "dms/colors.kdl"
 include "dms/layout.kdl"
 include "dms/alttab.kdl"
 include "dms/binds.kdl"
+
+include "dms/outputs.kdl"
+
+include "dms/cursor.kdl"

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,5 +0,0 @@
-recent-windows {
-    highlight {
-        corner-radius 12
-    }
-}

niri/.config/niri/dms/colors.kdl

@@ -1,36 +0,0 @@
-layout {
-    background-color "transparent"
-
-    focus-ring {
-        active-color   "#ff0080"
-        inactive-color "#8000ff"
-        urgent-color   "#ff4080"
-    }
-
-    border {
-        active-color   "#ff0080"
-        inactive-color "#8000ff"
-        urgent-color   "#ff4080"
-    }
-
-    shadow {
-        color "#00000070"
-    }
-
-    tab-indicator {
-        active-color   "#ff0080"
-        inactive-color "#8000ff"
-        urgent-color   "#ff4080"
-    }
-
-    insert-hint {
-        color "#ff008080"
-    }
-}
-
-recent-windows {
-    highlight {
-        active-color   "#cc0066"
-        urgent-color   "#ff4080"
-    }
-}

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

@@ -1,17 +0,0 @@
-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/wpblur.kdl

@@ -1,4 +0,0 @@
-layer-rule {
-    match namespace="dms:blurwallpaper"
-    place-within-backdrop true
-}

nvim/.config/nvim/.gitignore

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

nvim/.config/nvim/init.lua

@@ -1,5 +1,3 @@
 -- bootstrap lazy.nvim, LazyVim and your plugins
 require("config.lazy")
 vim.lsp.enable("gopls")
-
-vim.cmd("colorscheme cuddlefish")

qt6ct/.config/qt6ct/colors/.gitignore

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

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

@@ -1,144 +0,0 @@
-[ColorScheme]
-active_colors=#f0f0f0, #0d0d0d, #1a0d1a, #8000ff, #1a0f1a, #1a0f1a, #f0f0f0, #ffffff, #f0f0f0, #181818, #181818, #000000, #ff0080, #ffffff, #00ff80, #00ff80, #0d0d0d, #0d0d0d, #0d0d0d, #e0e0e0, #e0e0e0
-disabled_colors=#e0e0e0, #1a0f1a, #1a0d1a, #8000ff, #1a0f1a, #1a0f1a, #e0e0e0, #e0e0e0, #e0e0e0, #1a0f1a, #1a0f1a, #000000, #1a0f1a, #e0e0e0, #e0e0e0, #e0e0e0, #1a0f1a, #1a0f1a, #1a0f1a, #e0e0e0, #e0e0e0
-inactive_colors=#e0e0e0, #0d0d0d, #1a0d1a, #8000ff, #1a0f1a, #1a0f1a, #e0e0e0, #e0e0e0, #e0e0e0, #0d0d0d, #0d0d0d, #000000, #00ff80, #ffffff, #00ff80, #00ff80, #0d0d0d, #0d0d0d, #0d0d0d, #e0e0e0, #e0e0e0
-
-[ColorEffects:Disabled]
-Color=224,224,224
-ColorAmount=0
-ColorEffect=0
-ContrastAmount=0.65
-ContrastEffect=1
-IntensityAmount=0.1
-IntensityEffect=2
-
-[ColorEffects:Inactive]
-ChangeSelectionColor=true
-Color=128,0,255
-ColorAmount=0.025
-ColorEffect=2
-ContrastAmount=0.1
-ContrastEffect=2
-Enable=false
-IntensityAmount=0
-IntensityEffect=0
-
-[Colors:Button]
-BackgroundAlternate=26,13,26
-BackgroundNormal=13,13,13
-DecorationFocus=255,0,128
-DecorationHover=255,0,128
-ForegroundActive=255,0,128
-ForegroundInactive=224,224,224
-ForegroundLink=0,255,128
-ForegroundNegative=255,64,128
-ForegroundNeutral=0,255,128
-ForegroundNormal=240,240,240
-ForegroundPositive=0,255,128
-ForegroundVisited=0,255,128
-
-[Colors:Complementary]
-BackgroundAlternate=26,13,26
-BackgroundNormal=24,24,24
-DecorationFocus=255,0,128
-DecorationHover=255,0,128
-ForegroundActive=255,0,128
-ForegroundInactive=224,224,224
-ForegroundLink=0,255,128
-ForegroundNegative=255,64,128
-ForegroundNeutral=0,255,128
-ForegroundNormal=240,240,240
-ForegroundPositive=0,255,128
-ForegroundVisited=0,255,128
-
-[Colors:Header]
-BackgroundAlternate=24,24,24
-BackgroundNormal=13,13,13
-DecorationFocus=255,0,128
-DecorationHover=255,0,128
-ForegroundActive=255,0,128
-ForegroundInactive=224,224,224
-ForegroundLink=0,255,128
-ForegroundNegative=255,64,128
-ForegroundNeutral=0,255,128
-ForegroundNormal=240,240,240
-ForegroundPositive=0,255,128
-ForegroundVisited=0,255,128
-
-[Colors:Header][Inactive]
-BackgroundAlternate=13,13,13
-BackgroundNormal=24,24,24
-DecorationFocus=255,0,128
-DecorationHover=255,0,128
-ForegroundActive=255,0,128
-ForegroundInactive=224,224,224
-ForegroundLink=0,255,128
-ForegroundNegative=255,64,128
-ForegroundNeutral=0,255,128
-ForegroundNormal=240,240,240
-ForegroundPositive=0,255,128
-ForegroundVisited=0,255,128
-
-[Colors:Selection]
-BackgroundAlternate=204,0,102
-BackgroundNormal=255,0,128
-DecorationFocus=255,0,128
-DecorationHover=255,0,128
-ForegroundActive=255,255,255
-ForegroundInactive=224,224,224
-ForegroundLink=0,255,128
-ForegroundNegative=255,64,128
-ForegroundNeutral=0,255,128
-ForegroundNormal=255,255,255
-ForegroundPositive=0,255,128
-ForegroundVisited=0,255,128
-
-[Colors:Tooltip]
-BackgroundAlternate=24,24,24
-BackgroundNormal=13,13,13
-DecorationFocus=255,0,128
-DecorationHover=255,0,128
-ForegroundActive=255,0,128
-ForegroundInactive=224,224,224
-ForegroundLink=0,255,128
-ForegroundNegative=255,64,128
-ForegroundNeutral=0,255,128
-ForegroundNormal=240,240,240
-ForegroundPositive=0,255,128
-ForegroundVisited=0,255,128
-
-[Colors:View]
-BackgroundAlternate=13,13,13
-BackgroundNormal=24,24,24
-DecorationFocus=255,0,128
-DecorationHover=255,0,128
-ForegroundActive=255,0,128
-ForegroundInactive=224,224,224
-ForegroundLink=0,255,128
-ForegroundNegative=255,64,128
-ForegroundNeutral=0,255,128
-ForegroundNormal=240,240,240
-ForegroundPositive=0,255,128
-ForegroundVisited=0,255,128
-
-[Colors:Window]
-BackgroundAlternate=13,13,13
-BackgroundNormal=24,24,24
-DecorationFocus=255,0,128
-DecorationHover=255,0,128
-ForegroundActive=255,0,128
-ForegroundInactive=224,224,224
-ForegroundLink=0,255,128
-ForegroundNegative=255,64,128
-ForegroundNeutral=0,255,128
-ForegroundNormal=240,240,240
-ForegroundPositive=0,255,128
-ForegroundVisited=0,255,128
-
-[WM]
-activeBackground=13,13,13
-activeBlend=240,240,240
-activeForeground=240,240,240
-inactiveBackground=24,24,24
-inactiveBlend=224,224,224
-inactiveForeground=224,224,224

zsh/.omz-custom/aliases.zsh

@@ -15,3 +15,5 @@ alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg"
 #############
 
 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/cherry-merge.sh

@@ -14,7 +14,7 @@ if [ $MAIN_BRANCH == $TARGET_BRANCH ]; then
 fi
 
 echo "Target branch: $TARGET_BRANCH"
-sleep 2
+sleep 1
 
 git switch "$MAIN_BRANCH" || exit 1
 

zsh/.omz-custom/scripts/push-main-current.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+MAIN_BRANCH="main"
+TARGET_BRANCH=$(git branch --show-current)
+
+if [ -z $TARGET_BRANCH ]; then
+  echo "Cannot find target branch, are you in a git repo?"
+  exit 1
+fi
+
+if [ $MAIN_BRANCH == $TARGET_BRANCH ]; then
+  echo "You are on main, silly"
+  exit 1
+fi
+
+echo "Target branch: $TARGET_BRANCH"
+sleep 1
+
+git push origin "$MAIN_BRANCH" "$TARGET_BRANCH"

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