final hp commit

roles/desktop.nix

@@ -43,6 +43,7 @@ in {
     noto-fonts-emoji
   ];
 
+  nixpkgs.config.allowUnfree = true;
   environment.systemPackages = with pkgs; [
     # firefox also needs:
     #
@@ -51,7 +52,7 @@ in {
     #
     # check in `about:support` that
     #  * Composing -> Webrenderer
-    unstable.firefox-bin
+    firefox-bin
     libva
     libva-utils
     mesa
@@ -60,9 +61,13 @@ in {
     mypaint
     mypaint-brushes
 
+    gsettings-desktop-schemas
+    glib  # provides gsettings
+    arc-theme
     capitaine-cursors
     elementary-xfce-icon-theme
     hicolor-icon-theme
+    numix-icon-theme
 
     alacritty
     imv
@@ -71,14 +76,14 @@ in {
     libsecret
     lxappearance
     mumble
-    mumble
     neofetch
     pavucontrol
+    pcmanfm
     pulseaudio
     pulsemixer
     unstable.keepassxc
     wl-clipboard
-    xfce.thunar
+    xdg_utils
     (
       pkgs.writeTextFile {
         name = "startsway";
@@ -88,12 +93,12 @@ in {
           #! ${pkgs.bash}/bin/bash
 
           export _JAVA_AWT_WM_NOREPARENTING=1
-          export MOZ_ENABLE_WAYLAND=1
-          export QT_AUTO_SCREEN_SCALE_FACTOR=0
+          export MOZ_ENABLE_WAYLAND=1 export QT_AUTO_SCREEN_SCALE_FACTOR=0
           export QT_WAYLAND_FORCE_DPI=96
           export QT_QPA_PLATFORM=wayland-egl
           export SDL_VIDEODRIVER=wayland
-          exec ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway
+
+          ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway
         '';
       }
     )
@@ -112,6 +117,8 @@ in {
     dataDir = "/home/stefan";
   };
 
+  services.avahi.enable = true;
+
   services.printing.enable = true;
   services.printing.drivers = [
     pkgs.gutenprint