From 995e6597d0e5f4c2f4c8f28a0ad511fb95255e03 Mon Sep 17 00:00:00 2001
From: Mans Ziesel <mans@mziesel.com>
Date: Sat, 8 Jul 2023 18:28:09 +0200
Subject: [PATCH] zooi

---
 home-manager/home.nix              |  8 +++-
 nixos/machines/pc-mans/network.nix | 68 +++++++++++++++---------------
 2 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index bcf129b..b1888a2 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -67,10 +67,16 @@
     pkg-config 
     fontconfig
     jetbrains.datagrip
+    firefox
+    dig
+    python3
+    ansible
+    nodejs_20
   ];
 
-  services.owncloud-client = {
+  services.nextcloud-client = {
     enable = true;
+    startInBackground = true;
   };
 
   services.dunst.enable = true;
diff --git a/nixos/machines/pc-mans/network.nix b/nixos/machines/pc-mans/network.nix
index 4a44a65..2f227c3 100644
--- a/nixos/machines/pc-mans/network.nix
+++ b/nixos/machines/pc-mans/network.nix
@@ -1,7 +1,7 @@
 # networking.nix
 
 # Import the necessary modules
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # Set the network interface configuration
@@ -16,39 +16,39 @@
   # networking.firewall.enable = true;
 
   # Enable WireGuard
-  networking.wireguard.interfaces = {
-    # "wg0" is the network interface name. You can name the interface arbitrarily.
-    wg0 = {
-      # Determines the IP address and subnet of the client's end of the tunnel interface.
-      ips = [ "10.100.0.2/24" ];
-      listenPort = 51820; # to match firewall allowedUDPPorts (without this wg uses random port numbers)
-
-      # Path to the private key file.
-      #
-      # Note: The private key can also be included inline via the privateKey option,
-      # but this makes the private key world-readable; thus, using privateKeyFile is
-      # recommended.
-      privateKeyFile = "/etc/wireguard/private";
-
-      peers = [
-        {
-          # Public key of the server (not a file path).
-          publicKey = "Q6kxhwGhqOyaGyyO4lum83WpJqjsj71Ab4gvUau2zCI=";
-
-          # Forward all the traffic via VPN.
-          allowedIPs = [ "0.0.0.0/0" ];
-          # Or forward only particular subnets
-          #allowedIPs = [ "10.100.0.1" "91.108.12.0/22" ];
-
-          # Set this to the server IP and port.
-          endpoint = "192.168.2.11:51820"; # ToDo: route to endpoint not automatically configured https://wiki.archlinux.org/index.php/WireGuard#Loop_routing https://discourse.nixos.org/t/solved-minimal-firewall-setup-for-wireguard-client/7577
-
-          # Send keepalives every 25 seconds. Important to keep NAT tables alive.
-          persistentKeepalive = 25;
-        }
-      ];
-    };
-  };
+#  networking.wireguard.interfaces = {
+#    # "wg0" is the network interface name. You can name the interface arbitrarily.
+#    wg0 = {
+#      # Determines the IP address and subnet of the client's end of the tunnel interface.
+#      ips = [ "10.100.0.2/32" ];
+#      listenPort = 51820; # to match firewall allowedUDPPorts (without this wg uses random port numbers)
+#
+#      # Path to the private key file.
+#      #
+#      # Note: The private key can also be included inline via the privateKey option,
+#      # but this makes the private key world-readable; thus, using privateKeyFile is
+#      # recommended.
+#      privateKeyFile = "/etc/wireguard/private";
+#
+#      peers = [
+#        {
+#          # Public key of the server (not a file path).
+#          publicKey = "50NPXiWR+l3nwS/fRUESOt9bMnS3L19aHG7lgxcFBlo=";
+#
+#          # Forward all the traffic via VPN.
+#          allowedIPs = [ "0.0.0.0/0" ];
+#          # Or forward only particular subnets
+#          #allowedIPs = [ "10.100.0.1" "91.108.12.0/22" ];
+#
+#          # Set this to the server IP and port.
+#          endpoint = "192.168.2.253:51820"; # ToDo: route to endpoint not automatically configured https://wiki.archlinux.org/index.php/WireGuard#Loop_routing https://discourse.nixos.org/t/solved-minimal-firewall-setup-for-wireguard-client/7577
+#
+#          # Send keepalives every 25 seconds. Important to keep NAT tables alive.
+#          persistentKeepalive = 25;
+#        }
+#      ];
+#    };
+#  };
 
   # Set the hostname
   networking.hostName = "pc-mans";