roles/desktop.nix

@@ -28,7 +28,7 @@ in {
   xdg.portal = {
     enable = true;
     gtkUsePortal = true;
-    extraPortals = with pkgs; [
+    extraPortals = with unstable; [
       xdg-desktop-portal-gtk
       xdg-desktop-portal-wlr
     ];
@@ -83,7 +83,6 @@ in {
     hicolor-icon-theme
     numix-icon-theme
 
-    alacritty
     imv
     inkscape
     libqrencode
@@ -98,7 +97,7 @@ in {
     pulsemixer
     wl-clipboard
     xdg_utils
-    xfce.thunar
+    unstable.alacritty
     unstable.keepassxc
     (
       pkgs.writeTextFile {
@@ -108,17 +107,11 @@ 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 MOZ_USE_XINPUT2=1
-          export QT_AUTO_SCREEN_SCALE_FACTOR=0
-          export QT_QPA_PLATFORM=wayland-egl
+          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
-          export XDG_CURRENT_DESKTOP=sway
-          export XDG_SESSION_TYPE=wayland
 
           ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway
         '';
@@ -129,6 +122,11 @@ 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";

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
   ];

roles/private.nix

@@ -14,10 +14,4 @@ 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" ];
-  };
 }