From a552d304a3682eec05ebf3229e8f79e75ee697a0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 17 Sep 2018 00:39:39 +0200
Subject: ma x: syncthing runs as default user

---
 makefu/1systems/x/config.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'makefu/1systems/x')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 54a16a931..c11454eb8 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -43,6 +43,7 @@ with import <stockholm/lib>;
       <stockholm/makefu/2configs/mail-client.nix>
       <stockholm/makefu/2configs/printer.nix>
       <stockholm/makefu/2configs/task-client.nix>
+      # <stockholm/makefu/2configs/syncthing.nix>
 
       # Virtualization
       <stockholm/makefu/2configs/virtualisation/libvirt.nix>
@@ -149,4 +150,6 @@ with import <stockholm/lib>;
     "/home/makefu/backup/borgun"
     "/home/makefu/.mail/"
   ];
+  services.syncthing.user = lib.mkForce "makefu";
+  services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/";
 }
-- 
cgit v1.2.3


From 9af31259b8ffe879a471520248e15b4537db94b9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 17 Sep 2018 00:45:48 +0200
Subject: ma x: do not import stockholm libs if not required

---
 makefu/1systems/x/config.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'makefu/1systems/x')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index c11454eb8..97d11fbd3 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -1,9 +1,7 @@
 #
 #
 #
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-
+{ config, pkgs, lib, ... }:
 {
   imports =
     [ # base
-- 
cgit v1.2.3


From ddfce29ec614320ba95d236f45ff67c52e56feb3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 19 Sep 2018 02:53:18 +0200
Subject: ma x.r: use home-manager

---
 makefu/1systems/x/config.nix | 4 ++++
 makefu/1systems/x/source.nix | 1 +
 2 files changed, 5 insertions(+)

(limited to 'makefu/1systems/x')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 97d11fbd3..66d904512 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -7,6 +7,10 @@
     [ # base
       <stockholm/makefu>
       <stockholm/makefu/2configs/nur.nix>
+      <stockholm/makefu/2configs/home-manager>
+      <stockholm/makefu/2configs/home-manager/desktop.nix>
+      <stockholm/makefu/2configs/home-manager/cli.nix>
+      <stockholm/makefu/2configs/home-manager/mail.nix>
       <stockholm/makefu/2configs/main-laptop.nix>
       <stockholm/makefu/2configs/extra-fonts.nix>
       <stockholm/makefu/2configs/tools/all.nix>
diff --git a/makefu/1systems/x/source.nix b/makefu/1systems/x/source.nix
index 75af3255b..050fd39f7 100644
--- a/makefu/1systems/x/source.nix
+++ b/makefu/1systems/x/source.nix
@@ -6,5 +6,6 @@
   unstable = true;
   mic92 = true;
   clever_kexec = true;
+  home-manager = true;
   # torrent = true;
 }
-- 
cgit v1.2.3