hosts/Disco.nix

@@ -2,7 +2,7 @@
 {
     imports = [
         ./development.nix
-        ./xfce.nix
+        ./gnome.nix
         ./x270.nix
         ./scanner.nix
         ./printer.nix
@@ -63,7 +63,7 @@
 
         zathura
         inkscape
-        vlc mpv a52dec
+        vlc
         gthumb
         gimp
         tenacity

hosts/xfce.nix

@@ -1,43 +0,0 @@
-{ config, pkgs, ... }:
-{
-    services.xserver = {
-        enable = true;
-        libinput.enable = true;
-        desktopManager = {
-            xfce.enable = true;
-            xterm.enable = false;
-        };
-        displayManager = {
-            lightdm.enable = true;
-            defaultSession = "xfce";
-            autoLogin.enable = true;
-            autoLogin.user = "fruchti";
-        };
-    };
-    nixpkgs.config.pulseaudio = true;
-    hardware.pulseaudio.enable = true;
-    hardware.bluetooth.enable = true;
-    services.blueman.enable = true;
-    # environment.xfce.excludePackages = with pkgs.xfce; [
-    #     xfce4-terminal
-    # ];
-    environment.systemPackages = with pkgs; [
-        xfce.xfce4-whiskermenu-plugin
-        xfce.xfce4-pulseaudio-plugin
-        xfce.xfce4-volumed-pulse
-        xfce.xfwm4-themes
-        pinentry-gnome
-        lounge-gtk-theme
-        hackneyed
-        blueman
-        gnome.file-roller
-    ];
-    security.pam.services.lightdm.enableGnomeKeyring = true;
-    services.gnome.gnome-keyring.enable = true;
-
-    services.cpupower-gui.enable = true;
-
-    programs.gnupg.agent.pinentryFlavor = "gnome3";
-    services.pcscd.enable = true;
-    services.dbus.packages = [ pkgs.gcr ];
-}