Revert "try gnome out for a bit; use a bunch of flatpaks instead of nix pkgs"

This reverts commit 36e4d70eec.

hosts/desktops/common/packages.nix

@@ -19,29 +19,55 @@ in
       aspellDicts.pt_BR
       bat
       clonehero
+      creality-print
       deploy-rs
       distrobox
+      exhibit
       fd
+      filelight
+      firefox
       fzf
-      ghostty
+      gimp
-      gnome-tweaks
+      heroic
+      itch
+      inkscape
+      junction
+      kde-rounded-corners
+      krita
       libfido2
+      libreoffice-qt
       # lilipod BROKEN
       mangohud
+      microsoft-edge
       mission-center
+      mpv
+      nextcloud-client
       nixfmt-rfc-style
       nix-init
       nix-output-monitor
+      obsidian
+      obs-studio
       ocs-url
-      # orca-slicer BROKEN
+      orca-slicer
+      openscad
       p7zip
       plasticity
+      prismlauncher
       protonup
-      # quickgui BROKEN
+      # quickgui
+      qbittorrent
+      qview
       ripgrep
+      rnote
+      solvespace
+      space-cadet-pinball
       sparrow
+      steam-run
+      tor-browser
+      ungoogled-chromium
       unrar
       ventoy
+      vesktop
       wezterm
     ]
     ++ kdepkgs;
@@ -49,29 +75,9 @@ in
   services.flatpak = {
     enable = true;
     packages = [
-      "com.github.flxzt.rnote"
-      "com.github.k4zmu2a.spacecadetpinball"
-      "com.heroicgameslauncher.hgl"
-      "com.mattjakeman.ExtensionManager"
-      "com.microsoft.Edge"
-      "com.modrinth.ModrinthApp"
-      "com.nextcloud.desktopclient.nextcloud"
-      "com.obsproject.Studio"
       "com.steamgriddb.SGDBoop"
-      "dev.vencord.Vesktop"
-      "io.github.giantpinkrobots.varia"
-      "io.github.ungoogled_software.ungoogled_chromium"
       "io.github.zen_browser.zen"
-      "io.itch.itch"
+      "org.gtk.Gtk3theme.adw-gtk3-dark"
-      "md.obsidian.Obsidian"
-      "org.gimp.GIMP"
-      "org.gnome.Showtime"
-      "org.inkscape.Inkscape"
-      "org.kde.krita"
-      "org.libreoffice.LibreOffice"
-      "org.mozilla.firefox"
-      "org.torproject.torbrowser-launcher"
-      "re.sonny.Junction"
     ];
     uninstallUnmanaged = true;
     update.auto.enable = true;
@@ -111,6 +117,7 @@ in
       elisa
       gwenview
       khelpcenter
+      konsole
       oxygen
     ]
   );

hosts/desktops/common/services.nix

@@ -9,11 +9,7 @@
   services = {
     printing.enable = true;
     udev.packages = with pkgs; [ yubikey-personalization ];
-    xserver = {
+    desktopManager.plasma6.enable = true;
-      enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-    };
     tailscale.useRoutingFeatures = "client";
     nginx = {
       enable = true;
@@ -27,30 +23,30 @@
       jack.enable = true;
       wireplumber.enable = true;
     };
-    # greetd = {
+    greetd = {
-    #   enable = true;
+      enable = true;
-    #   settings = {
+      settings = {
-    #     default_session.command =
+        default_session.command =
-    #       let
+          let
-    #         xSessions = "${config.services.displayManager.sessionData.desktops}/share/xsessions";
+            xSessions = "${config.services.displayManager.sessionData.desktops}/share/xsessions";
-    #         wlSessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
+            wlSessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
-    #       in
+          in
-    #       ''
+          ''
-    #         ${pkgs.greetd.tuigreet}/bin/tuigreet \
+            ${pkgs.greetd.tuigreet}/bin/tuigreet \
-    #         --remember \
+            --remember \
-    #         --asterisks \
+            --asterisks \
-    #         --time \
+            --time \
-    #         --greeting "NixOS" \
+            --greeting "NixOS" \
-    #         --sessions ${xSessions}:${wlSessions}
+            --sessions ${xSessions}:${wlSessions}
-    #       '';
+          '';
-    #     initial_session = {
+        initial_session = {
-    #       command = ''
+          command = ''
-    #         ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null
+            ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null
-    #       '';
+          '';
-    #       user = "user";
+          user = "user";
-    #     };
+        };
-    #   };
+      };
-    # };
+    };
   };
 
   xdg.portal = {

hosts/desktops/common/stylix.nix

@@ -10,7 +10,7 @@
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
     cursor = {
       package = pkgs.kdePackages.breeze-icons;
-      name = "Breeze_Snow";
+      name = "Breeze_Light";
       size = 24;
     };
     opacity = {

hosts/desktops/rotterdam.nix

@@ -56,7 +56,7 @@ in
 
   environment.systemPackages = with pkgs; [ reboot-into-qubes ];
 
-  # hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
+  hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
 
   systemd.targets.hibernate.enable = false; # disable non-functional hibernate
 

users/desktops/user.nix

@@ -7,6 +7,4 @@
     # Desktop-common imports
     ./common
   ];
-
-  stylix.targets.gtk.flatpakSupport.enable = false;
 }