From c2406e4c7ccacda387e86e2b7620c245689a5699 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Wed, 28 Oct 2020 22:48:31 +0100
Subject: [PATCH 1/4] use stable pkgs on nixos 20.09

---
 roles/desktop.nix | 4 ++--
 roles/dev.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index 5b7d7c4..e2bb1a4 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -28,7 +28,7 @@ in {
   xdg.portal = {
     enable = true;
     gtkUsePortal = true;
-    extraPortals = with unstable; [
+    extraPortals = with pkgs; [
       xdg-desktop-portal-gtk
       xdg-desktop-portal-wlr
     ];
@@ -83,6 +83,7 @@ in {
     hicolor-icon-theme
     numix-icon-theme
 
+    alacritty
     imv
     inkscape
     libqrencode
@@ -97,7 +98,6 @@ in {
     pulsemixer
     wl-clipboard
     xdg_utils
-    unstable.alacritty
     unstable.keepassxc
     (
       pkgs.writeTextFile {
diff --git a/roles/dev.nix b/roles/dev.nix
index 73b477e..9a9d598 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -15,10 +15,10 @@ in {
     unstable.gopls
     unstable.rust-analyzer
 
+    emacs
+    ltrace
     sops
     tig
-    ltrace
-    unstable.emacs
 
     openssl pkg-config nasm cmake zlib gcc binutils-unwrapped
   ];

From 745f613755be0dd85ead11a87775e1bcdea634d7 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Wed, 28 Oct 2020 22:49:45 +0100
Subject: [PATCH 2/4] use systemd automount

---
 roles/desktop.nix | 5 -----
 roles/private.nix | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index e2bb1a4..5e7c5fe 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -122,11 +122,6 @@ in {
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
-  services.gvfs = {
-    enable = true;
-    package = lib.mkForce pkgs.gnome3.gvfs;
-  };
-
   services.syncthing = {
     enable = true;
     dataDir = "/home/stefan";
diff --git a/roles/private.nix b/roles/private.nix
index 8ce8d02..0776b19 100644
--- a/roles/private.nix
+++ b/roles/private.nix
@@ -14,4 +14,10 @@ in {
     openscad
     kicad
   ];
+
+  fileSystems."/mnt/nfs" = {
+    device = "10.1.20.29:/srv/nfs";
+    fsType = "nfs";
+    options = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=120" ];
+  };
 }

From 3b58151811157c870a05bab9b5d3cc7aa61a98ef Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Wed, 28 Oct 2020 22:50:12 +0100
Subject: [PATCH 3/4] add thunar (works in 20.09)

---
 roles/desktop.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index 5e7c5fe..6c02e94 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -98,6 +98,7 @@ in {
     pulsemixer
     wl-clipboard
     xdg_utils
+    xfce.thunar
     unstable.keepassxc
     (
       pkgs.writeTextFile {

From c8b176751f2bdba9508b818319200c5be1c98c70 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Wed, 28 Oct 2020 22:50:27 +0100
Subject: [PATCH 4/4] more env

---
 roles/desktop.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index 6c02e94..87a631f 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -108,11 +108,17 @@ in {
         text = ''
           #! ${pkgs.bash}/bin/bash
 
+          export GTK_ICON_THEME=Tango
+          export GTK_THEME=Blackbird
           export _JAVA_AWT_WM_NOREPARENTING=1
-          export MOZ_ENABLE_WAYLAND=1 export QT_AUTO_SCREEN_SCALE_FACTOR=0
-          export QT_WAYLAND_FORCE_DPI=96
+          export MOZ_ENABLE_WAYLAND=1
+          export MOZ_USE_XINPUT2=1
+          export QT_AUTO_SCREEN_SCALE_FACTOR=0
           export QT_QPA_PLATFORM=wayland-egl
+          export QT_WAYLAND_FORCE_DPI=96
           export SDL_VIDEODRIVER=wayland
+          export XDG_CURRENT_DESKTOP=sway
+          export XDG_SESSION_TYPE=wayland
 
           ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway
         '';