Revert "desktop: swaylock -> gtklock (#89)"

This reverts commit 62f2d5b1d0.

homeManagerModules/apps/default.nix

@@ -7,7 +7,6 @@
     ./fastfetch
     ./firefox
     ./fuzzel
-    ./gtklock
     ./helix
     ./keepassxc
     ./kitty

homeManagerModules/apps/gtklock/default.nix

@@ -1,43 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  cfg = config.ar.home;
-in {
-  config = lib.mkIf cfg.apps.gtklock.enable {
-    home.packages = with pkgs; [
-      gtklock
-    ];
-
-    xdg.configFile = {
-      "gtklock/config.ini".text = ''
-        [main]
-        gtk-theme=adw-gtk3-dark
-        time-format=%I:%M%p
-      '';
-
-      "gtklock/style.css".text = ''
-        window {
-           background-image: url("${cfg.theme.wallpaper}");
-           background-size: cover;
-           background-repeat: no-repeat;
-           background-position: center;
-           background-color: black;
-        }
-
-        #clock-label {
-          margin-bottom: 50px;
-          font-size: 700%;
-          font-weight: bold;
-          color: ${cfg.theme.colors.text};
-        }
-
-        #input-label {
-          color: ${cfg.theme.colors.text};
-        }
-      '';
-    };
-  };
-}

homeManagerModules/desktop/hyprland/settings.nix

@@ -27,7 +27,7 @@ in {
 
   bind =
     [
-      "$mod CTRL,L,exec,${lib.getExe pkgs.gtklock}"
+      "$mod CTRL,L,exec,${lib.getExe pkgs.swaylock}"
       "$mod SHIFT,G,togglegroup"
       "$mod SHIFT,R,exec,${lib.getExe config.programs.rofi.package} -show run"
       "$mod SHIFT,S,movetoworkspace,special:magic"

homeManagerModules/desktop/sway/settings.nix

@@ -95,7 +95,7 @@ in {
         "${modifier}+B" = "exec ${lib.getExe cfg.defaultApps.webBrowser}";
         "${modifier}+C" = "kill";
         "${modifier}+Comma" = "workspace prev";
-        "${modifier}+Control+L" = "exec ${lib.getExe pkgs.gtklock}";
+        "${modifier}+Control+L" = "exec ${lib.getExe pkgs.swaylock}";
         "${modifier}+E" = "exec ${lib.getExe cfg.defaultApps.editor}";
         "${modifier}+F" = "exec ${lib.getExe cfg.defaultApps.fileManager}";
         "${modifier}+F11" = "exec pkill -SIGUSR1 waybar"; # Show/hide waybar

homeManagerModules/desktop/wayland/default.nix

@@ -9,7 +9,7 @@
       apps = {
         kitty.enable = lib.mkDefault true;
         rofi.enable = lib.mkDefault true;
-        gtklock.enable = lib.mkDefault true;
+        swaylock.enable = lib.mkDefault true;
       };
 
       services = {

homeManagerModules/options.nix

@@ -36,7 +36,6 @@ in {
       fastfetch.enable = lib.mkEnableOption "Fastfetch.";
       firefox.enable = lib.mkEnableOption "Firefox web browser.";
       fuzzel.enable = lib.mkEnableOption "Fuzzel app launcher.";
-      gtklock.enable = lib.mkEnableOption "GTK lockscreen based on gtkgreet.";
       helix.enable = lib.mkEnableOption "Helix text editor.";
 
       keepassxc = {

homeManagerModules/services/swayidle/default.nix

@@ -19,11 +19,11 @@ in {
         }
         {
           event = "before-sleep";
-          command = "${lib.getExe pkgs.gtklock} && ${lib.getExe' pkgs.coreutils "sleep"} 2";
+          command = "${lib.getExe pkgs.swaylock} && ${lib.getExe' pkgs.coreutils "sleep"} 2";
         }
         {
           event = "lock";
-          command = "${lib.getExe pkgs.gtklock}";
+          command = "${lib.getExe pkgs.swaylock}";
         }
       ];
 
@@ -42,7 +42,7 @@ in {
         ++ lib.optional (!cfg.desktop.autoSuspend)
         {
           timeout = 600;
-          command = "${lib.getExe pkgs.gtklock}";
+          command = "${lib.getExe pkgs.swaylock}";
         }
         ++ lib.optional (!cfg.desktop.autoSuspend && cfg.desktop.hyprland.enable)
         {

nixosModules/desktop/waylandComp.nix

@@ -5,7 +5,9 @@
   ...
 }: {
   config = lib.mkIf (config.ar.desktop.hyprland.enable || config.ar.desktop.sway.enable) {
-    programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
+    programs = {
+      gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
+    };
 
     services = {
       dbus.packages = [pkgs.gcr];
@@ -13,13 +15,14 @@
       udev.packages = [pkgs.swayosd];
     };
 
-    security.pam.services = let
+    security.pam.services = {
+      swaylock = {
         text = ''
           # Account management.
           account required pam_unix.so # unix (order 10900)
 
           # Authentication management.
-        auth sufficient pam_unix.so likeauth try_first_pass nullok # unix (order 11500)
+          auth sufficient pam_unix.so likeauth try_first_pass likeauth nullok # unix (order 11500)
           ${
             lib.strings.optionalString config.services.fprintd.enable
             "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so # fprintd (order 11300)"
@@ -34,9 +37,7 @@
           session required pam_env.so conffile=/etc/pam/environment readenv=0 # env (order 10100)
           session required pam_unix.so # unix (order 10200)
         '';
-    in {
+      };
-      gtklock = {inherit text;};
-      swaylock = {inherit text;};
     };
   };
 }