From d6728c1c96eebf7351e49f23b0fe3268fe276c23 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 17 Nov 2026 23:12:53 -0500 Subject: [PATCH] bump to new quadshell --- flake.lock | 8 ++-- modules/{graphical => desktop/wm}/gtklock.nix | 2 +- modules/mobile/niri.nix | 41 ------------------- modules/mobile/phone.nix | 5 --- modules/mobile/quadshell.nix | 7 +++- 5 files changed, 10 insertions(+), 53 deletions(-) rename modules/{graphical => desktop/wm}/gtklock.nix (99%) diff --git a/flake.lock b/flake.lock index bcaabb4..955e643 100644 --- a/flake.lock +++ b/flake.lock @@ -1234,11 +1234,11 @@ ] }, "locked": { - "lastModified": 1794952294, - "narHash": "sha256-vRU0fxynA0W6KnH4eN4wp0FP1YWtU9jDhamrfNX7T3I=", + "lastModified": 1794964664, + "narHash": "sha256-SZAog68A9C0c3ymtmORtOIzm34o3nOhiR7QX06xEmTU=", "ref": "refs/heads/main", - "rev": "7f2794a630be74129ea6a4e9717d97378d1224ee", - "revCount": 1, + "rev": "b5e5ecf2f351806ee2215641ab30ea37d403afa0", + "revCount": 5, "type": "git", "url": "https://git.federated.nexus/Henry-Hiles/quadshell" }, diff --git a/modules/graphical/gtklock.nix b/modules/desktop/wm/gtklock.nix similarity index 99% rename from modules/graphical/gtklock.nix rename to modules/desktop/wm/gtklock.nix index ce08c25..85fecab 100644 --- a/modules/graphical/gtklock.nix +++ b/modules/desktop/wm/gtklock.nix @@ -10,7 +10,7 @@ let background = pkgs.runCommand "lock-background.jpg" { nativeBuildInputs = [ pkgs.buildPackages.imagemagick ]; } '' - magick ${../../background.jpg} -resize 50% -blur 0x16 -modulate 80 $out + magick ${../../../background.jpg} -resize 50% -blur 0x16 -modulate 80 $out ''; layout = pkgs.writeText "gtklock.ui" '' diff --git a/modules/mobile/niri.nix b/modules/mobile/niri.nix index 92958a5..8b0207d 100644 --- a/modules/mobile/niri.nix +++ b/modules/mobile/niri.nix @@ -34,7 +34,6 @@ let hypridleConfig = pkgs.writeText "hypridle.conf" '' general { - lock_cmd = ${config.quad.lock} before_sleep_cmd = loginctl lock-session } ''; @@ -44,43 +43,6 @@ let exec ${config.systemd.package}/bin/systemctl suspend ''; - swaync = pkgs.swaynotificationcenter; - - swayncStyle = pkgs.writeText "swaync.css" '' - @import url("file://${swaync}/etc/xdg/swaync/style.css"); - - :root { - --noti-bg-focus: transparent; - --noti-border-color: transparent; - --notification-shadow: none; - --border-radius: 16px; - --notification-icon-size: 48px; - --font-size-summary: 14px; - --font-size-body: 14px; - } - - .notification-row .notification-background .notification { - background: shade(@theme_bg_color, 1.25); - } - - .notification-row .notification-background .notification .notification-default-action .notification-content { - padding: 6px; - } - - .notification-row .notification-background .notification .notification-default-action .notification-content .text-box .body { - opacity: 0.8; - } - ''; - - swayncConfig = (pkgs.formats.json { }).generate "swaync.json" ( - lib.importJSON "${swaync}/etc/xdg/swaync/config.json" - // { - positionX = "center"; - positionY = "top"; - notification-window-width = 344; - ignore-gtk-theme = false; - } - ); in { nixpkgs.overlays = [ @@ -155,9 +117,6 @@ in spawn-at-startup "${lib.getExe pkgs.app-grid}" spawn-at-startup "${lib.getExe stevia}" spawn-at-startup "${lib.getExe' pkgs.swayosd "swayosd-server"}" "--style" "${swayosdStyle}" - spawn-at-startup "${lib.getExe' swaync "swaync"}" "--style" "${swayncStyle}" "--config" "${swayncConfig}" - // We log in automatically, so lock straight away. - spawn-at-startup "${config.quad.lock}" spawn-at-startup "${lib.getExe pkgs.hypridle}" "--config" "${hypridleConfig}" binds { diff --git a/modules/mobile/phone.nix b/modules/mobile/phone.nix index 80f0a50..951a477 100644 --- a/modules/mobile/phone.nix +++ b/modules/mobile/phone.nix @@ -15,11 +15,6 @@ networking.modemmanager.enable = true; - services = { - # Write logs out often, so a crash can be found. - journald.settings.Journal.SyncIntervalSec = "15s"; - geoclue2.enable = true; - }; users.users.geoclue.extraGroups = [ "networkmanager" ]; location.provider = "geoclue2"; } diff --git a/modules/mobile/quadshell.nix b/modules/mobile/quadshell.nix index b22795e..0b97460 100644 --- a/modules/mobile/quadshell.nix +++ b/modules/mobile/quadshell.nix @@ -7,8 +7,11 @@ { nixpkgs.overlays = [ inputs.quadshell.overlays.default ]; - # The flashlight LED's brightness is writable by this group - users.users.quadradical.extraGroups = [ "feedbackd" ]; + # quadshell is GeoClue's agent, for its location toggle + services.geoclue2 = { + enableDemoAgent = false; + whitelistedAgents = [ "quadshell" ]; + }; environment.etc."niri/config.kdl".text = '' spawn-at-startup "${lib.getExe pkgs.quadshell}"