From 5112093b26f33a41d8dfd489c990d8ea1f13941b Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sun, 17 Dec 2023 19:05:25 +0100
Subject: [PATCH] add syncthing

---
 nixos/components/gui/browser.nix                |  6 ------
 nixos/components/gui/xorg/default.nix           | 11 -----------
 nixos/machines/cherry/configuration.nix         |  2 ++
 nixos/machines/cream/configuration.nix          |  8 ++++++++
 nixos/machines/cream/hardware-configuration.nix |  4 ----
 nixos/system/all/syncthing.nix                  |  5 +++--
 6 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/nixos/components/gui/browser.nix b/nixos/components/gui/browser.nix
index a9d6538..6abc481 100644
--- a/nixos/components/gui/browser.nix
+++ b/nixos/components/gui/browser.nix
@@ -39,12 +39,6 @@ in
           homeBackup = "${backupFolder}/jobrad-chrome";
           gpu = false;
         };
-        #jobrad-chrome = {
-        #  browserType = "chrome";
-        #  home = "${homeFolder}/jobrad-chrome";
-        #  homeBackup = "${backupFolder}/jobrad-chrome";
-        #  gpu = false;
-        #};
         firefox-tmp = {
           browserType = "firefox";
           home = "${homeFolder}/firefox-tmp";
diff --git a/nixos/components/gui/xorg/default.nix b/nixos/components/gui/xorg/default.nix
index d4a462a..4d7a3d1 100644
--- a/nixos/components/gui/xorg/default.nix
+++ b/nixos/components/gui/xorg/default.nix
@@ -12,8 +12,6 @@ with lib;
 
       enable = true;
 
-      # window-manager : Xmonad
-      # -----------------------
       displayManager = {
         defaultSession = lib.mkDefault "none+i3";
         autoLogin.enable = lib.mkDefault true;
@@ -23,7 +21,6 @@ with lib;
 
       desktopManager = {
         xterm.enable = false;
-        #gnome3.enable = lib.mkDefault true;
       };
       windowManager = {
         xmonad.enable = true;
@@ -45,9 +42,6 @@ with lib;
         };
       };
 
-      # Wacom configuraton
-      # ------------------
-      modules = [ pkgs.xf86_input_wacom ];
     };
 
     # Packages
@@ -72,11 +66,6 @@ with lib;
     # across different files
     # just add a file into `/etc/X11/Xresource.d/` and it will be
     # evaluated.
-    # todo this is better:
-    #include "/etc/X11/Xresources.d/xterm"
-    #include "/etc/X11/Xresources.d/rxvt-unicode"
-    #include "/etc/X11/Xresources.d/fonts"
-    #include "/etc/X11/Xresources.d/xscreensaver"
     services.xserver.displayManager.sessionCommands = ''
       for file in `ls /etc/X11/Xresource.d/`
       do
diff --git a/nixos/machines/cherry/configuration.nix b/nixos/machines/cherry/configuration.nix
index 7613875..1dddec1 100644
--- a/nixos/machines/cherry/configuration.nix
+++ b/nixos/machines/cherry/configuration.nix
@@ -24,6 +24,8 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.tmp.useTmpfs = true; # make /tmp a tmpfs (performance!)
 
+  sops.secrets.pushover_user_key = { };
+  sops.secrets.pushover_api_key = { };
 
   components.gui.enable = true;
   components.mainUser.enable = true;
diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix
index cdba9d6..064adba 100644
--- a/nixos/machines/cream/configuration.nix
+++ b/nixos/machines/cream/configuration.nix
@@ -21,6 +21,14 @@
 
   ];
 
+  sops.secrets.pushover_user_key = { };
+  sops.secrets.pushover_api_key = { };
+
+  # Use the systemd-boot EFI boot loader, not grub
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.tmp.useTmpfs = true; # make /tmp a tmpfs (performance!)
+
   components.gui.enable = true;
   components.mainUser.enable = true;
   components.media.enable = true;
diff --git a/nixos/machines/cream/hardware-configuration.nix b/nixos/machines/cream/hardware-configuration.nix
index 54311ce..7a08bd3 100644
--- a/nixos/machines/cream/hardware-configuration.nix
+++ b/nixos/machines/cream/hardware-configuration.nix
@@ -14,10 +14,6 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  # Use the systemd-boot EFI boot loader, not grub
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.tmp.useTmpfs = true; # make /tmp a tmpfs (performance!)
 
   boot.initrd.luks.devices = {
     pool = {
diff --git a/nixos/system/all/syncthing.nix b/nixos/system/all/syncthing.nix
index 8f4aadf..c23e9d8 100644
--- a/nixos/system/all/syncthing.nix
+++ b/nixos/system/all/syncthing.nix
@@ -27,6 +27,7 @@ with lib; {
       // (device "mobi" "NGI7UN6-MR2YPYI-L7DGN3I-JFZU2N3-RJBJV6K-2VZVQSJ-PWLZYOK-PXZYRAF")
       // (device "bobi" "FOJ3D27-W5OJMQR-7S77A3V-AS5BCG2-CIGWVMP-UBSVQNN-QZLHAIZ-IO7GKAE")
       // (device "cream" "MQVKATH-THTPET5-KYAT7XX-BOIIIBA-P7OOF7Y-IWAUN53-S2VNVOY-BZWTGQK")
+      // (device "cherry" "WX2HZQ7-WAOL6YR-QJYFS2L-SVUJQB4-SKHZHVE-J7XCWLQ-6GRATXX-VJUMOAH")
       // (device "chungus" "GZGW2YW-6RRUPDN-LFAOATC-56FS7LH-YC7R32N-LVA5JUX-3LSBYOX-BFR67QZ")
       // {
         bumba = {
@@ -80,7 +81,7 @@ with lib; {
         enable = lib.mkDefault false;
         #watch = lib.mkDefault false;
         path = lib.mkDefault "/tmp/password-store";
-        devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
+        devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" "cherry" ];
         versioning = {
           type = "simple";
           params.keep = "10";
@@ -90,7 +91,7 @@ with lib; {
         enable = lib.mkDefault false;
         #watch = lib.mkDefault false;
         path = lib.mkDefault "/tmp/desktop";
-        devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
+        devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" "cherry" ];
       };
       finance = {
         enable = lib.mkDefault false;