From 186eac6896e6727f3bf7febcb141013a6f85017c Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sun, 1 Jun 2025 20:58:47 +0200 Subject: [PATCH] Replice cinnamon with cosmic for gamepc --- machines/gamepc/configuration.nix | 3 ++- nixos/cinnamon.nix | 24 ------------------------ nixos/default.nix | 1 - 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 nixos/cinnamon.nix diff --git a/machines/gamepc/configuration.nix b/machines/gamepc/configuration.nix index 5702c37..7353c31 100644 --- a/machines/gamepc/configuration.nix +++ b/machines/gamepc/configuration.nix @@ -5,7 +5,6 @@ }: { config = { pim = { - cinnamon.enable = true; sops-nix.usersWithSopsKeys = ["pim"]; }; @@ -32,6 +31,8 @@ services = { openssh.enable = true; + displayManager.cosmic-greeter.enable = true; + desktopManager.cosmic.enable = true; xserver.displayManager.lightdm.extraSeatDefaults = '' autologin-user=pim diff --git a/nixos/cinnamon.nix b/nixos/cinnamon.nix deleted file mode 100644 index 8cef6dd..0000000 --- a/nixos/cinnamon.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: let - cfg = config.pim.cinnamon; -in { - options.pim.cinnamon.enable = lib.mkEnableOption "cinnamon"; - config = lib.mkIf cfg.enable { - services = { - displayManager.defaultSession = "cinnamon"; - libinput.enable = true; - xserver = { - desktopManager.cinnamon.enable = true; - displayManager.lightdm.enable = true; - }; - }; - - environment.cinnamon.excludePackages = [ - pkgs.gnome-terminal - ]; - }; -} diff --git a/nixos/default.nix b/nixos/default.nix index 108368d..8cccb06 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -18,7 +18,6 @@ ./stylix.nix ./wireguard.nix ./gnome.nix - ./cinnamon.nix ./ssh.nix ./desktop.nix ./server.nix