add a common buildOS function with preliminary vpn

1 files changed, 7 insertions, 31 deletions

diff --git a/Com/Simatime/dev/configuration.nix b/Com/Simatime/dev/configuration.nix
index c096f85..ec3a5a4 100644
--- a/Com/Simatime/dev/configuration.nix
+++ b/Com/Simatime/dev/configuration.nix
@@ -113,11 +113,6 @@
       configFile = "/home/ben/gitlab-runner.toml";
     };
 
-    openssh = {
-      enable = true;
-      forwardX11 = true;
-    };
-
     deluge = {
       enable = true;
       openFilesLimit = 10240;
@@ -164,7 +159,7 @@
       };
     };
 
-    jellyfin = { # previously emby
+    emby = { # previously emby
       enable = true;
       user = "jellyfin";
       group = "jellyfin";
@@ -172,13 +167,6 @@
 
     vnstat.enable = true;
 
-    # security stuff
-    fail2ban.enable = true;
-    clamav = {
-      daemon.enable = true;
-      updater.enable = true;
-    };
-
     postgresql = {
       enable = true;
       package = pkgs.postgresql_10;
@@ -193,28 +181,16 @@
     };
   };
 
-  nix = {
-    gc = {
-      automatic = true;
-      dates = "03:15";
-    };
-    binaryCaches =  [ "https://cache.nixos.org/" ];
-    nixPath = [
-      "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs"
-      "nixos-config=/etc/nixos/configuration.nix"
-      "/nix/var/nix/profiles/per-user/root/channels"
-    ];
-    extraOptions = ''
-      gc-keep-outputs = true
-      gc-keep-derivations = true
-    '';
-  };
+  # Since this is the dev machine, we can turn these on at the expense of extra
+  # disk space.
+  nix.extraOptions = ''
+    keep-outputs = true
+    keep-derivations = true
+  '';
 
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you
   # should.
   system.stateVersion = "17.09"; # Did you read the comment?
-  system.autoUpgrade.enable = true;
-
 }