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

---
 nixos/machine/binky.nix   | 3 +++
 nixos/modules/desktop.nix | 7 +++++++
 nixos/modules/generic.nix | 5 +++--
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'nixos')

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