From 67a71f861fe678899d058fbab2db45459b3582f8 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Wed, 19 Mar 2025 20:39:00 -0400 Subject: [PATCH] Removed lix and added cosmic desktop --- dot_config/flake/flake.nix | 10 +++++++++- dot_config/flake/machines/wash/configuration.nix | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 2958b32..21e4d6b 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -19,6 +19,11 @@ url = "github:lnl7/nix-darwin/nix-darwin-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + + cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + # inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -30,6 +35,7 @@ darwin, helix, stylix, + cosmic, ... } @ inputs: let inherit (self) outputs; @@ -69,10 +75,12 @@ wash = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ - lix-module.nixosModules.default + # lix-module.nixosModules.default stylix.nixosModules.stylix + cosmic.nixosModules.default + ./machines/wash/configuration.nix home-manager.nixosModules.home-manager diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix index 02134f5..3b6b1ad 100644 --- a/dot_config/flake/machines/wash/configuration.nix +++ b/dot_config/flake/machines/wash/configuration.nix @@ -81,9 +81,12 @@ # services.xserver.enable = true; # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; + # services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; + services.desktopManager.cosmic.enable = true; + services.displayManager.cosmic-greeter.enable = true; + # Configure keymap in X11 services.xserver.xkb = { layout = "us";