From 6ce39ae86918f1870603cf9685fd40742efcfc9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 10 Jun 2022 15:25:11 +0200
Subject: Some samba-wsdd and oldvpn for binky

---
 flake.lock                | 16 ++++++++--------
 nixos/machine/binky.nix   |  3 +++
 nixos/modules/desktop.nix |  7 +++++++
 nixos/modules/generic.nix |  5 +++--
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4b18507..d111fbc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -106,11 +106,11 @@
     },
     "personal-secret": {
       "locked": {
-        "lastModified": 1654761075,
-        "narHash": "sha256-wzG0P8A9p7ca8S4NnKB42OlhSj8TZX5PlqVvnm9m0vM=",
+        "lastModified": 1654865533,
+        "narHash": "sha256-eG+wZkWMbN7WVz8OxfoRf/tB5V4WW6XbvqhgKZ9THmE=",
         "ref": "refs/heads/master",
-        "rev": "a5a2d42e69ef2b10ec5753a976d36228916090b1",
-        "revCount": 9,
+        "rev": "fa6211f32cdb0318806d26abb15114fde6a75fe1",
+        "revCount": 10,
         "type": "git",
         "url": "ssh://git@cynerd.cz/nixos-personal-secret"
       },
@@ -134,11 +134,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1654780370,
-        "narHash": "sha256-IYqHhFNG8GP4P3dI8DCUR9lrlr+QHsEfGJ6Qf7pCem0=",
+        "lastModified": 1654863350,
+        "narHash": "sha256-qpnYgHWtK2FmnXRhn0yooW8cDfr7vC5ZFpG9fvyARaY=",
         "ref": "refs/heads/master",
-        "rev": "9e4f4d2631b2d9ba537f25299c5d9fc5783ca776",
-        "revCount": 55,
+        "rev": "fe900d86a3ade098bad9d99d7c53806df32a9077",
+        "revCount": 56,
         "type": "git",
         "url": "https://git.cynerd.cz/shellrc"
       },
diff --git a/nixos/machine/binky.nix b/nixos/machine/binky.nix
index 849c719..26ffe1d 100644
--- a/nixos/machine/binky.nix
+++ b/nixos/machine/binky.nix
@@ -54,6 +54,9 @@ with lib;
       dataDir = "/home/cynerd";
       configDir = "/home/cynerd/.config/syncthing";
     };
+    services.openvpn.servers.oldpersonal = {
+      config = "config /run/secrets/old.ovpn";
+    };
 
   };
 
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 41efa0b..c67ae01 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -131,6 +131,13 @@ in {
       ];
     };
 
+    services.samba-wsdd = {
+      enable = true;
+      discovery = true;
+    };
+    networking.firewall.allowedTCPPorts = [ 5357 ];
+    networking.firewall.allowedUDPPorts = [ 3702 ];
+
     fonts.fonts = with pkgs; [
       arkpandora_ttf
       corefonts
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index 31f0829..546e04a 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -31,6 +31,7 @@ with lib;
       # Administration tools
       coreutils moreutils psmisc progress lshw
       dig
+      gnumake
 
       # NCurses tools
       htop iotop glances
@@ -67,14 +68,14 @@ with lib;
         passwordFile = "/run/secrets/root.pass";
       };
       cynerd = {
+        group = "cynerd";
+        extraGroups = ["users" "wheel"];
         uid = 1000;
         subUidRanges = [{ count = 65534; startUid = 10000; }];
         subGidRanges = [{ count = 65534; startGid = 10000; }];
-        group = "cynerd";
         isNormalUser = true;
         createHome = true;
         shell = pkgs.zsh.out;
-        extraGroups = ["users" "wheel"];
         passwordFile = "/run/secrets/cynerd.pass";
         openssh.authorizedKeys.keyFiles = [
           (config.personal-secrets + "/unencrypted/git-private.pub")
-- 
cgit v1.2.3