From a61d8bbbf08903a0388af98342dff5a1c91c83ee Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Fri, 21 Apr 2023 13:07:28 +0200
Subject: [PATCH] Clean up system config after update

---
 defaults/base/default.nix                |  1 +
 defaults/desktop/desktop-environment.nix | 40 ++++++++++++++++++++----
 defaults/desktop/greeter.nix             |  2 ++
 defaults/desktop/hardware.nix            |  4 +++
 home/fhauser/applications/sway.nix       |  4 +--
 5 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/defaults/base/default.nix b/defaults/base/default.nix
index 823c489..d2b0a49 100644
--- a/defaults/base/default.nix
+++ b/defaults/base/default.nix
@@ -72,6 +72,7 @@ in {
   services.fwupd.enable = true;
 
   # Network services
+  networking.networkmanager.enable = true;
   networking.firewall = {
     allowPing = true;
     allowedTCPPorts = [ 22 ];
diff --git a/defaults/desktop/desktop-environment.nix b/defaults/desktop/desktop-environment.nix
index 2bd32f5..86e3015 100644
--- a/defaults/desktop/desktop-environment.nix
+++ b/defaults/desktop/desktop-environment.nix
@@ -1,10 +1,11 @@
-{ config, pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }: let mkDefault = lib.mkDefault; in {
 
   environment.systemPackages = with pkgs;
     [ # Utilities
       freetype
       feh
       lxappearance
+      sound-theme-freedesktop
     ] ++ [ # Networking
       gnome.networkmanager-openconnect
     ] ++ [ # Various
@@ -32,25 +33,52 @@
   services.gnome = {
     # TODO: Do this manually and not all at once.
     core-utilities.enable = true;
-    core-os-services.enable = true;
+    core-os-services.enable = false;
 
     gnome-keyring.enable = true;
     evolution-data-server.enable = true;
     gnome-online-accounts.enable = true;
     gnome-remote-desktop.enable = true;
-
     sushi.enable = false;
   };
 
+
+  ##########
+  # gnome.core-os-services excerpt
+
+
+  security.polkit.enable = true;
+  services.power-profiles-daemon.enable = false; # TODO: Remove
+
+  # Explicitly enabled since GNOME will be severely broken without these.
+  xdg.mime.enable = true;
+  xdg.icons.enable = true;
+
+
+  # Harmonize Qt5 application style and also make them use the portal for file chooser dialog.
+  qt = {
+    enable = mkDefault true;
+    platformTheme = mkDefault "gnome";
+    style = mkDefault "adwaita";
+  };
+
+  # Needed for themes and backgrounds
+  environment.pathsToLink = [
+    "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173
+  ]; ##########
+
+
+  # GVFS
   services.gvfs.enable = true;
 
+  # Flatpak
   services.flatpak.enable = true;
+
+  # Portals
   xdg.portal = {
     enable = true;
     wlr.enable = true;
-    gtkUsePortal = false;
-    #extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ];
-    extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
 
 }
diff --git a/defaults/desktop/greeter.nix b/defaults/desktop/greeter.nix
index bda4a93..0d6693b 100644
--- a/defaults/desktop/greeter.nix
+++ b/defaults/desktop/greeter.nix
@@ -21,5 +21,7 @@
     # TODO: Extract i18n
     layout = "ch,de";
     xkbOptions = "eurosign:e";
+
+    updateDbusEnvironment = true;
   };
 }
diff --git a/defaults/desktop/hardware.nix b/defaults/desktop/hardware.nix
index 6bec994..9c8e441 100644
--- a/defaults/desktop/hardware.nix
+++ b/defaults/desktop/hardware.nix
@@ -29,6 +29,10 @@
     };
   };
 
+  services.hardware.bolt.enable = true;
+  services.udisks2.enable = true;
+  services.upower.enable = config.powerManagement.enable;
+
   programs.light.enable = true;
   programs.adb.enable = true;
 
diff --git a/home/fhauser/applications/sway.nix b/home/fhauser/applications/sway.nix
index 97a013c..7900960 100644
--- a/home/fhauser/applications/sway.nix
+++ b/home/fhauser/applications/sway.nix
@@ -131,7 +131,7 @@ in rec {
   systemd.user.services.network-manager-applet = adhereTheSwayTarget;
   systemd.user.services.nextcloud-client = adhereTheSwayTarget // {
     # For trayicon to work:
-    Unit.After = [ "waybar.service" ];
+    Unit.After = lib.mkForce [ "waybar.service" ];
     Service = {
       ExecStartPre = "${pkgs.coreutils}/bin/sleep 3";
       Environment = lib.mkForce
@@ -140,7 +140,7 @@ in rec {
   };
   systemd.user.services.owncloud-client = adhereTheSwayTarget // {
     # For trayicon to work:
-    Unit.After = [ "waybar.service" ];
+    Unit.After = lib.mkForce [ "waybar.service" ];
     Service = {
       ExecStartPre = "${pkgs.coreutils}/bin/sleep 3";
       Environment = lib.mkForce