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,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"
 )
@@ -82,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 \
@@ -111,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 \
@@ -129,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
@@ -140,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
     ;;
@@ -154,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 \
@@ -172,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"
@@ -184,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
@@ -192,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 \
@@ -212,22 +232,19 @@ 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 \
-      wlx-overlay-s-bin
+      wayvr
     ;;
 
   "Hamr Sticker Picker")
     sudo -v || exit 1
-    # gum spin --title "Installing hamr..." -- \
     yay -S --needed --noconfirm \
       hamr
 
@@ -313,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,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 {
@@ -58,7 +26,8 @@ input {
       // accel-profile "flat"
     }
     mouse {
-      // accel-profile "flat"
+      accel-profile "flat"
+      accel-speed 0.5
     }
     trackpoint {
     }
@@ -224,10 +193,10 @@ window-rule {
     match app-id="kitty"
     draw-border-with-background false
 }
-window-rule {
+// window-rule {
-    match is-active=false
+//     match is-active=false
-    opacity 0.9
+//     opacity 0.9
-}
+// }
 window-rule {
     match app-id="zen" title="^Picture-in-Picture$"
     match app-id=r#"firefox$"# title="^Picture-in-Picture$"
@@ -240,6 +209,22 @@ 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
 }
@@ -259,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

@@ -0,0 +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")

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

@@ -1,53 +0,0 @@
-{
-  "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
-  "LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "f35b7747d4d536fba96aa098a4144e5c85252828" },
-  "alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" },
-  "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
-  "conform.nvim": { "branch": "master", "commit": "8314f4c9e205e7f30b62147069729f9a1227d8bf" },
-  "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
-  "cuddlefish.nvim": { "branch": "main", "commit": "8381e244350e03b702422da97587d027ea1708fb" },
-  "cyberdream.nvim": { "branch": "main", "commit": "7464438b099c0ebcd42c4b6dd9abbd6ed93cb7f8" },
-  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" },
-  "grug-far.nvim": { "branch": "main", "commit": "794f03c97afc7f4b03fb6ec5111be507df1850cf" },
-  "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": "fe661093f4b05136437b531e7f959af2a2ae66c8" },
-  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
-  "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
-  "mini.hipatterns": { "branch": "main", "commit": "add8d8abad602787377ec5d81f6b248605828e0f" },
-  "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" },
-  "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": "ca6ea12daf0a4d92dc24c5c9ae22a1f0418ade37" },
-  "nvim-lspconfig": { "branch": "master", "commit": "92ee7d42320edfbb81f3cad851314ab197fa324a" },
-  "nvim-treesitter": { "branch": "main", "commit": "5a7e5638e7d220575b1c22c8a2e099b52231886e" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "28a3494c075ef0f353314f627546537e43c09592" },
-  "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": "73a6ebc842cf81926eb1d424820b800f6f6a1227" },
-  "rustaceanvim": { "branch": "master", "commit": "4e9e40432b21df641f08c4ec058f2d6f89365526" },
-  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
-  "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" },
-  "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": "6d1d41da4873a445c5605f2005ad2c68c99d8770" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" },
-  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
-}

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