switch back to hyprlock, update style

6 files changed, 29 insertions, 25 deletions

diff --git a/home/apps/caelestia/default.nix b/home/apps/caelestia/default.nix
index e2e5e96..75dbb26 100644
--- a/home/apps/caelestia/default.nix
+++ b/home/apps/caelestia/default.nix
@@ -15,7 +15,7 @@ in {
 
   config = mkIf cfg.enable {
     default.appLauncher = lib.mkOverride 600 "caelestia-shell ipc call drawers toggle launcher";
-    default.lockScreen = lib.mkOverride 600 "caelestia-shell ipc call lock lock";
+    #default.lockScreen = "caelestia-shell ipc call lock lock";
 
     programs.caelestia = {
       enable = true;
diff --git a/home/apps/caelestia/settings.nix b/home/apps/caelestia/settings.nix
index fbde95d..a529241 100644
--- a/home/apps/caelestia/settings.nix
+++ b/home/apps/caelestia/settings.nix
@@ -81,6 +81,11 @@ in {
             audio = ["pavucontrol"];
             playback = ["mpv"];
           };
+          # disable lock screen
+          idle = {
+            lockBeforeSleep = false;
+            timeouts = [];
+          };
         };
 
         # Background
@@ -137,7 +142,7 @@ in {
           workspaces = {
             activeIndicator = true;
             activeTrail = false;
-            perMonitorWorkspaces = true;
+            perMonitorWorkspaces = false;
             showWindows = false;
             shown = 9;
             label = "";
diff --git a/home/apps/hyprlock.nix b/home/apps/hyprlock.nix
index a0e5d84..237abb6 100644
--- a/home/apps/hyprlock.nix
+++ b/home/apps/hyprlock.nix
@@ -4,7 +4,6 @@
   ...
 }: let
   text = "rgb(${config.theme.colors.text})";
-  base = "rgb(${config.theme.colors.base})";
   error = "rgb(${config.theme.colors.error})";
   trans = "rgba(0,0,0,0)";
 
@@ -25,30 +24,29 @@ in {
 
         animations = {
           enabled = true;
+          bezier = [
+            "linear, 1, 1, 1, 1"
+          ];
           animation = [
-            "fadeIn, 0"
-            "fadeOut, 0"
+            "fade, 1, 3, linear"
           ];
         };
 
         background = {
           path = config.theme.lockscreen;
-          color = base;
-          blur_passes = 0;
-          blur_size = 2;
-          noise = 0;
-          contrast = 0;
-          brightness = 0;
-          vibrancy = 0;
+          blur_passes = 2;
+          contrast = 0.9;
+          brightness = 0.8;
+          vibrancy = 0.2;
           vibrancy_darkness = 0.0;
         };
 
         # Password Input
         input-field = {
-          size = "300, 50";
-          outline_thickness = 0;
-          dots_size = 0.25;
-          dots_spacing = 0.55;
+          size = "250, 60";
+          outline_thickness = 2;
+          dots_size = 0.2;
+          dots_spacing = 0.5;
           dots_center = true;
           dots_rounding = -1;
           outer_color = trans;
@@ -81,21 +79,21 @@ in {
           {
             text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\"";
             color = text;
-            font_size = 20;
+            font_size = 30;
             font_family = config.theme.font.header;
-            position = "0, -100";
+            position = "0, -50";
             halign = "center";
-            valign = "top";
+            valign = "center";
           }
           # Clock
           {
-            text = "cmd[update:1000] echo \"$(date +\"%k:%M:%S\")\"";
+            text = "cmd[update:1000] echo \"$(date +\"%k:%M\")\"";
             color = text;
-            font_size = 90;
+            font_size = 130;
             font_family = config.theme.font.header;
-            position = "0, -130";
+            position = "0, 130";
             halign = "center";
-            valign = "top";
+            valign = "center";
           }
         ];
       };
diff --git a/home/desktops/hyprland/idle.nix b/home/desktops/hyprland/idle.nix
index fbdf0db..0a2b951 100644
--- a/home/desktops/hyprland/idle.nix
+++ b/home/desktops/hyprland/idle.nix
@@ -1,6 +1,6 @@
 {config, ...}: {
   services.hypridle = {
-    enable = config.desktops.hyprland.enable && !config.apps.caelestia.enable;
+    enable = config.desktops.hyprland.enable;
     systemdTarget = "hyprland-session.target";
 
     settings = {
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 4bdf7f4..ec86418 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -68,6 +68,7 @@
   # modules
   apps = {
     caelestia.enable = true;
+    hyprlock.enable = true;
     rofi.enable = true;
     kitty.enable = true;
   };
diff --git a/options.nix b/options.nix
index d7ee564..c80cdfd 100644
--- a/options.nix
+++ b/options.nix
@@ -430,7 +430,7 @@ in {
       lockscreen = mkOption {
         type = types.str;
         description = "Path to lockscreen image";
-        default = toString ./files/wallpapers/flower.jpg;
+        default = toString ./files/wallpapers/moran.jpg;
       };
 
       avatar = mkOption {