meta: Dump changes

modules/default.nix

@@ -11,6 +11,7 @@
     ./programs/firefox
     ./programs/gnome
     ./programs/gdm
+    ./programs/sddm
     ./programs/gnome-terminal
     ./programs/mpv
     ./programs/git
@@ -54,5 +55,8 @@
     
     # Pure options
     ./base.nix
+
+    # Desktop
+    ./desktop/phosh.nix
   ];
 }

modules/desktop/phosh.nix

@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.ptw.desktop.phosh;
+in {
+  options.ptw.desktop.phosh = {
+    enable = lib.mkEnableOption "Enable Phosh";
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = config.ptw.services.gdm.enable == false;
+        message = "Phosh conflicts GDM";
+      }
+      {
+        assertion = config.services.xserver.displayManager.sddm.enable == false;
+        message = "Phosh conflicts SDDM";
+      }
+    ];
+    
+    services.xserver.desktopManager.phosh = {
+      user = config.ptw.system.singleUser;
+      group = "users";
+      #package = pkgs.phosh;
+      enable = true;
+    };
+  };
+}

modules/programs/gaming/default.nix

@@ -21,8 +21,9 @@ in {
       })
       
       steam-wrapped # Custom package
-      
-      gamescope
+
+      # Broken
+      # gamescope
 
       corectrl
     ];

modules/programs/gnome/default.nix

@@ -39,7 +39,6 @@ in {
         # For config
         dconf # For home-manager
       ];
-      gnome.excludePackages = pkgs.gnome.optionalPackages;
     };
     
     services = {
@@ -72,10 +71,6 @@ in {
         libinput.enable = true;
         
         desktopManager.gnome.enable = true;
-        displayManager.gdm = {
-          enable = true;
-          wayland = true;
-        };
       };
     };
 

modules/programs/sddm/default.nix

@@ -0,0 +1,26 @@
+{ pkgs, config, lib, ... }:
+
+let
+  cfg = config.ptw.services.sddm;
+in {
+  options.ptw.services.sddm = {
+    enable = lib.mkEnableOption "Enable SDDM as a display manager";
+    monitors = lib.mkOption {
+      description = "The file to use as a monitors.xml";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = config.ptw.services.gdm.enable == false;
+        message = "Having two display managers is a bad idea";
+      }
+    ];
+    
+    services.xserver.displayManager.sddm = {
+      enable = true;
+      autoNumlock = true;
+    };
+  };
+}

modules/users/alexander.nix

@@ -58,7 +58,7 @@
       # TODO: Maybe move this somewhere else
       services.gpg-agent = {
         enable = true;
-        pinentryFlavor = "gnome3";
+        pinentryFlavor = "qt";
       };
     };    
   };