From 69a196282721f32cf39b159fff725c6a65df694d Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 7 Apr 2022 18:50:58 +0200
Subject: [PATCH] flammea: sway

---
 flake.nix           |  2 +-
 flammea.nix         | 20 ++++++++++----------
 gcr-wrapgapps.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 sway.nix            |  6 ++++--
 4 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 gcr-wrapgapps.patch

diff --git a/flake.nix b/flake.nix
index 47a420b..382715c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
 
     channels.nixpkgs.input = nixpkgs;
 
-    channels.nixpkgs.patches = [ ];
+    channels.nixpkgs.patches = [ ./gcr-wrapgapps.patch ];
 
     nix.generateRegistryFromInputs = true;
 
diff --git a/flammea.nix b/flammea.nix
index 64dac97..6d5f297 100644
--- a/flammea.nix
+++ b/flammea.nix
@@ -4,8 +4,8 @@
   imports =
     [
       ./common-headless.nix
-      # ./sway.nix
-      ./i3.nix
+      ./sway.nix
+      # ./i3.nix
       ./large-sw.nix
       ./uefi.nix
       ./fstrim.nix
@@ -78,7 +78,7 @@
   services.thermald.enable = true;
 
   virtualisation.virtualbox.host = {
-    enable = true;
+    # enable = true;
     # enableExtensionPack = true;
   };
   # nixpkgs.config.allowUnfree = true;
@@ -96,7 +96,7 @@
 
   hardware.opengl.extraPackages = with pkgs; [
     rocm-opencl-icd
-    # rocm-runtime-ext
+    rocm-runtime
   ];
 
   # services.nix-serve = {
@@ -122,12 +122,12 @@
   # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
   # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_5_8;
 
-  services.xserver = {
-    videoDrivers = [ "amdgpu" ];
-    deviceSection = ''
-      Option "TearFree" "on"
-    '';
-  };
+  # services.xserver = {
+  #   videoDrivers = [ "amdgpu" ];
+  #   deviceSection = ''
+  #     Option "TearFree" "on"
+  #   '';
+  # };
 
   services.ratbagd.enable = true;
 
diff --git a/gcr-wrapgapps.patch b/gcr-wrapgapps.patch
new file mode 100644
index 0000000..15c0a23
--- /dev/null
+++ b/gcr-wrapgapps.patch
@@ -0,0 +1,42 @@
+commit d8d3deb8d91c01892f70e7e5ab7fdf182ab6d71d
+Author: Gabriel Ebner <gebner@gebner.org>
+Date:   Sat Apr 2 12:59:35 2022 +0200
+
+    gcr: use wrapGAppsHook
+    
+    The manual wrapProgram invocation missed binaries in libexec.
+
+diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
+index b277a52a658..6c1c3de08a2 100644
+--- a/pkgs/development/libraries/gcr/default.nix
++++ b/pkgs/development/libraries/gcr/default.nix
+@@ -16,7 +16,7 @@
+ , openssh
+ , systemd
+ , gobject-introspection
+-, makeWrapper
++, wrapGAppsHook
+ , libxslt
+ , vala
+ , gnome
+@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
+     gettext
+     gobject-introspection
+     libxslt
+-    makeWrapper
++    wrapGAppsHook
+     vala
+     shared-mime-info
+   ];
+@@ -96,11 +96,6 @@ stdenv.mkDerivation rec {
+     patchShebangs meson_post_install.py
+   '';
+ 
+-  preFixup = ''
+-    wrapProgram "$out/bin/gcr-viewer" \
+-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+-  '';
+-
+   passthru = {
+     updateScript = gnome.updateScript {
+       packageName = pname;
diff --git a/sway.nix b/sway.nix
index 6c02090..e0555c5 100644
--- a/sway.nix
+++ b/sway.nix
@@ -28,7 +28,7 @@
     desktop-file-utils shared-mime-info
     glib gtk3
     glib-networking gvfs dconf
-    gnome-themes-extra defaultIconTheme
+    gnome-themes-extra gnome3.adwaita-icon-theme
     hicolor-icon-theme
 
     # for QT_QPA_PLATFORM=wayland
@@ -46,6 +46,8 @@
   programs.sway = {
     enable = true;
 
+    wrapperFeatures.gtk = true;
+
     extraSessionCommands = ''
       export SDL_VIDEODRIVER=wayland
 
@@ -70,7 +72,7 @@
   services.xserver = {
     enable = true;
     libinput.enable = true;
-    displayManager.lightdm.enable = true;
+    # displayManager.lightdm.enable = true;
     displayManager.defaultSession = "sway";
   };