From 4abedcce786b87516d40cdf36d1878c0e6bff257 Mon Sep 17 00:00:00 2001
From: Paul-Mathias Logue <git@pmlogue.me>
Date: Sun, 14 Dec 2025 14:51:20 +0100
Subject: [PATCH] Lots of changes

---
 machines/hermes/default.nix  | 52 ++++++++++++++++++++++++++++++++++--
 machines/hermes/hardware.nix | 24 +++++++++--------
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/machines/hermes/default.nix b/machines/hermes/default.nix
index b1ba3e6..b0479f6 100644
--- a/machines/hermes/default.nix
+++ b/machines/hermes/default.nix
@@ -41,11 +41,16 @@
     trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ];
   };
 
-  programs.niri.enable = true;
+
+  # Enable required services for Wayland
+  security.polkit.enable = true;
+  programs.dconf.enable = true;
+ 
 
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
   environment.systemPackages = with pkgs; [
+    mpv
     wget
     alacritty
     fuzzel
@@ -82,7 +87,7 @@
   };
 
   fonts.packages = with pkgs; [
-    inputs.apple-fonts.packages."${system}".sf-pro
+    inputs.apple-fonts.packages."${pkgs.stdenv.hostPlatform.system}".sf-pro
     noto-fonts-color-emoji
     (iosevka.override {
       set = "cavalier";
@@ -141,5 +146,48 @@
       mode = "0755";
     };
   };
+
+  # Enable greetd
+  # services.greetd = {
+  #   enable = true;
+  #   settings = {
+  #     default_session = {
+  #       command = "${pkgs.niri}/bin/niri --config /etc/greetd/niri.kdl";
+  #       user = "greeter";
+  #     };
+  #   };
+  # }
+
+  # Enable regreet
+  programs.regreet = {
+    enable = true;
+    font.name = "SF Pro";
+    font.size = 16;
+    font.package = inputs.apple-fonts.packages."${pkgs.stdenv.hostPlatform.system}".sf-pro;
+    settings = {
+      GTK = {
+        font_name = lib.mkForce "SF Pro 16";
+      };
+    };
+  };
+
+  # Create the niri config for greetd
+  # environment.etc."greetd/niri.kdl".text = ''
+  #   spawn-sh-at-startup "regreet; niri msg action quit --skip-confirmation"
+  #   
+  #   hotkey-overlay {
+  #       skip-at-startup
+  #   }
+  #   
+  #   cursor {
+  #       xcursor-theme "Adwaita"
+  #       xcursor-size 24
+  #   }
+  # '';
+
+  # Optional: Enable niri for user sessions
+  programs.niri.enable = true;
+
+
   system.stateVersion = "25.05"; # Did you read the comment?
 }
diff --git a/machines/hermes/hardware.nix b/machines/hermes/hardware.nix
index 5f1b3f9..3f491d9 100644
--- a/machines/hermes/hardware.nix
+++ b/machines/hermes/hardware.nix
@@ -9,7 +9,8 @@ let
     done
   '';
 in
-{
+  {
+  # I2C
   environment.systemPackages = with pkgs; [
     i2c-tools
     lm_sensors
@@ -29,15 +30,16 @@ in
 
   # OpenRGB
   services.udev.packages = [ pkgs.openrgb ];
-  services.hardware.openrgb.enable = true;
-  systemd.services.no-rgb = {
-    description = "no-rgb";
-    serviceConfig = {
-      ExecStart = "${no-rgb}/bin/no-rgb";
-      Type = "oneshot";
-    };
-    after = [ "openrgb.service" ];
-    requires = [ "openrgb.service" ];
-    wantedBy = [ "multi-user.target" ];
+  services.hardware.openrgb = {
+    enable = true;
+    startupProfile = "off";
   };
+  # systemd.services.no-rgb = {
+  #   description = "no-rgb";
+  #   serviceConfig = {
+  #     ExecStart = "${no-rgb}/bin/no-rgb";
+  #     Type = "oneshot";
+  #   };
+  #   wantedBy = [ "multi-user.target" ];
+  # };
 }