Merge pull request #148 from ryanrhughes/wait-for-one-interface

Add override to only require one network interface online

applications/xtras/typora.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Typora
-GenericName=Markdown Editor
-Exec=typora --enable-wayland-ime %U
-Icon=typora
-Type=Application
-StartupNotify=true
-Categories=Office;WordProcessor;
-MimeType=text/markdown;text/x-markdown;
-

bin/omarchy-power-menu

@@ -15,7 +15,7 @@ show_power_menu() {
   case "$selection" in
   *Lock*) hyprlock ;;
   *Suspend*) systemctl suspend ;;
-  *Relaunch*) uwsm stop ;;
+  *Relaunch*) hyprctl dispatch exit ;;
   *Restart*) systemctl reboot ;;
   *Shutdown*) systemctl poweroff ;;
   esac

config/environment.d/fcitx.conf

@@ -1,4 +1,5 @@
 INPUT_METHOD=fcitx
+GTK_IM_MODULE=fcitx
 QT_IM_MODULE=fcitx
 XMODIFIERS=@im=fcitx
 SDL_IM_MODULE=fcitx

config/waybar/config

@@ -1,5 +1,4 @@
 {
-  "reload_style_on_change": true,
   "layer": "top",
     "position": "top",
     "spacing": 0,
@@ -11,7 +10,6 @@
       "clock"
     ],
     "modules-right": [
-    "group/tray-expander",
       "bluetooth",
       "network",
       "pulseaudio",
@@ -41,89 +39,6 @@
         "4": [],
         "5": []
       }
-  },
-  "cpu": {
-    "interval": 5,
-    "format": "󰍛",
-    "on-click": "alacritty -e btop"
-  },
-  "clock": {
-    "format": "{:%A %H:%M}",
-    "format-alt": "{:%d %B W%V %Y}",
-    "tooltip": false
-  },
-  "network": {
-    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
-    "format" : "{icon}",
-    "format-wifi" : "{icon}",
-    "format-ethernet" : "󰀂",
-    "format-disconnected" : "󰖪",
-    "tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
-    "tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
-    "tooltip-format-disconnected": "Disconnected",
-    "interval": 3,
-    "nospacing": 1,
-    "on-click": "alacritty --class=Impala -e impala"
-  },
-  "battery": {
-    "format": "{capacity}% {icon}",
-    "format-discharging": "{icon}",
-    "format-charging":    "{icon}",
-    "format-plugged":     "",
-    "format-icons": {
-      "charging": [
-        "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"
-      ],
-      "default": [
-        "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
-      ]
-    },
-    "format-full": "󰂅",
-    "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
-    "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
-    "interval": 5,
-    "states": {
-      "warning": 20,
-      "critical": 10
-    }
-  },
-  "bluetooth": {
-    "format": "",
-    "format-disabled": "󰂲",
-    "format-connected": "",
-    "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "GTK_THEME=Adwaita-dark blueberry"
-  },
-  "pulseaudio": {
-    "format": "{icon}",
-    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
-    "on-click-right": "pamixer -t",
-    "tooltip-format": "Playing at {volume}%",
-    "scroll-step": 5,
-    "format-muted": "󰝟",
-    "format-icons": {
-      "default": ["", "", ""]
-    }
-  },
-  "group/tray-expander": {
-    "orientation": "inherit",
-    "drawer": {
-      "transition-duration": 600,
-      "children-class": "tray-group-item"
-    },
-    "modules": [
-      "custom/expand-icon",
-    "tray"
-    ]
-  },
-  "custom/expand-icon": {
-    "format": " ",
-    "tooltip": false
-  },
-  "tray": {
-    "icon-size": 12,
-    "spacing": 12
-  }
     },
     "cpu": {
       "interval": 5,

config/waybar/style.css

@@ -17,7 +17,6 @@
 }
 
 #custom-dropbox,
-#tray,
 #cpu,
 #battery,
 #network,
@@ -29,10 +28,6 @@
   margin-right: 13px;
 }
 
-#custom-expand-icon {
-  margin-right: 12px;
-}
-
 tooltip {
   padding: 2px;
 }

default/hypr/looknfeel.conf

@@ -95,5 +95,5 @@ master {
 misc {
     disable_hyprland_logo = true
     disable_splash_rendering  = true
-    focus_on_activate = true
 }
+

default/plymouth/omarchy.script

@@ -20,7 +20,6 @@ global.fake_progress_active = 0; # 0 / 1 boolean
 global.animation_frame = 0;
 global.fake_progress_start_time = 0;  # Track when fake progress started
 global.password_shown = 0;  # Track if password dialog has been shown
-global.max_progress = 0.0;  # Track the maximum progress reached to prevent backwards movement
 
 fun refresh_callback ()
   {
@@ -56,17 +55,12 @@ Plymouth.SetRefreshFunction (refresh_callback);
 
 fun update_progress_bar(progress)
   {
-    # Only update if progress is moving forward
-    if (progress > global.max_progress)
-      {
-        global.max_progress = progress;
     width = Math.Int(progress_bar.original_image.GetWidth() * progress);
     if (width < 1) width = 1;  # Ensure minimum width of 1 pixel
     
     progress_bar.image = progress_bar.original_image.Scale(width, progress_bar.original_image.GetHeight());
     progress_bar.sprite.SetImage(progress_bar.image);
   }
-  }
 
 fun show_progress_bar()
   {
@@ -95,16 +89,12 @@ fun hide_password_dialog()
   }
 
 fun start_fake_progress()
-  {
-    # Don't reset if we already have progress
-    if (global.max_progress == 0.0)
   {
     global.fake_progress = 0.0;
     global.real_progress = 0.0;
-        update_progress_bar(0.0);
-      }
     global.fake_progress_active = 1;
     global.animation_frame = 0;
+    update_progress_bar(0.0);
   }
 
 fun stop_fake_progress()
@@ -159,12 +149,8 @@ fun display_password_callback (prompt, bullets)
   {
     global.password_shown = 1;  # Mark that password dialog has been shown
     
-    # Reset progress when password dialog appears
     stop_fake_progress();
     hide_progress_bar();
-    global.max_progress = 0.0;
-    global.fake_progress = 0.0;
-    global.real_progress = 0.0;
     show_password_dialog();
     
     # Clear all bullets first

install/4-config.sh

@@ -7,6 +7,14 @@ mkdir -p ~/.local/share/applications
 # Use default bashrc from Omarchy
 echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc
 
+# Login directly as user, rely on disk encryption + hyprlock for security
+sudo mkdir -p /etc/systemd/system/getty@tty1.service.d
+sudo tee /etc/systemd/system/getty@tty1.service.d/override.conf >/dev/null <<EOF
+[Service]
+ExecStart=
+ExecStart=-/usr/bin/agetty --autologin $USER --noclear %I \$TERM
+EOF
+
 # Set common git aliases
 git config --global alias.co checkout
 git config --global alias.br branch

install/hyprlandia.sh

@@ -2,3 +2,6 @@ yay -S --noconfirm --needed \
   hyprland hyprshot hyprpicker hyprlock hypridle polkit-gnome hyprland-qtutils \
   wofi waybar mako swaybg \
   xdg-desktop-portal-hyprland xdg-desktop-portal-gtk
+
+# Start Hyprland on first session
+echo "[[ -z \$DISPLAY && \$(tty) == /dev/tty1 ]] && exec Hyprland" >~/.bash_profile

install/login.sh

@@ -1,115 +0,0 @@
-#!/bin/bash
-# Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
-yay -S --noconfirm --needed uwsm
-
-# Compile the seamless login helper -- needed to prevent seeing terminal between loader and desktop
-cat <<'CCODE' >/tmp/seamless-login.c
-/*
- * Seamless Login - Minimal SDDM-style Plymouth transition
- * Replicates SDDM's VT management for seamless auto-login
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/kd.h>
-#include <linux/vt.h>
-#include <sys/wait.h>
-#include <string.h>
-
-int main(int argc, char *argv[]) {
-    int vt_fd;
-    int vt_num = 1; // TTY1
-    char vt_path[32];
-    
-    if (argc < 2) {
-        fprintf(stderr, "Usage: %s <session_command>\n", argv[0]);
-        return 1;
-    }
-    
-    // Open the VT (simple approach like SDDM)
-    snprintf(vt_path, sizeof(vt_path), "/dev/tty%d", vt_num);
-    vt_fd = open(vt_path, O_RDWR);
-    if (vt_fd < 0) {
-        perror("Failed to open VT");
-        return 1;
-    }
-    
-    // Activate the VT
-    if (ioctl(vt_fd, VT_ACTIVATE, vt_num) < 0) {
-        perror("VT_ACTIVATE failed");
-        close(vt_fd);
-        return 1;
-    }
-    
-    // Wait for VT to be active
-    if (ioctl(vt_fd, VT_WAITACTIVE, vt_num) < 0) {
-        perror("VT_WAITACTIVE failed");
-        close(vt_fd);
-        return 1;
-    }
-    
-    // Critical: Set graphics mode to prevent console text
-    if (ioctl(vt_fd, KDSETMODE, KD_GRAPHICS) < 0) {
-        perror("KDSETMODE KD_GRAPHICS failed");
-        close(vt_fd);
-        return 1;
-    }
-    
-    // Clear VT and close (like SDDM does)
-    const char *clear_seq = "\33[H\33[2J";
-    if (write(vt_fd, clear_seq, strlen(clear_seq)) < 0) {
-        perror("Failed to clear VT");
-    }
-    
-    close(vt_fd);
-    
-    // Set working directory to user's home
-    const char *home = getenv("HOME");
-    if (home) chdir(home);
-    
-    // Now execute the session command
-    execvp(argv[1], &argv[1]);
-    perror("Failed to exec session");
-    return 1;
-}
-CCODE
-
-gcc -o /tmp/seamless-login /tmp/seamless-login.c
-sudo mv /tmp/seamless-login /usr/local/bin/seamless-login
-sudo chmod +x /usr/local/bin/seamless-login
-rm /tmp/seamless-login.c
-
-cat <<EOF | sudo tee /etc/systemd/system/omarchy-seamless-login.service
-[Unit]
-Description=Omarchy Seamless Auto-Login
-Documentation=https://github.com/basecamp/omarchy
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
-PartOf=graphical.target
-
-[Service]
-Type=simple
-ExecStart=/usr/local/bin/seamless-login uwsm start -- hyprland.desktop
-Restart=always
-RestartSec=2
-User=$USER
-TTYPath=/dev/tty1
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-StandardInput=tty
-StandardOutput=journal
-StandardError=journal+console
-PAMName=login
-
-[Install]
-WantedBy=graphical.target
-EOF
-
-sudo systemctl daemon-reload
-sudo systemctl enable omarchy-seamless-login.service
-
-# Disable getty@tty1 to prevent conflicts
-sudo systemctl disable getty@tty1.service

install/network.sh

@@ -4,3 +4,13 @@ if ! command -v iwd &>/dev/null; then
   yay -S --noconfirm --needed iwd
   sudo systemctl enable --now iwd.service
 fi
+
+# Fix systemd-networkd-wait-online timeout for multiple interfaces
+# Wait for any interface to be online rather than all interfaces
+# https://wiki.archlinux.org/title/Systemd-networkd#Multiple_interfaces_that_are_not_connected_all_the_time
+sudo mkdir -p /etc/systemd/system/systemd-networkd-wait-online.service.d
+sudo tee /etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf >/dev/null <<EOF
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any
+EOF

migrations/.sh

@@ -1,4 +0,0 @@
-echo "Fix XCompose use in Typora"
-if command -v typora &>/dev/null; then
-  cp ~/.local/share/omarchy/applications/xtras/typora.desktop ~/.local/share/applications/
-fi

migrations/1752292967.sh

@@ -1,18 +0,0 @@
-echo "Update to use UWSM and seamless login"
-sudo rm /etc/systemd/system/getty@tty1.service.d/override.conf
-sudo rmdir /etc/systemd/system/getty@tty1.service.d/ 2>/dev/null || true
-
-if [ -f "$HOME/.bash_profile" ]; then
-  # Remove the specific line
-  sed -i '/^\[\[ -z \$DISPLAY && \$(tty) == \/dev\/tty1 \]\] && exec Hyprland$/d' "$HOME/.bash_profile"
-  echo "Cleaned up .bash_profile"
-fi
-
-if [ -f "$HOME/.config/environment.d/fcitx.conf" ]; then
-  echo "Removing GTK_IM_MODULE from fcitx config for Wayland..."
-  sed -i 's/^GTK_IM_MODULE=fcitx$//' "$HOME/.config/environment.d/fcitx.conf"
-fi
-
-omarchy-refresh-plymouth
-
-source ~/.local/share/omarchy/install/login.sh

migrations/1752365998.sh

@@ -0,0 +1,7 @@
+echo "Add override to only require one network interface to be online"
+sudo mkdir -p /etc/systemd/system/systemd-networkd-wait-online.service.d
+sudo tee /etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf >/dev/null <<EOF
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any
+EOF

themes/catppuccin/mako.ini

@@ -7,7 +7,6 @@ padding=10
 border-size=2
 font=Liberation Sans 11
 anchor=top-right
-outer-margin=20
 default-timeout=5000
 max-icon-size=32
 

themes/everforest/mako.ini

@@ -7,7 +7,6 @@ padding=10
 border-size=2
 font=Liberation Sans 11
 anchor=top-right
-outer-margin=20
 default-timeout=5000
 max-icon-size=32
 

themes/gruvbox/mako.ini

@@ -7,7 +7,6 @@ padding=10
 border-size=2
 font=Liberation Sans 11
 anchor=top-right
-outer-margin=20
 default-timeout=5000
 max-icon-size=32
 

themes/kanagawa/mako.ini

@@ -7,7 +7,6 @@ padding=10
 border-size=2
 font=Liberation Sans 11
 anchor=top-right
-outer-margin=20
 default-timeout=5000
 max-icon-size=32
 

themes/matte-black/hyprlock.conf

@@ -1,9 +1,10 @@
-$color = rgba(12,12,12,1.0)  # #333333 matte black
+$color = rgba(46,52,64,1.0)  # #2e3440 solid color
 
-$inner_color = rgba(138,138,141,0.3)  # #8a8a8d with opacity
+$inner_color = rgba(136,136,136,0.3)  #rgb(136, 136, 136) with opacity
-$outer_color = rgba(234,234,234,0.5)  # #EAEAEA
+$outer_color = rgba(216,222,233,0.5)  # #d8dee9
 
-$font_color = rgba(234,234,234,1.0)  # #EAEAEA
+$font_color = rgba(216,222,233,1.0)
+
+$placeholder_color = rgba(216,222,233,0.6)
+$check_color = rgba(136, 192, 208, 1.0)
 
-$placeholder_color = rgba(234,234,234,0.6)  # #EAEAEA with opacity
-$check_color = rgba(245,158,11,1.0)  # #f59e0b amber accent

themes/matte-black/mako.ini

@@ -1,21 +1,18 @@
 text-color=#8a8a8d
-border-color=#8A8A8D
 background-color=#1e1e1e
+border-radius=10
 width=420
 height=110
 padding=10
-border-size=2
+font=CaskaydiaMono Nerd Font
-font=Liberation Sans 11
+border-size=0
 anchor=top-right
-outer-margin=20
+default-timeout=3000
-default-timeout=5000
 max-icon-size=32
 
 [app-name=Spotify]
 invisible=1
 
-[mode=do-not-disturb]
+[urgency=high]
-invisible=true
+background-color=#660d0d
-
+text-color=#ffffff
-[mode=do-not-disturb app-name=notify-send]
-invisible=false

themes/nord/mako.ini

@@ -7,7 +7,6 @@ padding=10
 border-size=2
 font=Liberation Sans 11
 anchor=top-right
-outer-margin=20
 default-timeout=5000
 max-icon-size=32
 

themes/tokyo-night/mako.ini

@@ -7,7 +7,6 @@ padding=10
 border-size=2
 font=Liberation Sans 11
 anchor=top-right
-outer-margin=20
 default-timeout=5000
 max-icon-size=32