From 0b566c81be3e1a9b586980880d849ed345897909 Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Thu, 22 Aug 2024 19:08:19 +0200
Subject: [PATCH] flake update switch jupiter to systemd-networkd disable jitsi

---
 flake.lock                               | 36 ++++++++++-----------
 hosts/jupiter/hardware-configuration.nix | 41 +++++++++---------------
 modules/services/server/default.nix      |  1 -
 3 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/flake.lock b/flake.lock
index dfca3bd..baf6ba7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -193,11 +193,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723399884,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "lastModified": 1723986931,
+        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1719091691,
-        "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
+        "lastModified": 1724146542,
+        "narHash": "sha256-MLxtqDtu+y/4UDhXX5pFypX9/qbH54TDP6Z90oFzd/A=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
+        "rev": "03fe473c731cda2900bae9894b8dfc68e3492db5",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723743257,
-        "narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=",
+        "lastModified": 1724304322,
+        "narHash": "sha256-/nrlMDubg9oG2VNANRBxsas5RbcJtB6IIDPZC3yHLW8=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "e4e0ca14918919300e04e80c34036028b4370640",
+        "rev": "924a18ea8df89a39166dd202f3e73cd022825768",
         "type": "github"
       },
       "original": {
@@ -336,11 +336,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1723310128,
-        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+        "lastModified": 1724067415,
+        "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
+        "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
         "type": "github"
       },
       "original": {
@@ -352,11 +352,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723688146,
-        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "lastModified": 1724242322,
+        "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "rev": "224042e9a3039291f22f4f2ded12af95a616cca0",
         "type": "github"
       },
       "original": {
@@ -384,11 +384,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
         "type": "github"
       },
       "original": {
diff --git a/hosts/jupiter/hardware-configuration.nix b/hosts/jupiter/hardware-configuration.nix
index f163ea8..34bd410 100644
--- a/hosts/jupiter/hardware-configuration.nix
+++ b/hosts/jupiter/hardware-configuration.nix
@@ -188,35 +188,24 @@
  
   swapDevices = [ { device = "/swap/swapfile"; } ];
   
+  systemd.network = {
+      enable = true;
+      networks = {
+          "10-lan" = {
+              matchConfig.Name = "enp6s18";
+              ntp = [ "192.168.2.1" ];
+              #domains = [ "home.opel-online.de" ];
+              networkConfig = {
+                DHCP = "yes";
+                IPv6AcceptRA = true;
+              };
+          };
+      };
+  };
   networking = {
     hostName = "jupiter";
     domain = "home.opel-online.de";
-    networkmanager = {
-      enable = false;
-    };
-    timeServers = [
-        "192.168.2.1"
-    ];
-    interfaces = {
-      enp6s18 = {
-        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
-#        ipv4.addresses = [ {
-#            address = "45.142.114.153";
-#            prefixLength = 24;
-#        } ];
-#        ipv6.addresses = [ {
-#            address = "2a00:ccc1:101:19D::2";
-#            prefixLength = 64;
-#        } ];
-#      };
-      };
-    };
-#    defaultGateway = "45.142.114.1";
-    defaultGateway6 = {
-      address = "fe80::1";
-      interface = "enp6s18";
-    };
-#    nameservers = [ "9.9.9.9" "2620:fe::fe" ];
+    useDHCP = false;                     # For versatility sake, manually edit IP on nm-applet.
     #firewall = {
     #  enable = false;
     #  #allowedUDPPorts = [ 53 67 ];
diff --git a/modules/services/server/default.nix b/modules/services/server/default.nix
index a907c01..910b770 100644
--- a/modules/services/server/default.nix
+++ b/modules/services/server/default.nix
@@ -17,7 +17,6 @@
   ./nextcloud.nix
   ./matrix.nix
   ./coturn.nix
-  ./jitsi.nix
   ./ollama.nix
 ]