big refactoring

home/services/betterlockscreen/default.nix

@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  services.betterlockscreen = {
-    enable = true;
-    arguments = [ "blur" ];
-    inactiveInterval = 30;
-  };
-}

home/services/default-laptop.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [ ./default.nix ./betterlockscreen ];
-}

home/services/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [ ./ssh-agent ./gpg-agent ./hypridle.nix ];

home/services/gpg-agent.nix

@@ -1,19 +1,9 @@
 { pkgs, ... }:
 
-# See https://github.com/nix-community/home-manager/issues/3095
-let
-  pinentryRofi = pkgs.writeShellApplication {
-    name = "pinentry-rofi-with-env";
-    text = ''
-      PATH="$PATH:${pkgs.coreutils}/bin:${pkgs.rofi}/bin"
-      "${pkgs.pinentry-rofi}/bin/pinentry-rofi" "$@"
-    '';
-  };
-in {
+{
   home.packages = with pkgs; [ pinentry-rofi pinentry-gnome3 ];
 
   programs.gpg.enable = true;
-
   services.gpg-agent = {
     enable = true;
     pinentryPackage = pkgs.pinentry-gnome3;
@@ -23,7 +13,6 @@ in {
     extraConfig = ''
       ttyname $GPG_TTY
     '';
-
   };
 }
 

home/services/hypridle.nix

@@ -1,22 +1,20 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+
+{
   services.hypridle = {
     enable = true;
     settings = {
       general = {
-        lock_cmd =
-          "/run/current-system/sw/bin/pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock";
+        lock_cmd = "/run/current-system/sw/bin/pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock";
         before_sleep_cmd = "/run/current-system/sw/bin/loginctl lock-session";
       };
-      listener = [
-        {
-          timeout = 300;
-          on-timeout = "${pkgs.hyprlock}/bin/hyprlock";
-        }
-        {
-          timeout = 600;
-          on-timeout = "${pkgs.systemd}/bin/systemctl suspend";
-        }
-      ];
+      listener = [{
+        timeout = 300;
+        on-timeout = "${pkgs.hyprlock}/bin/hyprlock";
+      }{
+        timeout = 600;
+        on-timeout = "${pkgs.systemd}/bin/systemctl suspend";
+      }];
     };
   };
 }

home/services/pipewire.nix

@@ -4,8 +4,10 @@
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
+    alsa = {
+      enable = true;
+      support32Bit = true;
+    };
     pulse.enable = true;
     jack.enable = true;
   };

home/services/ssh-agent.nix

@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  services.ssh-agent.enable = true;
+}
+

home/services/ssh-agent/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-
-{
-  services.ssh-agent = { enable = true; };
-}
-