remove password age, add disko config, add vps, trying to get hyprland working

3 files changed, 29 insertions, 30 deletions

diff --git a/mixins/greet.nix b/mixins/greet.nix
index 5c46792..755b7f8 100644
--- a/mixins/greet.nix
+++ b/mixins/greet.nix
@@ -1,4 +1,5 @@
 {
+  config,
   pkgs,
   lib,
   ...
@@ -6,28 +7,34 @@
   user = "tzlil";
 
   users.users.greeter.packages = [pkgs.sway];
-  greetd = "${pkgs.greetd.greetd}/bin/greetd";
-  gtkgreet = "${pkgs.greetd.gtkgreet}/bin/gtkgreet";
+  greet = "${pkgs.greetd.wlgreet}/bin/wlgreet";
 
   sway-kiosk = command: "${pkgs.sway}/bin/sway --unsupported-gpu --config ${pkgs.writeText "kiosk.config" ''
     output * bg #000000 solid_color
     exec "${command}; ${pkgs.sway}/bin/swaymsg exit"
   ''}";
 in {
-  environment.etc."greetd/environments".text =
-    "sway\n"
-    + "$SHELL -l\n";
+  options.greeter.initialSession = lib.mkOption {
+    type = lib.types.str;
+    default = "sh -c sway";
+  };
 
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        inherit user;
-        command = sway-kiosk "${gtkgreet} -l &>/dev/null";
-      };
-      initial_session = {
-        inherit user;
-        command = "sh -c sway";
+  config = {
+    environment.etc."greetd/environments".text =
+      "sway\n"
+      + "$SHELL -l\n";
+
+    services.greetd = {
+      enable = true;
+      settings = {
+        default_session = {
+          inherit user;
+          command = sway-kiosk "${greet} -l &>/dev/null";
+        };
+        initial_session = {
+          inherit user;
+          command = config.greeter.initialSession;
+        };
       };
     };
   };
diff --git a/mixins/hyperland.nix b/mixins/hyperland.nix
deleted file mode 100644
index 84cab6f..0000000
--- a/mixins/hyperland.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  inputs,
-  ...
-}: {
-  imports = [
-    inputs.hyprland.nixosModules.default
-  ];
-  config = {
-    programs.hyprland.enable = true;
-  };
-}
\ No newline at end of file
diff --git a/mixins/hyprland.nix b/mixins/hyprland.nix
index 84cab6f..1a063d9 100644
--- a/mixins/hyprland.nix
+++ b/mixins/hyprland.nix
@@ -9,6 +9,12 @@
     inputs.hyprland.nixosModules.default
   ];
   config = {
-    programs.hyprland.enable = true;
+    programs.hyprland = {
+      enable = true;
+      xwayland = {
+        enable = false;
+        hidpi = false;
+      };
+    };
   };
 }
\ No newline at end of file