From c41c2293f363bf00b66a283e662828bcd7c5fed8 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 31 May 2024 18:20:11 +0200 Subject: [PATCH 1/3] gnome: explicitly define packages to remove that are under gnome namespace --- nix-os/desktopManagers/gnome.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nix-os/desktopManagers/gnome.nix b/nix-os/desktopManagers/gnome.nix index 14c19c6..20824f7 100644 --- a/nix-os/desktopManagers/gnome.nix +++ b/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; [ - baobab - cheese - epiphany - evince - geary + environment.gnome.excludePackages = with pkgs; [ + gnome.baobab + gnome.cheese + gnome.epiphany + gnome.evince + gnome.geary gedit - gnome-characters + gnome.gnome-characters gnome-connections gnome-console - gnome-disk-utility - gnome-font-viewer - gnome-logs - gnome-maps + gnome.gnome-disk-utility + gnome.gnome-font-viewer + gnome.gnome-logs + gnome.gnome-maps gnome-text-editor gnome-tour - seahorse - totem - yelp + gnome.seahorse + gnome.totem + gnome.yelp ]; environment.systemPackages = with pkgs; [ From 2e58988fff47ff45cc40a17a2d98b59a600c7188 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 31 May 2024 18:20:52 +0200 Subject: [PATCH 2/3] docker: remove outdated comment --- nix-os/docker.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nix-os/docker.nix b/nix-os/docker.nix index fb719b0..4583f6f 100644 --- a/nix-os/docker.nix +++ b/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; From 898b301fbc60bed41ceb4b6d68241c5bb57afde2 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 31 May 2024 18:21:52 +0200 Subject: [PATCH 3/3] remove outdated plasma, sddm --- nix-os/desktopManagers/kde-plasma.nix | 16 ---------------- nix-os/displayManagers/sddm.nix | 7 ------- 2 files changed, 23 deletions(-) delete mode 100644 nix-os/desktopManagers/kde-plasma.nix delete mode 100644 nix-os/displayManagers/sddm.nix diff --git a/nix-os/desktopManagers/kde-plasma.nix b/nix-os/desktopManagers/kde-plasma.nix deleted file mode 100644 index 17851d9..0000000 --- a/nix-os/desktopManagers/kde-plasma.nix +++ /dev/null @@ -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 - ]; - }; -} diff --git a/nix-os/displayManagers/sddm.nix b/nix-os/displayManagers/sddm.nix deleted file mode 100644 index facbb28..0000000 --- a/nix-os/displayManagers/sddm.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - config = { - services.xserver.displayManager.sddm.enable = true; - }; -} \ No newline at end of file