Merge branch 'main' into cosmic

nix-os/desktopManagers/gnome.nix

@@ -34,25 +34,25 @@
       "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0"
     ];
 
-    environment.gnome.excludePackages = with pkgs; with pkgs.gnome; [
+    environment.gnome.excludePackages = with pkgs; [
-      baobab
+      gnome.baobab
-      cheese
+      gnome.cheese
-      epiphany
+      gnome.epiphany
-      evince
+      gnome.evince
-      geary
+      gnome.geary
       gedit
-      gnome-characters
+      gnome.gnome-characters
       gnome-connections
       gnome-console
-      gnome-disk-utility
+      gnome.gnome-disk-utility
-      gnome-font-viewer
+      gnome.gnome-font-viewer
-      gnome-logs
+      gnome.gnome-logs
-      gnome-maps
+      gnome.gnome-maps
       gnome-text-editor
       gnome-tour
-      seahorse
+      gnome.seahorse
-      totem
+      gnome.totem
-      yelp
+      gnome.yelp
     ];
 
     environment.systemPackages = with pkgs; [

nix-os/desktopManagers/kde-plasma.nix

@@ -1,16 +0,0 @@
-{lib, config, pkgs, ...}:
-
-{
-  config = {
-    services.xserver.enable = true;
-    services.xserver.desktopManager.plasma5.enable = true;
-
-    # environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-    environment.systemPackages = with pkgs; [
-      libsForQt5.plasma-browser-integration
-      translate-shell
-      pavucontrol
-    ];
-  };
-}

nix-os/displayManagers/sddm.nix

@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  config = {
-    services.xserver.displayManager.sddm.enable = true;
-  };
-}

nix-os/docker.nix

@@ -3,7 +3,6 @@
 {
   config.virtualisation.docker = {
     enable = true;
-    # enableNvidia = true;
     enableOnBoot = true;
     storageDriver = if config.fileSystems."/".fsType == "btrfs" then "btrfs" else null;
     rootless.enable = true;