From 5f3f5e8392ee8eb87b772b7f6590a7ca251571a4 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Mon, 3 Jun 2024 22:01:55 +0200
Subject: [PATCH] fixing stuff

---
 flake.nix                                     | 12 ++++++------
 nixos/{system/all => legacy}/borg-scripts.nix |  0
 nixos/machines/chungus/network-wireguard.nix  |  2 +-
 nixos/machines/chungus/services-s3.nix        |  2 +-
 nixos/system/all/default.nix                  | 18 ------------------
 5 files changed, 8 insertions(+), 26 deletions(-)
 rename nixos/{system/all => legacy}/borg-scripts.nix (100%)

diff --git a/flake.nix b/flake.nix
index 31e4334..4f09c4b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -312,8 +312,8 @@
 
           sternchen = clanSetup {
             name = "sternchen";
-            #host = "sternchen.bear";
-            host = "192.168.178.25";
+            host = "sternchen.bear";
+            #host = "192.168.178.25";
             modules = [
               nixos-hardware.nixosModules.lenovo-thinkpad-x220
               homeManagerModules
@@ -361,8 +361,8 @@
 
           cherry = clanSetup {
             name = "cherry";
-            host = "cherry";
-            #host = "cherry.bear";
+            #host = "cherry";
+            host = "cherry.bear";
             #host = "cherry.private";
             modules = [
               nixos-hardware.nixosModules.framework-13th-gen-intel
@@ -403,9 +403,9 @@
 
           orbi = clanSetup {
             name = "orbi";
-            #host = "orbi.bear";
+            host = "orbi.bear";
             #host = "orbi.private";
-            host = "95.216.66.212";
+            #host = "95.216.66.212";
             modules = [
               {
                 clan.networking.zerotier.controller = {
diff --git a/nixos/system/all/borg-scripts.nix b/nixos/legacy/borg-scripts.nix
similarity index 100%
rename from nixos/system/all/borg-scripts.nix
rename to nixos/legacy/borg-scripts.nix
diff --git a/nixos/machines/chungus/network-wireguard.nix b/nixos/machines/chungus/network-wireguard.nix
index 5af48fe..69cf561 100644
--- a/nixos/machines/chungus/network-wireguard.nix
+++ b/nixos/machines/chungus/network-wireguard.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, config, factsGenerator, ... }:
 {
   networking.firewall.allowedUDPPorts = [ 51820 ];
 
diff --git a/nixos/machines/chungus/services-s3.nix b/nixos/machines/chungus/services-s3.nix
index 4d45523..16532e5 100644
--- a/nixos/machines/chungus/services-s3.nix
+++ b/nixos/machines/chungus/services-s3.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, factsGenerator, ... }:
 {
 
   clanCore.facts.services.s3 = factsGenerator.password { name = "root"; service = "s3"; };
diff --git a/nixos/system/all/default.nix b/nixos/system/all/default.nix
index 083bb0e..7941162 100644
--- a/nixos/system/all/default.nix
+++ b/nixos/system/all/default.nix
@@ -7,25 +7,7 @@
     ./defaults.nix
     ./grub.nix
     ./packages.nix
-    ./borg-scripts.nix
 
   ];
 
-
-  # default backup excludes
-  backup.exclude = [ ".git" ".stfolder" ".stversions" ];
-
-  # Shell configuration
-  # -------------------
-  #programs.custom = {
-  #  bash.enable = true;
-  #  #zsh.enable = true;
-  #};
-
-  # This value determines the NixOS release with which your system is to be
-  # compatible, in order to avoid breaking some software such as database
-  # servers. You should change this only after NixOS release notes say you
-  # should.
-  #system.stateVersion = lib.mkDefault "19.03"; # Did you read the comment?
-
 }