feat: drop moonlock and moonset
The power menu is a Quickshell popout in the moonarch config now, and it was the last caller of moonlock. Inputs, package entries and both build recipes are gone, together with the generated /etc configs and the moonlock PAM stack — swaylock's comes from programs.niri.enable.
This commit is contained in:
1 parent
ad4cd937f9
commit
f765a460b5
7 files changed
+31
-165
No files matched your search
+1
-23
@@ -66,18 +66,6 @@ in
|
||||
# stasis reads /etc/stasis/ as its system-wide fallback, never /etc/xdg/.
|
||||
"stasis/stasis.rune".source = "${xdg}/stasis/stasis.rune";
|
||||
|
||||
# moonlock and moonset fall back to /usr/share/moonarch/wallpaper.jpg,
|
||||
# which does not exist here, so the wallpaper is pointed at the store path
|
||||
# explicitly. Both read these files as their system-wide config.
|
||||
"moonlock/moonlock.toml".text = ''
|
||||
background_path = "${wallpaper}"
|
||||
'';
|
||||
# blur matches the value set in ~/.config/moonset/moonset.toml on Arch.
|
||||
"moonset/moonset.toml".text = ''
|
||||
background_path = "${wallpaper}"
|
||||
background_blur = 20.0
|
||||
'';
|
||||
|
||||
# Configs outside /etc/xdg/ in the Arch package as well.
|
||||
"mpv/mpv.conf".source = "${etc}/mpv/mpv.conf";
|
||||
"xdg-desktop-portal/niri-portals.conf".source =
|
||||
@@ -157,15 +145,11 @@ in
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Own programs
|
||||
moonarchPkgs.moonset
|
||||
moonarchPkgs.sweet-cursors
|
||||
moonarchPkgs.stasis
|
||||
moonarchPkgs.moonarch-scripts
|
||||
# Only still installed because moonset's Lock action invokes moonlock by
|
||||
# name and has no lock_command option. Idle and lid-close use swaylock.
|
||||
moonarchPkgs.moonlock
|
||||
|
||||
# Session lock
|
||||
# Session lock. The power menu is a Quickshell popout, not a package.
|
||||
swaylock
|
||||
|
||||
# Compositor extras
|
||||
@@ -244,10 +228,4 @@ in
|
||||
"C %h/.config/waypaper/config.ini 0644 - - - ${waypaperConfig}"
|
||||
"C %h/.config/swaylock/config 0644 - - - ${swaylockConfig}"
|
||||
];
|
||||
|
||||
# PAM stack for moonlock, shipped by the package but owned by the system.
|
||||
# swaylock needs none of this: programs.niri.enable brings
|
||||
# security.pam.services.swaylock with it. Goes away with moonlock.
|
||||
security.pam.services.moonlock.text =
|
||||
builtins.readFile "${moonarchPkgs.moonlock}/share/moonlock/moonlock-pam";
|
||||
}
|
||||
Reference in new issue
Block a user