diff --git a/configurations/nixos/emergent/configuration.nix b/configurations/nixos/emergent/configuration.nix
index eaac657..aacc820 100644
--- a/configurations/nixos/emergent/configuration.nix
+++ b/configurations/nixos/emergent/configuration.nix
@@ -38,8 +38,8 @@
services.xserver.enable = true;
# Enable the GNOME Desktop Environment.
- services.xserver.displayManager.gdm.enable = true;
- services.xserver.desktopManager.gnome.enable = true;
+ services.displayManager.gdm.enable = true;
+ services.desktopManager.gnome.enable = true;
host = {
users = {
diff --git a/flake.lock b/flake.lock
index 3dbabc8..bbaffa4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
- "lastModified": 1748405006,
- "narHash": "sha256-pmt0SFjACJJAI8g8QU5arg2c9BXNZG9/okVwRSDJkG8=",
+ "lastModified": 1748730131,
+ "narHash": "sha256-QHKZlwzw80hoJkNGXQePIg4u109lqcodALkont2WJAc=",
"owner": "rycee",
"repo": "nur-expressions",
- "rev": "f9801a86d6603260940890c36650275090d1dceb",
+ "rev": "aa7bfc2ec4763b57386fcd50242c390a596b9bb0",
"type": "gitlab"
},
"original": {
@@ -115,11 +115,11 @@
]
},
"locked": {
- "lastModified": 1748455938,
- "narHash": "sha256-mQ/iNzPra2WtDQ+x2r5IadcWNr0m3uHvLMzJkXKAG/8=",
+ "lastModified": 1748811839,
+ "narHash": "sha256-MDl6vpEK18ZfPHfoeOa9dGRdwVWNfmCCGazt72nHw+U=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "02077149e2921014511dac2729ae6dadb4ec50e2",
+ "rev": "6abf27943bbb09a0f9d443df45ec70b07a6cbe20",
"type": "github"
},
"original": {
@@ -150,7 +150,7 @@
"narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
},
"original": {
"type": "tarball",
@@ -171,7 +171,7 @@
"narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
},
"original": {
"type": "tarball",
@@ -227,11 +227,11 @@
]
},
"locked": {
- "lastModified": 1748397853,
- "narHash": "sha256-tudGoP5caIJ5TzkV6wnsmUk7Spx21oWMKpkmPbjRNZc=",
+ "lastModified": 1748744745,
+ "narHash": "sha256-kcj58eYic+yLX/KjtHEOmn6lVnCRwL1IfRGnb8aHprE=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
- "rev": "ac4fc8eb9a1ee5eeb3c0a30f57652e4c5428d3a5",
+ "rev": "c008ed9dd78efdeda5e9d5bb835c785e600791f6",
"type": "github"
},
"original": {
@@ -242,11 +242,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1747900541,
- "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
+ "lastModified": 1748634340,
+ "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
+ "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a",
"type": "github"
},
"original": {
@@ -258,11 +258,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1748370509,
- "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
+ "lastModified": 1748693115,
+ "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
+ "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"type": "github"
},
"original": {
diff --git a/modules/nixos-modules/desktop.nix b/modules/nixos-modules/desktop.nix
index cf59cd9..323b7cc 100644
--- a/modules/nixos-modules/desktop.nix
+++ b/modules/nixos-modules/desktop.nix
@@ -19,12 +19,6 @@
# Enable the X11 windowing system.
enable = true;
- # Enable the GNOME Desktop Environment.
- displayManager.gdm.enable = true;
- desktopManager = {
- gnome.enable = true;
- };
-
# Get rid of xTerm
desktopManager.xterm.enable = false;
excludePackages = with pkgs; [
@@ -47,6 +41,10 @@
];
};
+ # Enable the GNOME Desktop Environment.
+ displayManager.gdm.enable = true;
+ desktopManager.gnome.enable = true;
+
pipewire = {
enable = true;
alsa.enable = true;