From 06c425341ef0f2eef2dcb87db61179a8a4e23338 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 31 Jan 2025 08:40:26 +0000
Subject: [PATCH] Switch to using SDDM instead of greetd

Switch back to one-light for everything

Only install teams-for-linux on work machines
---
 system/default.nix |  2 +-
 system/desktop.nix | 47 +++++++++++++++-------------------------------
 system/work.nix    | 17 +++++++++++++++--
 3 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/system/default.nix b/system/default.nix
index 86d15482..5c25a639 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -198,7 +198,7 @@
   stylix = {
     enable = true;
     image = ./wallpapers/default.png;
-    base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/onedark.yaml";
+    base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/one-light.yaml";
     polarity = config.lib.stylix.scheme.variant;
     opacity = {
       applications = 1.0;
diff --git a/system/desktop.nix b/system/desktop.nix
index 8d9c23f7..9a9600c7 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -44,7 +44,6 @@
       libreoffice
       webcord
       signal-desktop
-      teams-for-linux
       nomachine-client
     ];
   };
@@ -65,8 +64,6 @@
     noisetorch.enable = true;
     seahorse.enable = true;
     file-roller.enable = true;
-    hyprland.enable = true;
-    xwayland.enable = true;
     thunar = {
       enable = true;
       plugins = with pkgs.xfce; [
@@ -74,6 +71,10 @@
         thunar-volman
       ];
     };
+    hyprland = {
+      enable = true;
+      xwayland.enable = true;
+    };
   };
   gtk.iconCache.enable = true;
   qt = {
@@ -82,6 +83,7 @@
     style = if config.lib.stylix.scheme.variant == "light" then "adwaita" else "adwaita-dark";
   };
   services = {
+    xserver.xkb.layout = "gb";
     gnome.gnome-keyring.enable = true;
     flatpak.enable = true;
     printing.enable = true;
@@ -107,23 +109,16 @@
         support32Bit = true;
       };
     };
-    greetd = {
-      enable = true;
-      settings =
-        let
-          default_session.command = "Hyprland";
-        in
-        {
-          inherit default_session;
-          initial_session = {
-            inherit (default_session) command;
-            user = username;
-          };
-        };
-    };
-    xserver = {
-      enable = true;
-      xkb.layout = "gb";
+    displayManager = {
+      defaultSession = "hyprland";
+      autoLogin = {
+        enable = false;
+        user = username;
+      };
+      sddm = {
+        enable = true;
+        wayland.enable = true;
+      };
     };
   };
   xdg.portal = {
@@ -224,18 +219,6 @@
               figure.autolayout: True
               savefig.dpi: 300
             '';
-          # Teams config
-          "teams-for-linux/config.json" = {
-            force = true;
-            text = builtins.toJSON {
-              awayOnSystemIdle = true;
-              closeAppOnCross = false;
-              followSystemTheme = true;
-              notificationMethod = "electron";
-              optInTeamsV2 = true;
-              spellCheckerLanguages = [ "en_GB" ];
-            };
-          };
           # Autostart some programs
           "autostart/signal-desktop.desktop".source =
             "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
diff --git a/system/work.nix b/system/work.nix
index bccb3532..00fd866a 100644
--- a/system/work.nix
+++ b/system/work.nix
@@ -5,9 +5,11 @@
   ...
 }:
 {
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml";
   services.samba.enable = true;
-  environment.systemPackages = with pkgs; [ twinkle ];
+  environment.systemPackages = with pkgs; [
+    teams-for-linux
+    twinkle
+  ];
   home-manager.users.${username} =
     { config, ... }:
     {
@@ -20,5 +22,16 @@
         proton.primary = lib.mkForce false;
         outlook.primary = lib.mkForce true;
       };
+      xdg.configFile."teams-for-linux/config.json" = {
+        force = true;
+        text = builtins.toJSON {
+          awayOnSystemIdle = true;
+          closeAppOnCross = false;
+          followSystemTheme = true;
+          notificationMethod = "electron";
+          optInTeamsV2 = true;
+          spellCheckerLanguages = [ "en_GB" ];
+        };
+      };
     };
 }