From 4d6b67e42aada500f8625d42f63781c393384cad Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Sat, 4 Jan 2025 22:26:45 +0000 Subject: [PATCH] updated --- configuration.nix | 18 +++++++++--------- flake.lock | 2 +- flake.nix | 2 +- nixos-cosmic | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configuration.nix b/configuration.nix index a3a70ac..626a3f7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -56,6 +56,11 @@ services = { # Enable X11 and configure Wayland support + # Desktop Managers Configuration + xserver.desktopManager.gnome.enable = true; + desktopManager = { + plasma6.enable = true; # Use plasma5 for KDE6 as well + }; xserver = { enable = true; xkb.layout = "gb"; @@ -65,11 +70,6 @@ # Enable GDM as the display manager displayManager.gdm.enable = true; - # Desktop Managers Configuration - desktopManager = { - gnome.enable = true; # GNOME - plasma6.enable = true; # Use plasma5 for KDE6 as well - }; # Window Managers Configuration windowManager = { @@ -102,7 +102,7 @@ services.printing.enable = true; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; #sound.enable = true; services.flatpak.enable = true; services.blueman.enable = true; @@ -164,10 +164,10 @@ #services.desktopManager.cosmic.enable = true; #services.displayManager.cosmic-greeter.enable = true; - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + #driSupport = true; + #driSupport32Bit = true; extraPackages = with pkgs; [ vulkan-loader vulkan-validation-layers diff --git a/flake.lock b/flake.lock index 3d1536c..de7bb06 100644 --- a/flake.lock +++ b/flake.lock @@ -74,7 +74,7 @@ "nixos-cosmic": "nixos-cosmic", "nixpkgs": [ "nixos-cosmic", - "nixpkgs" + "nixpkgs-stable" ] } }, diff --git a/flake.nix b/flake.nix index 8b709d6..7cde94a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ inputs = { # This points to the same nixpkgs that nixos-cosmic is using by default. # If you want to stick to a stable channel, you can switch "nixpkgs" to "nixpkgs-stable". - nixpkgs.follows = "nixos-cosmic/nixpkgs"; + nixpkgs.follows = "nixos-cosmic/nixpkgs-stable"; # The main input: NixOS COSMIC nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; diff --git a/nixos-cosmic b/nixos-cosmic index f8b8aa1..d1d9af0 160000 --- a/nixos-cosmic +++ b/nixos-cosmic @@ -1 +1 @@ -Subproject commit f8b8aa18abde0b84c84da69a86b7fb3761a4ddf7 +Subproject commit d1d9af0bb706e0bcbf4dcb6b1009208409d12505