From a7e8d14391c5f4698335fb22aecda1da428d4753 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 28 Jun 2022 16:08:43 +0200
Subject: [PATCH] feat: enable appgate-sdp

---
 configuration.nix                          | 14 ++++++++++++++
 machines/apache/configuration.nix          |  8 --------
 machines/apache/hardware-configuration.nix | 21 +++++++++------------
 users.nix                                  |  4 ++--
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index d6eee75..6055e84 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,6 +32,20 @@
     '';
   };
 
+  services.gnome.gnome-keyring.enable = true;
+
+  services.resolved = {
+    enable = true;
+    extraConfig = ''
+      DNS = 192.168.178.249
+    '';
+    dnssec = "false";
+  };
+
+  networking.networkmanager.enable = true;
+
+  programs.appgate-sdp.enable = true;
+
   services.xserver = {
     enable = true;
     windowManager.i3.enable = true;
diff --git a/machines/apache/configuration.nix b/machines/apache/configuration.nix
index 4d8553d..13c3977 100644
--- a/machines/apache/configuration.nix
+++ b/machines/apache/configuration.nix
@@ -4,13 +4,5 @@
   networking.hostName = "apache";
 
   boot.loader.grub.enableCryptodisk = true;
-
-  boot.initrd.luks.devices = {
-    # crypt-nixos.device = "/dev/disk/by-uuid/4345618c-6968-465f-8ebd-1d76defc0f57";
-    # crypt-swap.device = "/dev/disk/by-uuid/fa3440af-0354-4299-860e-01a3b012416f";
-  };
-
-  networking.wireless.enable = true;
-
 }
 
diff --git a/machines/apache/hardware-configuration.nix b/machines/apache/hardware-configuration.nix
index 250dc2a..8e8ca86 100644
--- a/machines/apache/hardware-configuration.nix
+++ b/machines/apache/hardware-configuration.nix
@@ -5,7 +5,8 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
@@ -14,7 +15,8 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/58100870-c0e2-414f-aa8a-2f2cde8ae4da";
+    {
+      device = "/dev/disk/by-uuid/58100870-c0e2-414f-aa8a-2f2cde8ae4da";
       fsType = "ext4";
     };
 
@@ -24,21 +26,16 @@
   };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/01E5-F47D";
+    {
+      device = "/dev/disk/by-uuid/01E5-F47D";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/9b775e18-ab8c-4647-9ab1-a51391af6d6d"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/9b775e18-ab8c-4647-9ab1-a51391af6d6d"; }];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+  networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
+  networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/users.nix b/users.nix
index 1887d01..370935a 100644
--- a/users.nix
+++ b/users.nix
@@ -8,8 +8,8 @@
       isNormalUser = true;
       uid = 1000;
       home = "/home/mandlm";
-      shell= pkgs.zsh;
-      extraGroups = [ "wheel" "audio" "video" "input" "docker" ];
+      shell = pkgs.zsh;
+      extraGroups = [ "wheel" "networkmanager" "audio" "video" "input" "docker" ];
       hashedPassword = "$6$wV6dzYlgke5tN01q$rCMP/Hquss/1BgKarnZUkmejpBtjEcwmlUhbhAAmjc2Pwdbztp3yr/bD/LJ63XoZ0oD7yhTMqbECDdMqNKKDe/";
       openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI6NmrDRvDtUkeJM8cE7DvZKtiNBKUQ+30MhOX4BwWPzN2b+kM+TjZ5Dtiln+Zbk/QToCDFir+CIKHshpgtCPAvVkjmldeqqflKKUkShTjWfF2zRwEql58DGaTuJqPgMhS9ZVDI5OL6VoecSxWOLSKCqGu4R+yJJnTRBSaoHNzBsq81psYk/yty+QofbWsJktjJc2r3JSuM8UUVkCVqcYS9wd/3vW3NbkqOL7KJhktsJa6sBZfTs1Yr1lpKqJou24CE1TGwTxiZ7SASjiRzbtK7J9jJBCjZ80hgEp/Cop0caaVw7aedo6xRC26X2TSm7ljAdvcPew9m6ayxuLaV9Nz mandlm@apache" ];
     };