From e37b8e3f8dbc70275a81a562d43ce6cb88b074c8 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Wed, 12 Jun 2024 10:45:24 +0200
Subject: [PATCH] update hypridle/lock settings

---
 home-manager/hyprland/hyprland-settings.nix |  4 ++
 home-manager/hyprland/hyprlock.nix          | 57 ++++++++++-----------
 modules/collections/laptop.nix              |  4 +-
 modules/graphical/hyprland.nix              |  9 ----
 modules/misc/default.nix                    |  1 +
 modules/misc/podman.nix                     | 30 +++++++++++
 6 files changed, 65 insertions(+), 40 deletions(-)
 create mode 100644 modules/misc/podman.nix

diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix
index 8e32b9e..abdafe7 100644
--- a/home-manager/hyprland/hyprland-settings.nix
+++ b/home-manager/hyprland/hyprland-settings.nix
@@ -72,6 +72,10 @@ in {
           #allow_tearing = true;
         };
 
+        misc = {
+          vfr = true;
+        };
+
         decoration = {
           # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
diff --git a/home-manager/hyprland/hyprlock.nix b/home-manager/hyprland/hyprlock.nix
index 4b28750..2d45800 100644
--- a/home-manager/hyprland/hyprlock.nix
+++ b/home-manager/hyprland/hyprlock.nix
@@ -1,9 +1,7 @@
 { config, osConfig, pkgs, inputs, lib, ... }:
 with lib;
-let
-    cfg = osConfig.custom.graphical.hyprland;
-in
-{
+let cfg = osConfig.custom.graphical.hyprland;
+in {
   config = lib.mkIf cfg.enable {
     programs.hyprlock.enable = true;
     programs.hyprlock.settings = {
@@ -14,13 +12,11 @@ in
         no_fade_in = false;
       };
 
-      background = [
-        {
-          path = "/synced/default/dinge/Bg/yuyukowallpaper1809.png";
-          blur_passes = 3;
-          blur_size = 8;
-        }
-      ];
+      background = [{
+        path = "/synced/default/dinge/Bg/yuyukowallpaper1809.png";
+        blur_passes = 3;
+        blur_size = 8;
+      }];
 
       # TIME
       #label = {
@@ -47,40 +43,43 @@ in
       #    valign = "top";
       #    shadow_passes = 2;
       #};
-      input-field = [
-        {
-          size = "400, 100";
-          position = "0, -80";
-          monitor = "";
-          dots_center = true;
-          fade_on_empty = false;
-          font_color = "rgb(202, 211, 245)";
-          inner_color = "rgb(91, 96, 120)";
-          outer_color = "rgb(24, 25, 38)";
-          outline_thickness = 5;
-          placeholder_text = "Password...";
-          shadow_passes = 2;
-        }
-      ];
+      input-field = [{
+        size = "300, 75";
+        position = "0, -80";
+        monitor = "";
+        dots_center = true;
+        fade_on_empty = false;
+        font_color = "rgb(202, 211, 245)";
+        inner_color = "rgb(91, 96, 120)";
+        outer_color = "rgb(24, 25, 38)";
+        outline_thickness = 5;
+        placeholder_text = "Password...";
+        shadow_passes = 2;
+      }];
     };
     services.hypridle.enable = true;
     services.hypridle.settings = {
       general = {
+        before_sleep_cmd = "loginctl lock-session";
         after_sleep_cmd = "hyprctl dispatch dpms on";
         ignore_dbus_inhibit = false;
-        lock_cmd = "hyprlock";
+        lock_cmd = "pidof hyprlock || hyprlock ";
       };
 
       listener = [
         {
-          timeout = 900;
+          timeout = 600;
           on-timeout = "hyprlock";
         }
         {
-          timeout = 1200;
+          timeout = 900;
           on-timeout = "hyprctl dispatch dpms off";
           on-resume = "hyprctl dispatch dpms on";
         }
+        {
+          timeout = 1200;
+          on-timeout = "systemctl suspend";
+        }
       ];
     };
   };
diff --git a/modules/collections/laptop.nix b/modules/collections/laptop.nix
index eeea23f..e53cf3a 100644
--- a/modules/collections/laptop.nix
+++ b/modules/collections/laptop.nix
@@ -1,5 +1,4 @@
-{pkgs, config, ...}:
-{
+{ pkgs, config, ... }: {
   imports = [
     ../kernel.nix # use latest kernel
     ../services/wireguard-client.nix
@@ -13,6 +12,7 @@
       ld.enable = true;
       settings.enable = true;
     };
+    misc = { podman.enable = true; };
     hardware = {
       firmware.enable = true;
       ssd.enable = true;
diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix
index d3b6c22..1a03f76 100644
--- a/modules/graphical/hyprland.nix
+++ b/modules/graphical/hyprland.nix
@@ -45,17 +45,8 @@ in {
     
       programs.hyprland = {
         enable = true;
-        package = pkgs.unstable.hyprland;
       };
     
-      security.pam.services = {
-        swaylock = {
-          fprintAuth = false;
-          text = ''
-            auth include login
-          '';
-        };
-      };
       security.pam.services.hyprlock = {};
             
       # List packages installed in system profile. To search, run:
diff --git a/modules/misc/default.nix b/modules/misc/default.nix
index 24a1e19..a0d6928 100644
--- a/modules/misc/default.nix
+++ b/modules/misc/default.nix
@@ -10,5 +10,6 @@
     ./tmpfs.nix
     ./virt-manager.nix
     ./wireshark.nix
+    ./podman.nix
   ];
 }
diff --git a/modules/misc/podman.nix b/modules/misc/podman.nix
new file mode 100644
index 0000000..7b63c48
--- /dev/null
+++ b/modules/misc/podman.nix
@@ -0,0 +1,30 @@
+{ pkgs, lib, config, ... }:
+let cfg = config.custom.misc.podman;
+in {
+  options = {
+    custom.misc.podman = { enable = lib.mkEnableOption "Enable podman service"; };
+  };
+  config = lib.mkIf cfg.enable {
+    # Enable common container config files in /etc/containers
+    virtualisation.containers.enable = true;
+    virtualisation = {
+      podman = {
+        enable = true;
+
+        # Create a `docker` alias for podman, to use it as a drop-in replacement
+        dockerCompat = true;
+
+        # Required for containers under podman-compose to be able to talk to each other.
+        defaultNetwork.settings.dns_enabled = true;
+      };
+    };
+
+    # Useful other development tools
+    environment.systemPackages = with pkgs; [
+      dive # look into docker image layers
+      podman-tui # status of containers in the terminal
+      docker-compose # start group of containers for dev
+      #podman-compose # start group of containers for dev
+    ];
+  };
+}