Changed file manager to thunar actually

.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

fastfetch/.config/fastfetch/config.jsonc

@@ -81,6 +81,7 @@
     "separator": " \uf061 ",
   },
   "logo": {
+    "type": "kitty",
     "source": "~/.config/fastfetch/logo.png",
     "width": 30,
     "padding": {

ghostty/.config/ghostty/config-dankcolors

@@ -1,22 +1,22 @@
-background = #191112
+background = #181818
-foreground = #f0dee0
+foreground = #f0f0f0
-cursor-color = #e91e63
+cursor-color = #ff0080
-selection-background = #4a0e2f
+selection-background = #cc0066
-selection-foreground = #f0dee0
+selection-foreground = #f0f0f0
 
-palette = 0=#191112
+palette = 0=#0D0D0D
-palette = 1=#d25e38
+palette = 1=#d45d39
-palette = 2=#6ed686
+palette = 2=#6ed684
-palette = 3=#cddb7b
+palette = 3=#cfdb7b
-palette = 4=#db5276
+palette = 4=#dd488d
-palette = 5=#d4587e
+palette = 5=#de478d
-palette = 6=#f32d6b
+palette = 6=#FF0080
 palette = 7=#abb2bf
 palette = 8=#5c6370
-palette = 9=#e07f5f
+palette = 9=#e07c5f
-palette = 10=#86e09a
+palette = 10=#86e098
-palette = 11=#dce897
+palette = 11=#dde897
-palette = 12=#ffb8c7
+palette = 12=#ffb7d2
-palette = 13=#bb5787
+palette = 13=#bc5097
-palette = 14=#b3606f
+palette = 14=#b45c7a
 palette = 15=#ffffff

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")]

hamr-sticker-picker/.config/hamr/.gitignore

@@ -0,0 +1 @@
+plugin-indexes.json

hamr-sticker-picker/.config/hamr/config.json

@@ -0,0 +1,89 @@
+{
+    "appearance": {
+        "backgroundTransparency": 0.2,
+        "contentTransparency": 0.2,
+        "fontScale": 1,
+        "launcherXRatio": 0.5,
+        "launcherYRatio": 0.1
+    },
+    "apps": {
+        "shell": "zsh",
+        "terminal": "ghostty",
+        "terminalArgs": "--class=floating.terminal"
+    },
+    "audio": {
+        "enabled": true
+    },
+    "behavior": {
+        "clickOutsideAction": "intuitive",
+        "stateRestoreWindowMs": 30000
+    },
+    "fonts": {
+        "icon": "Material Symbols Rounded",
+        "main": "Google Sans Flex",
+        "monospace": "JetBrains Mono NF",
+        "reading": "Readex Pro"
+    },
+    "imageBrowser": {
+        "cellAspectRatio": 1.333,
+        "columns": 4,
+        "sidebarWidth": 140,
+        "useSystemFileDialog": false
+    },
+    "paths": {
+        "colorsJson": "",
+        "wallpaperDir": ""
+    },
+    "search": {
+        "actionBarHintsJson": "[{\"prefix\":\"~\",\"icon\":\"folder\",\"label\":\"Files\",\"plugin\":\"files\"},{\"prefix\":\";\",\"icon\":\"content_paste\",\"label\":\"Clipboard\",\"plugin\":\"clipboard\"},{\"prefix\":\"/\",\"icon\":\"extension\",\"label\":\"Plugins\",\"plugin\":\"plugins\"},{\"prefix\":\"!\",\"icon\":\"terminal\",\"label\":\"Shell\",\"plugin\":\"shell\"},{\"prefix\":\"=\",\"icon\":\"calculate\",\"label\":\"Math\",\"plugin\":\"calculate\"},{\"prefix\":\":\",\"icon\":\"emoji_emotions\",\"label\":\"Emoji\",\"plugin\":\"emoji\"}]",
+        "actionKeys": [
+            "u",
+            "i",
+            "o",
+            "p"
+        ],
+        "debounceMs": 50,
+        "diversityDecay": 0.7,
+        "engineBaseUrl": "https://www.google.com/search?q=",
+        "excludedSites": [
+            "quora.com",
+            "facebook.com"
+        ],
+        "maxDisplayedResults": 16,
+        "maxHistoryItems": 500,
+        "maxRecentItems": 20,
+        "maxResultsPerPlugin": 0,
+        "nonAppResultDelay": 30,
+        "pluginDebounceMs": 150,
+        "prefix": {
+            "app": ">",
+            "clipboard": ";",
+            "emojis": ":",
+            "file": "~",
+            "math": "=",
+            "plugins": "/",
+            "shellCommand": "$",
+            "shellHistory": "!",
+            "webSearch": "?"
+        },
+        "shellHistory": {
+            "customHistoryPath": "",
+            "enable": true,
+            "maxEntries": 500,
+            "shell": "auto"
+        },
+        "shellHistoryLimit": 50
+    },
+    "sizes": {
+        "imageBrowserGridHeight": 600,
+        "imageBrowserGridWidth": 900,
+        "imageBrowserHeight": 690,
+        "imageBrowserWidth": 1200,
+        "maxResultsHeight": 600,
+        "resultIconSize": 40,
+        "searchInputHeight": 40,
+        "searchWidth": 580,
+        "windowPickerMaxHeight": 220,
+        "windowPickerMaxWidth": 350
+    }
+}

hyprland/.config/hypr/dms/.gitignore

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

install.sh

@@ -4,41 +4,31 @@ set -e
 
 DOTSDIR=$(pwd)
 
-#########################
-## gum style variables ##
-#########################
-
-# GUM_SPIN_SPINNER="minidot"
-# GUM_SPIN_SHOW_OUTPUT="true"
-
 sudo -v || exit 1
 
-####################
+#####################
-## Installing gum ##
+## Updating System ##
-####################
+#####################
 
-if ! command -v gum &>/dev/null; then
+sudo pacman -Syyu --noconfirm
-  echo "Installing gum"
+
-  sudo pacman -S --needed --noconfirm gum
+#############################
-fi
+## Installing dependencies ##
+#############################
+
+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
 
@@ -51,6 +41,7 @@ cd "$DOTSDIR"
 mapfile -t desktop < <(
   gum choose --header="Choose desktop configuration:" \
     "Niri" \
+    "Hyprland" \
     "KDE Plasma" \
     "None"
 )
@@ -61,11 +52,15 @@ mapfile -t tools < <(
     "Terminal Emulator" \
     "Gaming" \
     "VR Gaming" \
-    "Hamr Sticker Picker"
+    "Hamr Sticker Picker" \
+    "CUPS Printing Support" \
+    "Audio" \
+    "Bluetooth"
 )
 
 mapfile -t extratools < <(
   gum choose --header="Choose extra tools to install:" --no-limit \
+    "General fonts" \
     "Godot" \
     "Btop" \
     "Fuzzel" \
@@ -74,29 +69,24 @@ mapfile -t extratools < <(
     "Vesktop" \
     "Nextcloud" \
     "Zen Browser" \
-    "Tailscale"
+    "Tailscale" \
+    "Global git config" \
+    "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 \
+      thunar \
       gnome-keyring \
       brightnessctl \
       cava \
@@ -104,31 +94,85 @@ for choice in "${desktop[@]}"; do
       power-profiles-daemon \
       qt6ct-kde \
       xdg-desktop-portal-gnome \
-      quickshell \
+      xdg-desktop-portal-gtk \
-      cava \
+      xdg-desktop-portal-wlr \
+      quickshell-git \
       cliphist \
       wl-clipboard \
       dgop \
       matugen-bin \
       qt6-multimedia \
       dms-shell-bin \
-      greetd-dms-greeter-git
+      xwayland-satellite \
+      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
+    xdg-mime default thunar.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 niri.service dms
+    systemctl --user add-wants niri.service gnome-keyring-daemon.service
 
-    dms greeter enable
+    # dms greeter enable
-    dms greeter sync
+    # dms greeter sync
-    # sudo systemctl enable ly@tty1
+    sudo systemctl enable ly@tty1
     ;;
+  "Hyprland")
+    sudo -v || exit 1
+    yay -S --needed --noconfirm \
+      hyprland \
+      uwsm \
+      thunar \
+      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
 
+    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 thunar.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
     ;;
@@ -139,7 +183,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 \
@@ -153,10 +196,12 @@ for choice in "${tools[@]}"; do
       wl-clipboard \
       zoxide \
       reflector \
-      inetutils
+      inetutils \
+      imagemagick \
+      tree
+
     stow fastfetch hyfetch nvim zsh --adopt
 
-    # gum spin --title "Updating Tealdeer database" -- \
     tldr --update
 
     chsh -s /bin/zsh "$USER"
@@ -164,7 +209,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
@@ -172,33 +216,39 @@ for choice in "${tools[@]}"; do
 
   "Gaming")
     sudo -v || exit 1
-    # gum spin --title "Installing Gaming Packages..." -- \
     yay -S --needed --noconfirm \
       mangohud \
       gamemode \
       steam \
       prismlauncher \
       heroic-games-launcher-bin \
-      arrpc
+      arrpc \
+      umu-launcher \
+      wine \
+      protontricks \
+      protonup-qt \
+      protonplus \
+      goverlay \
+      vkbasalt \
+      vulkan-tools
+
     stow mangohud --adopt
 
     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 cp /usr/lib/systemd/user/arrpc.service /etc/systemd/system/arrpc.service
-      sudo systemctl enable arrpc --now
+    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 \
-      wlx-overlay-s-bin
+      wayvr
     ;;
 
   "Hamr Sticker Picker")
     sudo -v || exit 1
-    # gum spin --title "Installing hamr..." -- \
     yay -S --needed --noconfirm \
       hamr
 
@@ -208,6 +258,29 @@ for choice in "${tools[@]}"; do
     systemctl --user add-wants niri.service hamr.service
     systemctl --user start hamr.service
     ;;
+  "CUPS Printing Support")
+    sudo -v || exit 1
+    yay -S --needed --noconfirm \
+      cups
+
+    sudo systemctl enable cups
+    ;;
+  "Audio")
+    sudo -v || exit 1
+    yay -S --needed --noconfirm \
+      pipewire \
+      pipewire-pulse \
+      wireplumber
+
+    systemctl --user enable --now pipewire pipewire-pulse wireplumber
+    ;;
+  "Bluetooth")
+    sudo -v || exit 1
+    yay -S --needed --noconfirm \
+      bluez
+
+    sudo systemctl enable bluetooth --now
+    ;;
   esac
 done
 
@@ -215,6 +288,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
@@ -232,9 +308,41 @@ for choice in "${extratools[@]}"; do
   "Nextcloud") extrapkgs+=("nextcloud-client") ;;
   "Zen Browser") extrapkgs+=("zen-browser-bin") ;;
   "Tailscale") extrapkgs+=("tailscale") ;;
+  "Global git config")
+    git config --global init.defaultBranch main
+
+    if [ "$USER" = "vivian" ]; then
+      echo "-=[ WARNING ]=-"
+      echo "Because your username equals \"vivian\", your git user.name and user.email will be set to mine, please revert this change if you are not me."
+      echo "Your old values will be written to ~/.dots-gitbackup"
+
+      {
+        echo "user.name"
+        git config --global user.name
+        echo ""
+        echo "user.email"
+        git config --global user.email
+      } >"$HOME"/.dots-gitbackup
+
+      git remote remove origin
+      git remote add origin ssh://git@gitea.sparkle.gay:9173/vivian/.dotfiles.git
+      git config --global user.name "Vivian Elisabeth H"
+      git config --global user.email "36878099+SparkleDEV@users.noreply.github.com"
+    fi
+    ;;
+  "MPV")
+    extrapkgs+=("mpv" "yt-dlp")
+    stow mpv --adopt
+    ;;
   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[*]}"
@@ -245,3 +353,7 @@ yay -S --needed --noconfirm $extpkgstr
 
 git add .
 git reset --hard HEAD
+git submodule update --recursive --init
+
+echo "-=[ DOTFILES INSTALLED ]=-"
+echo "You probably want to reboot"

mpv/.config/mpv/mpv.conf

@@ -0,0 +1,17 @@
+# -=[ Video ]=- #
+profile=high-quality
+vo=gpu-next
+
+# -=[ Behavior ]=- #
+keep-open=yes
+cursor-autohide=250
+
+# -=[ Screenshots ]=- #
+screenshot-format=png
+screenshot-dir="~/Pictures/mpv"
+screenshot-template="%F-%p-%n"
+screenshot-high-bit-depth=yes
+
+# -=[ OSC ]=- #
+osc=no
+border=no

niri/.config/niri/config.kdl

@@ -5,38 +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
-}
-
 
 gestures {
     hot-corners {
@@ -55,8 +23,11 @@ input {
     }
     touchpad {
       natural-scroll
+      // accel-profile "flat"
     }
     mouse {
+      accel-profile "flat"
+      accel-speed 0.5
     }
     trackpoint {
     }
@@ -222,20 +193,38 @@ window-rule {
     match app-id="kitty"
     draw-border-with-background false
 }
+// window-rule {
+//     match is-active=false
+//     opacity 0.9
+// }
 window-rule {
-    match is-active=false
+    match app-id="zen" title="^Picture-in-Picture$"
-    opacity 0.9
-}
-window-rule {
     match app-id=r#"firefox$"# title="^Picture-in-Picture$"
     match app-id="zoom"
     open-floating true
+    opacity 1.0
 }
 // Open dms windows as floating by default
 window-rule {
     match app-id=r#"org.quickshell$"#
     open-floating false
 }
+
+// Custom window rules
+window-rule {
+  match app-id="vesktop"
+  match app-id="Ferdium"
+
+  open-on-output "DP-1"
+  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
 }
@@ -255,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/binds.kdl

@@ -1,5 +1,5 @@
 binds {
-    Mod+E repeat=false { spawn "nautilus"; }
+    Mod+E repeat=false { spawn "thunar"; }
     
     xF86AudioPlay {
      spawn-sh "dms ipc call mpris playPause";
@@ -51,10 +51,10 @@ binds {
 
     // === Audio Controls ===
     XF86AudioRaiseVolume allow-when-locked=true {
-        spawn "dms" "ipc" "call" "audio" "increment" "3";
+        spawn "dms" "ipc" "call" "audio" "increment" "5";
     }
     XF86AudioLowerVolume allow-when-locked=true {
-        spawn "dms" "ipc" "call" "audio" "decrement" "3";
+        spawn "dms" "ipc" "call" "audio" "decrement" "5";
     }
     XF86AudioMute allow-when-locked=true {
         spawn "dms" "ipc" "call" "audio" "mute";

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

@@ -1,36 +0,0 @@
-layout {
-    background-color "transparent"
-
-    focus-ring {
-        active-color   "#e91e63"
-        inactive-color "#9f8c8e"
-        urgent-color   "#f2b8b5"
-    }
-
-    border {
-        active-color   "#e91e63"
-        inactive-color "#9f8c8e"
-        urgent-color   "#f2b8b5"
-    }
-
-    shadow {
-        color "#00000070"
-    }
-
-    tab-indicator {
-        active-color   "#e91e63"
-        inactive-color "#9f8c8e"
-        urgent-color   "#f2b8b5"
-    }
-
-    insert-hint {
-        color "#e91e6380"
-    }
-}
-
-recent-windows {
-    highlight {
-        active-color   "#4a0e2f"
-        urgent-color   "#f2b8b5"
-    }
-}

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
-}

niri/.config/niri/themes/hotline.json

@@ -0,0 +1,42 @@
+{
+  "dark": {
+    "name": "Hotline Miami Dark",
+    "primary": "#FF0080",
+    "primaryText": "#FFFFFF",
+    "primaryContainer": "#CC0066",
+    "secondary": "#00FF80",
+    "surface": "#0D0D0D",
+    "surfaceText": "#F0F0F0",
+    "surfaceVariant": "#1A0F1A",
+    "surfaceVariantText": "#E0E0E0",
+    "surfaceTint": "#FF0080",
+    "background": "#181818",
+    "backgroundText": "#FFFFFF",
+    "outline": "#8000FF",
+    "surfaceContainer": "#1A0D1A",
+    "surfaceContainerHigh": "#260F26",
+    "error": "#FF4080",
+    "warning": "#FFFF00",
+    "info": "#00FF80"
+  },
+  "light": {
+    "name": "Hotline Miami Light",
+    "primary": "#CC0066",
+    "primaryText": "#FFFFFF",
+    "primaryContainer": "#FF80B3",
+    "secondary": "#00CC66",
+    "surface": "#FFF0FF",
+    "surfaceText": "#1A0F1A",
+    "surfaceVariant": "#F0E6F0",
+    "surfaceVariantText": "#2D1A2D",
+    "surfaceTint": "#CC0066",
+    "background": "#FFFFFF",
+    "backgroundText": "#0D0D0D",
+    "outline": "#6600CC",
+    "surfaceContainer": "#F5F0F5",
+    "surfaceContainerHigh": "#EBE0EB",
+    "error": "#B30040",
+    "warning": "#B3B300",
+    "info": "#00B359"
+  }
+}

nvim/.config/nvim/.gitignore

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

nvim/.config/nvim/lazy-lock.json

@@ -1,50 +0,0 @@
-{
-  "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
-  "LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "10e90771990622daec50d14ef3e278f429b9419f" },
-  "alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" },
-  "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "ce8d176faa4643e026e597ae3c31db59b63cef09" },
-  "conform.nvim": { "branch": "master", "commit": "9b8fa5e0b78168f68bee9bf886dc20f287c61e02" },
-  "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
-  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
-  "grug-far.nvim": { "branch": "main", "commit": "b58b2d65863f4ebad88b10a1ddd519e5380466e0" },
-  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "3b3571b4dadbcb464804466e9872e7246c316af7" },
-  "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
-  "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
-  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
-  "mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" },
-  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-jdtls": { "branch": "master", "commit": "f73731b543f5971e0da9665eb1d7ceffe1fde71f" },
-  "nvim-lint": { "branch": "master", "commit": "c47b71d146a0b638f46672e6704c322369385df6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "0d7d33e40f0c27f57cb29654ed78cab17d705e68" },
-  "nvim-treesitter": { "branch": "main", "commit": "d3218d988f72ed34414959c9ccd802d393432d6e" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "0d7c800fadcfe2d33089f5726cb8907fc846eece" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
-  "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "render-markdown.nvim": { "branch": "main", "commit": "07d088bf8bdadd159eb807b90eaee86a4778383f" },
-  "rustaceanvim": { "branch": "master", "commit": "823d2adfed6e8ba13e6e0dfd5d2e278868557017" },
-  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
-  "telescope.nvim": { "branch": "master", "commit": "3d757e586ff0bfc85bdb7b46c9d3d932147a0cde" },
-  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
-  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
-  "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
-  "venv-selector.nvim": { "branch": "main", "commit": "58bae72c84b9f7f864c879ec1896e384296f9ffb" },
-  "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" },
-  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
-}

nvim/.config/nvim/lazyvim.json

@@ -18,7 +18,8 @@
     "lazyvim.plugins.extras.lang.yaml",
     "lazyvim.plugins.extras.linting.eslint",
     "lazyvim.plugins.extras.ui.alpha",
-    "lazyvim.plugins.extras.util.dot"
+    "lazyvim.plugins.extras.util.dot",
+    "lazyvim.plugins.extras.util.mini-hipatterns"
   ],
   "install_version": 8,
   "news": {

nvim/.config/nvim/lua/plugins/theme-cuddlefish.lua

@@ -0,0 +1,27 @@
+-- lazy.nvim
+return {
+	"comfysage/cuddlefish.nvim",
+	config = function()
+		require("cuddlefish").setup({
+			theme = {
+				accent = "pink",
+			},
+			editor = {
+				transparent_background = false,
+			},
+			style = {
+				tabline = { "reverse" },
+				search = { "italic", "reverse" },
+				incsearch = { "italic", "reverse" },
+				types = { "italic" },
+				keyword = { "italic" },
+				comment = { "italic" },
+			},
+			overrides = function(colors)
+				return {}
+			end,
+		})
+
+		vim.cmd.colorscheme([[cuddlefish]])
+	end,
+}

nvim/.config/nvim/lua/plugins/theme-cyberdream.lua

@@ -0,0 +1,5 @@
+return {
+	"scottmckendry/cyberdream.nvim",
+	lazy = false,
+	priority = 1000,
+}

packages.txt

@@ -1,35 +0,0 @@
-arrpc
-brightnessctl
-btop
-candy-icons-git
-cava
-cliphist
-dms-shell
-eza
-fastfetch
-fuzzel
-fzf
-ghostty
-git
-gnome-keyring
-hyfetch
-kvantum
-matugen-bin
-nautilus
-ncdu
-neovim
-oh-my-posh
-otf-linja-pona
-power-profiles-daemon
-qt6ct-kde
-reflector
-tealdeer
-ttf-sourcecodepro-nerd
-vesktop
-vim
-wl-clipboard
-xdg-desktop-portal-gnome
-xdg-desktop-portal-gtk
-xwayland-satellite
-zoxide
-zsh

qt6ct/.config/qt6ct/colors/.gitignore

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

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

@@ -1,144 +0,0 @@
-[ColorScheme]
-active_colors=#f0dee0, #191112, #261d1e, #9f8c8e, #524345, #524345, #f0dee0, #000000, #f0dee0, #191112, #191112, #000000, #e91e63, #000000, #f8bbd9, #f8bbd9, #191112, #191112, #191112, #d6c2c3, #d6c2c3
-disabled_colors=#d6c2c3, #524345, #261d1e, #9f8c8e, #524345, #524345, #d6c2c3, #d6c2c3, #d6c2c3, #524345, #524345, #000000, #524345, #d6c2c3, #d6c2c3, #d6c2c3, #524345, #524345, #524345, #d6c2c3, #d6c2c3
-inactive_colors=#d6c2c3, #191112, #261d1e, #9f8c8e, #524345, #524345, #d6c2c3, #d6c2c3, #d6c2c3, #191112, #191112, #000000, #f8bbd9, #000000, #f8bbd9, #f8bbd9, #191112, #191112, #191112, #d6c2c3, #d6c2c3
-
-[ColorEffects:Disabled]
-Color=214,194,195
-ColorAmount=0
-ColorEffect=0
-ContrastAmount=0.65
-ContrastEffect=1
-IntensityAmount=0.1
-IntensityEffect=2
-
-[ColorEffects:Inactive]
-ChangeSelectionColor=true
-Color=159,140,142
-ColorAmount=0.025
-ColorEffect=2
-ContrastAmount=0.1
-ContrastEffect=2
-Enable=false
-IntensityAmount=0
-IntensityEffect=0
-
-[Colors:Button]
-BackgroundAlternate=38,29,30
-BackgroundNormal=25,17,18
-DecorationFocus=233,30,99
-DecorationHover=233,30,99
-ForegroundActive=233,30,99
-ForegroundInactive=214,194,195
-ForegroundLink=248,187,217
-ForegroundNegative=242,184,181
-ForegroundNeutral=248,187,217
-ForegroundNormal=240,222,224
-ForegroundPositive=248,187,217
-ForegroundVisited=248,187,217
-
-[Colors:Complementary]
-BackgroundAlternate=38,29,30
-BackgroundNormal=25,17,18
-DecorationFocus=233,30,99
-DecorationHover=233,30,99
-ForegroundActive=233,30,99
-ForegroundInactive=214,194,195
-ForegroundLink=248,187,217
-ForegroundNegative=242,184,181
-ForegroundNeutral=248,187,217
-ForegroundNormal=240,222,224
-ForegroundPositive=248,187,217
-ForegroundVisited=248,187,217
-
-[Colors:Header]
-BackgroundAlternate=25,17,18
-BackgroundNormal=25,17,18
-DecorationFocus=233,30,99
-DecorationHover=233,30,99
-ForegroundActive=233,30,99
-ForegroundInactive=214,194,195
-ForegroundLink=248,187,217
-ForegroundNegative=242,184,181
-ForegroundNeutral=248,187,217
-ForegroundNormal=240,222,224
-ForegroundPositive=248,187,217
-ForegroundVisited=248,187,217
-
-[Colors:Header][Inactive]
-BackgroundAlternate=25,17,18
-BackgroundNormal=25,17,18
-DecorationFocus=233,30,99
-DecorationHover=233,30,99
-ForegroundActive=233,30,99
-ForegroundInactive=214,194,195
-ForegroundLink=248,187,217
-ForegroundNegative=242,184,181
-ForegroundNeutral=248,187,217
-ForegroundNormal=240,222,224
-ForegroundPositive=248,187,217
-ForegroundVisited=248,187,217
-
-[Colors:Selection]
-BackgroundAlternate=74,14,47
-BackgroundNormal=233,30,99
-DecorationFocus=233,30,99
-DecorationHover=233,30,99
-ForegroundActive=0,0,0
-ForegroundInactive=214,194,195
-ForegroundLink=248,187,217
-ForegroundNegative=242,184,181
-ForegroundNeutral=248,187,217
-ForegroundNormal=0,0,0
-ForegroundPositive=248,187,217
-ForegroundVisited=248,187,217
-
-[Colors:Tooltip]
-BackgroundAlternate=25,17,18
-BackgroundNormal=25,17,18
-DecorationFocus=233,30,99
-DecorationHover=233,30,99
-ForegroundActive=233,30,99
-ForegroundInactive=214,194,195
-ForegroundLink=248,187,217
-ForegroundNegative=242,184,181
-ForegroundNeutral=248,187,217
-ForegroundNormal=240,222,224
-ForegroundPositive=248,187,217
-ForegroundVisited=248,187,217
-
-[Colors:View]
-BackgroundAlternate=25,17,18
-BackgroundNormal=25,17,18
-DecorationFocus=233,30,99
-DecorationHover=233,30,99
-ForegroundActive=233,30,99
-ForegroundInactive=214,194,195
-ForegroundLink=248,187,217
-ForegroundNegative=242,184,181
-ForegroundNeutral=248,187,217
-ForegroundNormal=240,222,224
-ForegroundPositive=248,187,217
-ForegroundVisited=248,187,217
-
-[Colors:Window]
-BackgroundAlternate=25,17,18
-BackgroundNormal=25,17,18
-DecorationFocus=233,30,99
-DecorationHover=233,30,99
-ForegroundActive=233,30,99
-ForegroundInactive=214,194,195
-ForegroundLink=248,187,217
-ForegroundNegative=242,184,181
-ForegroundNeutral=248,187,217
-ForegroundNormal=240,222,224
-ForegroundPositive=248,187,217
-ForegroundVisited=248,187,217
-
-[WM]
-activeBackground=25,17,18
-activeBlend=240,222,224
-activeForeground=240,222,224
-inactiveBackground=25,17,18
-inactiveBlend=214,194,195
-inactiveForeground=214,194,195

qt6ct/.config/qt6ct/qt6ct.conf

@@ -2,8 +2,8 @@
 color_scheme_path=/home/vivian/.local/share/color-schemes/DankMatugen.colors
 custom_palette=true
 icon_theme=candy-icons
-standard_dialogs=kde
+standard_dialogs=default
-style=kvantum-dark
+style=Fusion
 
 [Fonts]
 fixed="Sans Serif,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"

setup.sh

@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-DOTFILES_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-
-if ! command -v yay &>/dev/null; then
-  echo "Installing yay"
-  sudo pacman -S base-devel git --needed --noconfirm
-
-  TEMP_DIR=$(mktemp -d)
-
-  git clone https://aur.archlinux.org/yay-bin.git $TEMP_DIR/yay-bin
-  cd $TEMP_DIR/yay-bin
-
-  makepkg -si --noconfirm
-fi
-
-echo "Installing packages"
-sudo -v || exit 1
-yay -S --noconfirm --needed - <$DOTFILES_DIR/packages.txt
-
-echo "Changing default shell"
-sudo chsh -s /bin/zsh $USER
-
-echo "Setting nautilus as default file manager"
-xdg-mime default org.gnome.nautilus.desktop inode/directory
-
-echo "Setting default git branch to \"main\""
-git config --global init.defaultBranch main
-
-echo "Applying arrpc fix"
-sudo cp /usr/lib/systemd/user/arrpc.service /etc/systemd/system/arrpc.service
-sudo systemctl enable arrpc --now
-
-echo "Applying stow"
-cd $DOTFILES_DIR
-stow fastfetch fuzzel ghostty godot hyfetch kvantum mangohud niri nvim qt6ct zsh

zsh/.omz-custom/aliases.zsh

@@ -9,3 +9,11 @@ alias girlboss="sudo"
 alias vialias="nvim $HOME/.oh-my-zsh/custom/aliases.zsh"
 
 alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg"
+
+#############
+## Scripts ##
+#############
+
+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

@@ -0,0 +1,25 @@
+#!/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 cant merge main into main, silly"
+  exit 1
+fi
+
+echo "Target branch: $TARGET_BRANCH"
+sleep 1
+
+git switch "$MAIN_BRANCH" || exit 1
+
+git cherry-pick "$TARGET_BRANCH" || exit 1
+
+git switch "$TARGET_BRANCH" || exit 1
+
+git merge "$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