From b5f3a9015423e03988de03041247fa56e0d827a0 Mon Sep 17 00:00:00 2001 From: Superredstone Date: Mon, 2 Jun 2025 21:58:02 +0200 Subject: [PATCH] Removed nextcloud-client in favor of Gnome integration --- flake.nix | 2 +- home/kitty.nix | 1 + modules/nix-config/de.nix | 21 +++++++++++++++++++-- modules/packages.nix | 1 - 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 0bc3729..88890a3 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ email = personalEmail; gamingSystem = true; # Currently supported: plasma, gnome, hyprland - desktopEnvironment = "plasma"; + desktopEnvironment = "gnome"; }; }; } diff --git a/home/kitty.nix b/home/kitty.nix index 3ac6698..17038bd 100644 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -4,6 +4,7 @@ enable = true; settings = { enable_audio_bell = false; + linux_display_server = "x11"; # This is how you get borders in gnome! }; font = { package = pkgs.nerd-fonts.jetbrains-mono; diff --git a/modules/nix-config/de.nix b/modules/nix-config/de.nix index b59abad..f15223b 100644 --- a/modules/nix-config/de.nix +++ b/modules/nix-config/de.nix @@ -7,7 +7,7 @@ enable = true; wayland.enable = true; }; - services.xserver.displayManager.gdm.enable = lib.mkIf (currentSystemDe == "gnome") true; + services.displayManager.gdm.enable = lib.mkIf (currentSystemDe == "gnome") true; # Desktop environments services.desktopManager.plasma6.enable = lib.mkIf (currentSystemDe == "plasma") true; @@ -15,5 +15,22 @@ elisa konsole ]; - services.xserver.desktopManager.gnome.enable = lib.mkIf (currentSystemDe == "gnome") true; + services.desktopManager.gnome.enable = lib.mkIf (currentSystemDe == "gnome") true; + environment.gnome.excludePackages = with pkgs; [ + gnome-contacts + gnome-console + gnome-calculator + gnome-tour + gnome-characters + gnome-maps + gnome-clocks + gnome-text-editor + xterm + epiphany + gedit + simple-scan + yelp + geary + seahorse + ]; } diff --git a/modules/packages.nix b/modules/packages.nix index 02230e7..44fa9e2 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -45,7 +45,6 @@ gnome-boxes kitty mpv - nextcloud-client telegram-desktop ] ++ (if gamingSystem then [ dolphin-emu