From 218802b36fe6b51c42cfc7e0e68a908b675b85fc Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Sat, 18 May 2024 11:34:37 +0200
Subject: [PATCH 1/6] .

---
 home-manager/apps.nix             |  5 +++--
 home-manager/server-apps.nix      |  4 +++-
 machines/common/configuration.nix | 30 ++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/home-manager/apps.nix b/home-manager/apps.nix
index 71c1067..bc9d15f 100644
--- a/home-manager/apps.nix
+++ b/home-manager/apps.nix
@@ -6,7 +6,9 @@
   pkgs,
   ...
 }: {
-  imports = [];
+  imports = [
+    inputs.sops-nix.homeManager.sops
+  ];
 
   nixpkgs = {
     overlays = [
@@ -56,7 +58,6 @@
     reaper
     retext
     solaar
-    syncthing
     spotify
     thunderbird
     whatsapp-for-linux
diff --git a/home-manager/server-apps.nix b/home-manager/server-apps.nix
index 27dfe22..3ed68c5 100644
--- a/home-manager/server-apps.nix
+++ b/home-manager/server-apps.nix
@@ -6,7 +6,9 @@
   pkgs,
   ...
 }: {
-  imports = [];
+  imports = [
+    inputs.sops-nix.homeManagerModules.sops
+  ];
 
   nixpkgs = {
     overlays = [
diff --git a/machines/common/configuration.nix b/machines/common/configuration.nix
index a5b270a..eca3c4b 100644
--- a/machines/common/configuration.nix
+++ b/machines/common/configuration.nix
@@ -51,6 +51,36 @@
     fallbackDns = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
   };
 
+ # services.syncthing = {
+ #   enable = true;
+ #   user = "horseman";
+ #   dataDir = "/home/horseman";
+ #   configDir = "/home/horseman/.config/syncthing";
+ #   overrideDevices = true;
+ #   overrideFolders = true;
+ #   settings = {
+ #     devices = {
+ #       "luna" = ;
+ #       "terra" = ;
+ #       "solis" = ;
+ #     };
+ #     folders = {
+ #       "Documents" = {
+ #         path = "/home/horseman/Documents";
+ #         devices = [ "solis" "terra" "luna" ];
+ #       }:
+ #       "Programming" = {
+ #         path = "/home/horseman/Programming";
+ #         devices = [ "solis" "terra" "luna" ];
+ #       };
+ #     };
+ #     gui = {
+ #       user = ;
+ #       password = ;
+ #     };
+ #   };
+ # };
+
   users.users = {
     horseman = {
       initialPassword = "1234";

From 08267989d324c767bb394a8329342c59a146ba64 Mon Sep 17 00:00:00 2001
From: Mr Horseman <121057588+KoenDR06@users.noreply.github.com>
Date: Sat, 18 May 2024 11:50:06 +0200
Subject: [PATCH 2/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6e21b59..900ba14 100644
--- a/README.md
+++ b/README.md
@@ -9,4 +9,4 @@
     * Whatsapp
 
 * Configure Display setup and refresh rate
-* Rebuild: sudo nixos-rebuild switch --flake .#hostname
\ No newline at end of file
+* Rebuild: update .#hostname

From 83e1d4b960f6abe26fe3ea21ce99747af846ca2d Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Sat, 18 May 2024 12:01:24 +0200
Subject: [PATCH 3/6] Removed sops from home-manager

---
 home-manager/apps.nix        | 2 +-
 home-manager/server-apps.nix | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/home-manager/apps.nix b/home-manager/apps.nix
index bc9d15f..ff0829e 100644
--- a/home-manager/apps.nix
+++ b/home-manager/apps.nix
@@ -7,7 +7,7 @@
   ...
 }: {
   imports = [
-    inputs.sops-nix.homeManager.sops
+    ./plasma.nix
   ];
 
   nixpkgs = {
diff --git a/home-manager/server-apps.nix b/home-manager/server-apps.nix
index 3ed68c5..27dfe22 100644
--- a/home-manager/server-apps.nix
+++ b/home-manager/server-apps.nix
@@ -6,9 +6,7 @@
   pkgs,
   ...
 }: {
-  imports = [
-    inputs.sops-nix.homeManagerModules.sops
-  ];
+  imports = [];
 
   nixpkgs = {
     overlays = [

From e2fa43cbf6e3eade6d0f8c879b69589bc37b986e Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Sat, 18 May 2024 12:02:25 +0200
Subject: [PATCH 4/6] Created plasma.nix

---
 home-manager/plasma.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 home-manager/plasma.nix

diff --git a/home-manager/plasma.nix b/home-manager/plasma.nix
new file mode 100644
index 0000000..2f9333c
--- /dev/null
+++ b/home-manager/plasma.nix
@@ -0,0 +1,13 @@
+{ pkgs, ...}:
+{
+  imports = [
+    <plasma-manager/modules>
+  ];
+
+  programs = {
+    plasma = {
+      enable = true;
+      # etc.
+    };
+  };
+}

From df92702762e613199a45ed17779b7a86f8714414 Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Sat, 18 May 2024 12:18:02 +0200
Subject: [PATCH 5/6] Reverted importing plasma.nix

---
 home-manager/apps.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/home-manager/apps.nix b/home-manager/apps.nix
index ff0829e..bd391f8 100644
--- a/home-manager/apps.nix
+++ b/home-manager/apps.nix
@@ -6,9 +6,7 @@
   pkgs,
   ...
 }: {
-  imports = [
-    ./plasma.nix
-  ];
+  imports = [];
 
   nixpkgs = {
     overlays = [

From 9d1c36150aa7e5fd09020f33e8e997a102c8c4b8 Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Sat, 18 May 2024 12:21:14 +0200
Subject: [PATCH 6/6] Added fzf to server-apps.nix

---
 home-manager/server-apps.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/server-apps.nix b/home-manager/server-apps.nix
index 27dfe22..1536805 100644
--- a/home-manager/server-apps.nix
+++ b/home-manager/server-apps.nix
@@ -28,6 +28,7 @@
   # Enable programs
   home.packages = with pkgs; [
     docker-compose
+    fzf
     htop
     gnupg
     jdk