about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--hosts/hplappi.nix7
-rw-r--r--modules/nixos/sils/default.nix1
-rw-r--r--modules/nixos/sils/gnome.nix19
-rw-r--r--modules/nixos/sils/roles.nix3
4 files changed, 22 insertions, 8 deletions
diff --git a/hosts/hplappi.nix b/hosts/hplappi.nix
index ed4e189..ef01626 100644
--- a/hosts/hplappi.nix
+++ b/hosts/hplappi.nix
@@ -6,13 +6,6 @@
 }: {
   role.sils = "laptop";
 
-  #services.xserver.enable = true;
-  #services.displayManager.gdm.enable = true;
-  #services.desktopManager.gnome.enable = true;
-  #services.tlp.enable = lib.mkForce false;
-  #services.greetd.enable = lib.mkForce false;
-  #services.gnome.gnome-keyring.enable = lib.mkForce false;
-
   environment.systemPackages = [pkgs.gnome-browser-connector];
 
   sils = {
diff --git a/modules/nixos/sils/default.nix b/modules/nixos/sils/default.nix
index 8e8a796..24de0b9 100644
--- a/modules/nixos/sils/default.nix
+++ b/modules/nixos/sils/default.nix
@@ -10,6 +10,7 @@
     ./firejail.nix
     ./font.nix
     ./fprintd.nix
+    ./gnome.nix
     ./graphics.nix
     ./hyprland.nix
     ./impermanence.nix
diff --git a/modules/nixos/sils/gnome.nix b/modules/nixos/sils/gnome.nix
new file mode 100644
index 0000000..7b798d9
--- /dev/null
+++ b/modules/nixos/sils/gnome.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.sils.gnome;
+in {
+  options.sils.gnome.enable = lib.mkEnableOption "The Gnome DE";
+  config = lib.mkIf cfg.enable {
+    services = {
+      xserver.enable = true;
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+      tlp.enable = lib.mkForce false;
+      greetd.enable = lib.mkForce false;
+      gnome.gnome-keyring.enable = lib.mkForce false;
+    };
+  };
+}
diff --git a/modules/nixos/sils/roles.nix b/modules/nixos/sils/roles.nix
index b3cb533..e4a2c82 100644
--- a/modules/nixos/sils/roles.nix
+++ b/modules/nixos/sils/roles.nix
@@ -13,6 +13,7 @@ in {
       bluetooth.enable = lib.mkDefault true;
       bootloader = lib.mkDefault "lanzaboote";
       disks.enable = lib.mkDefault true;
+      gnome.enable = lib.mkDefault true;
       graphics.enable = lib.mkDefault true;
       environment.enable = lib.mkDefault true;
       firejail.enable = false;
@@ -22,7 +23,7 @@ in {
       networking.enable = lib.mkDefault true;
       nix-config.enable = lib.mkDefault true;
       pamconfig.enable = lib.mkDefault true;
-      plasma.enable = lib.mkDefault true;
+      plasma.enable = lib.mkDefault false;
       plymouth.enable = lib.mkDefault true;
       printing.enable = lib.mkDefault true;
       sound.enable = lib.mkDefault true;