From 0fd67cdfacfb7d139cc87493f85a8b72bbffe7e4 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 30 May 2025 16:20:45 -0500
Subject: [PATCH] Desktop Updates Fri May 30 04:20:45 PM CDT 2025

---
 hosts/mac-nixos/configuration.nix             |  8 ++---
 hosts/mac-nixos/gnome/default.nix             | 12 +++----
 hosts/nas/nix-serve.nix                       | 34 +++++++++----------
 hosts/pi5/services.nix                        |  2 +-
 .../desktop-environments/gnome/default.nix    | 12 +++----
 5 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/hosts/mac-nixos/configuration.nix b/hosts/mac-nixos/configuration.nix
index 69f431d..11990a7 100755
--- a/hosts/mac-nixos/configuration.nix
+++ b/hosts/mac-nixos/configuration.nix
@@ -53,12 +53,8 @@ in
     displayManager.sddm.wayland.enable = lib.mkDefault plasma;
     displayManager.sddm.enable = lib.mkDefault plasma;
     desktopManager.plasma6.enable = lib.mkDefault plasma;
-
-    xserver = {
-      enable = true;
-      desktopManager.gnome.enable = lib.mkForce true;
-      displayManager.gdm.enable = lib.mkForce true;
-    };
+    desktopManager.gnome.enable = lib.mkForce true;
+    displayManager.gdm.enable = lib.mkForce true;
 
     # enable auto discovery of printers
     avahi = {
diff --git a/hosts/mac-nixos/gnome/default.nix b/hosts/mac-nixos/gnome/default.nix
index 3800456..b3496cc 100755
--- a/hosts/mac-nixos/gnome/default.nix
+++ b/hosts/mac-nixos/gnome/default.nix
@@ -6,14 +6,12 @@
     home-manager.users.matt = import ./home.nix;
     
     services = {
-      xserver = {
-        desktopManager.gnome.enable = true;
+      desktopManager.gnome.enable = true;
 
-        # Enable Desktop Environment.
-        displayManager = {
-          gdm.enable = true;
-          gdm.wayland = true;
-        };
+      # Enable Desktop Environment.
+      displayManager = {
+        gdm.enable = true;
+        gdm.wayland = true;
       };
 
       displayManager.defaultSession = "gnome";
diff --git a/hosts/nas/nix-serve.nix b/hosts/nas/nix-serve.nix
index 69abe17..4757100 100755
--- a/hosts/nas/nix-serve.nix
+++ b/hosts/nas/nix-serve.nix
@@ -75,22 +75,22 @@
         exit 1
       fi
       
-      # echo "Starting build of jallen-nas at $(date)"
-      # if nix flake update nas-nixpkgs nas-authentik-nix nas-cosmic nas-crowdsec nas-home-manager nas-impermanence nas-lanzaboote nas-nixos-hardware nas-sops-nix; then
-      #   echo "jallen-nas flake updated successfully at $(date)"
-      # else
-      #   echo "jallen-nas flake failed to update at $(date)"
-      #   exit 1
-      # fi
-      # if nix build .\#nixosConfigurations.jallen-nas.config.system.build.toplevel --no-link; then
-      #   echo "jallen-nas built successfully at $(date)"
-      #   git add .
-      #   git commit -m "Jallen-NAS Updates $(date)"
-      # else
-      #   echo "jallen-nas failed to build at $(date)"
-      #   git reset --hard
-      #   exit 1
-      # fi
+      echo "Starting build of jallen-nas at $(date)"
+      if nix flake update nas-nixpkgs nas-authentik-nix nas-cosmic nas-crowdsec nas-home-manager nas-impermanence nas-lanzaboote nas-nixos-hardware nas-sops-nix; then
+        echo "jallen-nas flake updated successfully at $(date)"
+      else
+        echo "jallen-nas flake failed to update at $(date)"
+        exit 1
+      fi
+      if NIXPKGS_ALLOW_UNFREE=1 nix build .\#nixosConfigurations.jallen-nas.config.system.build.toplevel --no-link --impure; then
+        echo "jallen-nas built successfully at $(date)"
+        git add .
+        git commit -m "Jallen-NAS Updates $(date)"
+      else
+        echo "jallen-nas failed to build at $(date)"
+        git reset --hard
+        exit 1
+      fi
       
       echo "Starting build of pi4 at $(date)"
       if nix flake update pi4-nixpkgs pi4-home-manager pi4-impermanence pi4-sops-nix pi4-nixos-hardware pi4-nixos-raspberrypi pi4-disko; then
@@ -99,7 +99,7 @@
         echo "pif flake failed to update at $(date)"
         exit 1
       fi
-      if nix build .\#nixosConfigurations.pi4.config.system.build.toplevel --no-link; then
+      if nix build .\#nixosConfigurations.pi4.config.system.build.toplevel --no-link --impure; then
         echo "pi4 built successfully at $(date)"
         git add .
         git commit -m "Pi4 Updates $(date)"
diff --git a/hosts/pi5/services.nix b/hosts/pi5/services.nix
index 060caba..bb0d597 100644
--- a/hosts/pi5/services.nix
+++ b/hosts/pi5/services.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   services = {
-    xserver.desktopManager.gnome.enable = true;
+    desktopManager.gnome.enable = true;
     shairport-sync = {
       enable = true;
       openFirewall = true;
diff --git a/modules/desktop-environments/gnome/default.nix b/modules/desktop-environments/gnome/default.nix
index 78d2df8..46f42d4 100644
--- a/modules/desktop-environments/gnome/default.nix
+++ b/modules/desktop-environments/gnome/default.nix
@@ -2,13 +2,11 @@
 {
   services = {
     # Enable Desktop Environment.
-    xserver = {
-      desktopManager.gnome.enable = true;
-      # Enable Desktop Environment.
-      displayManager = {
-        gdm.enable = lib.mkDefault true;
-        gdm.wayland = lib.mkDefault true;
-      };
+    desktopManager.gnome.enable = true;
+    # Enable Desktop Environment.
+    displayManager = {
+      gdm.enable = lib.mkDefault true;
+      gdm.wayland = lib.mkDefault true;
     };
 
     gnome.gnome-remote-desktop.enable = true;