diff --git a/extras/cosmic.nix b/extras/cosmic.nix index f4b07b5..bcea3a5 100644 --- a/extras/cosmic.nix +++ b/extras/cosmic.nix @@ -1,14 +1,16 @@ {pkgs, ...}: { - # services.displayManager.sddm.enable = true; - # services.displayManager.cosmic-greeter.enable = false; - services.desktopManager.cosmic.enable = true; + services.desktopManager.plasma6.enable = false; + services.displayManager.sddm.enable = false; - environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; + services.desktopManager.cosmic.enable = true; + services.displayManager.cosmic-greeter.enable = true; - environment.cosmic.excludePackages = with pkgs; [ - cosmic-edit - cosmic-player - cosmic-term - cosmic-wallpapers - ]; + environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; + + environment.cosmic.excludePackages = with pkgs; [ + cosmic-edit + cosmic-player + cosmic-term + cosmic-wallpapers + ]; } diff --git a/flake.nix b/flake.nix index eed84ff..a5bd4b9 100644 --- a/flake.nix +++ b/flake.nix @@ -23,10 +23,10 @@ # url = "github:mattwparas/helix/steel-event-system"; # inputs.nixpkgs.follows = "nixpkgs"; # }; - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # nixos-cosmic = { + # url = "github:lilyinstarlight/nixos-cosmic"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; zen-browser = { url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; @@ -35,12 +35,12 @@ nixConfig = { extra-substituters = [ - "https://cosmic.cachix.org/" + # "https://cosmic.cachix.org/" # "https://helix.cachix.org/" "https://devenv.cachix.org" ]; extra-trusted-public-keys = [ - "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + # "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" # "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" ]; @@ -56,7 +56,7 @@ agenix, disko, home-manager, - nixos-cosmic, + # nixos-cosmic, zen-browser, ... } @ inputs: { @@ -79,7 +79,7 @@ ./extras/dev.nix ./extras/gaming.nix ./extras/folding.nix - nixos-cosmic.nixosModules.default + # nixos-cosmic.nixosModules.default ./extras/cosmic.nix ]; }; @@ -106,7 +106,7 @@ ./extras/uwuraid.nix ./extras/dev.nix ./extras/gaming.nix - nixos-cosmic.nixosModules.default + # nixos-cosmic.nixosModules.default ./extras/cosmic.nix ]; }; @@ -132,7 +132,7 @@ nixos-hardware.nixosModules.raspberry-pi-4 ./systems/BASED.nix ./systems/NObangers.nix - nixos-cosmic.nixosModules.default + # nixos-cosmic.nixosModules.default ./extras/cosmic.nix agenix.nixosModules.default ./extras/uwuraid.nix