From 7aaf90bc752b88922c6c3b5c8bcaa6293675c5f5 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 22 Nov 2025 14:09:24 +0000 Subject: [PATCH] Extract a cinnamon-desktop module --- modules/desktop/cinnamon-desktop/default.nix | 9 +++++++++ modules/hosts/lemp11/configuration.nix | 11 +++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 modules/desktop/cinnamon-desktop/default.nix diff --git a/modules/desktop/cinnamon-desktop/default.nix b/modules/desktop/cinnamon-desktop/default.nix new file mode 100644 index 00000000..79d1fcad --- /dev/null +++ b/modules/desktop/cinnamon-desktop/default.nix @@ -0,0 +1,9 @@ +{ + flake.modules.nixos.cinnamon-desktop = { + services.xserver = { + enable = true; + + desktopManager.cinnamon.enable = true; + }; + }; +} diff --git a/modules/hosts/lemp11/configuration.nix b/modules/hosts/lemp11/configuration.nix index 491e1ee0..e208dd81 100644 --- a/modules/hosts/lemp11/configuration.nix +++ b/modules/hosts/lemp11/configuration.nix @@ -1,7 +1,13 @@ +{ inputs, ... }: + { flake.modules.nixos."nixosConfigurations/lemp11" = - { pkgs,stateVersion, ... }: + { pkgs, stateVersion, ... }: { + imports = with inputs.self.modules.nixos; [ + cinnamon-desktop + ]; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -27,9 +33,6 @@ LC_TIME = "en_GB.UTF-8"; }; - services.xserver.enable = true; - services.xserver.desktopManager.cinnamon.enable = true; - services.xserver.xkb = { layout = "gb"; variant = "";