From 522437b1df1978df2c306567790daf313d5a5258 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Thu, 7 Sep 2023 22:55:37 -0400
Subject: [PATCH] use user-level tmpfiles.d

---
 hosts/moms-laptop/main.nix     | 20 ++++++++++----------
 hosts/moms-laptop/printing.nix |  9 ++++++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/hosts/moms-laptop/main.nix b/hosts/moms-laptop/main.nix
index b7cc897..bd86443 100644
--- a/hosts/moms-laptop/main.nix
+++ b/hosts/moms-laptop/main.nix
@@ -65,16 +65,16 @@ _: {
     initrd.availableKernelModules = ["xhci-pci" "ehci-pci" "ahci" "usbhid" "sd_mod" "sr_mod" "rtsx_usb_sdmmc"];
     kernelModules = ["kvm-intel"];
   };
-  systemd.tmpfiles.rules = [
-    "L+ /home/jo/Desktop/gimp.desktop - - - - ${pkgs.gimp}/share/applications/gimp.desktop"
-    "L+ /home/jo/Desktop/org.gnome.Calculator.desktop - - - - ${pkgs.gnome.gnome-calculator}/share/applications/org.gnome.Calculator.desktop"
-    "L+ /home/jo/Desktop/org.nomacs.ImageLounge.desktop - - - - ${pkgs.nomacs}/share/applications/org.nomacs.ImageLounge.desktop"
-    "L+ /home/jo/Desktop/thunar.desktop - - - - ${pkgs.xfce.thunar}/share/applications/thunar.desktop"
-    "L+ /home/jo/Desktop/librewolf.desktop - - - - ${pkgs.librewolf}/share/applications/librewolf.desktop"
-    "L+ /home/jo/Desktop/vlc.desktop - - - - ${pkgs.vlc}/share/applications/vlc.desktop"
-    "L /home/jo/Desktop/Downloads - - - - /home/jo/Downloads"
-    "L /home/jo/Desktop/Documents - - - - /home/jo/Documents"
-    "L /home/jo/Desktop/Pictures - - - - /home/jo/Pictures"
+  systemd.user.tmpfiles.users.jo.rules = [
+    "L+ %h/Desktop/gimp.desktop - - - - ${pkgs.gimp}/share/applications/gimp.desktop"
+    "L+ %h/Desktop/org.gnome.Calculator.desktop - - - - ${pkgs.gnome.gnome-calculator}/share/applications/org.gnome.Calculator.desktop"
+    "L+ %h/Desktop/org.nomacs.ImageLounge.desktop - - - - ${pkgs.nomacs}/share/applications/org.nomacs.ImageLounge.desktop"
+    "L+ %h/Desktop/thunar.desktop - - - - ${pkgs.xfce.thunar}/share/applications/thunar.desktop"
+    "L+ %h/Desktop/librewolf.desktop - - - - ${pkgs.librewolf}/share/applications/librewolf.desktop"
+    "L+ %h/Desktop/vlc.desktop - - - - ${pkgs.vlc}/share/applications/vlc.desktop"
+    "L %h/Desktop/Downloads - - - - %h/Downloads"
+    "L %h/Desktop/Documents - - - - %h/Documents"
+    "L %h/Desktop/Pictures - - - - %h/Pictures"
   ];
 
   system.stateVersion = "23.05";
diff --git a/hosts/moms-laptop/printing.nix b/hosts/moms-laptop/printing.nix
index 2989920..90a63cf 100644
--- a/hosts/moms-laptop/printing.nix
+++ b/hosts/moms-laptop/printing.nix
@@ -1,8 +1,11 @@
-_: {pkgs, ...}: {
+_: {pkgs, ...}: let
+  xsane =
+    pkgs.xsane.override {gimpSupport = true;};
+in {
   local.allowedUnfree = ["hplip"];
   environment.systemPackages = [
+    xsane
     pkgs.gimp
-    (pkgs.xsane.override {gimpSupport = true;})
     pkgs.libreoffice
   ];
   users.users.jo.extraGroups = ["scanner" "lp" "cups"];
@@ -10,7 +13,7 @@ _: {pkgs, ...}: {
     enable = true;
     extraBackends = [pkgs.hplipWithPlugin];
   };
-  systemd.tmpfiles.rules = ["L /home/jo/.config/GIMP/2.10/plug-ins/xsane - - - - /run/current-system/sw/bin/xsane"];
+  systemd.user.tmpfiles.users.jo.rules = ["L %h/.config/GIMP/2.10/plug-ins/xsane - - - - ${xsane}"];
   services = {
     printing = {
       enable = true;