simplify enable opts, and fix security.nix

default.nix

@@ -6,7 +6,9 @@ let
   inherit (lib.my) mapModulesRec';
 in {
   imports =
-    [ inputs.home-manager.nixosModules.home-manager ]
+    [ 
+      inputs.home-manager.nixosModules.home-manager
+    ]
     ++ (mapModulesRec' (toString ./modules) import);
 
   nix = {
@@ -27,11 +29,10 @@ in {
   environment.systemPackages = with pkgs; [
     unrar unzip
     curl wget
-    # nix does not work without git.
+    # nixos-rebuild w/ flakes does not work without git
-    # do not remove this.
+    # do not remove this
     # nix is awesome
     git
-    neofetch
   ];
 
   time.timeZone = mkDefault "America/Los_Angeles";

modules/security.nix

@@ -14,24 +14,38 @@ in {
 		tmp.cleanOnBoot = lib.mkDefault (!config.boot.tmp.useTmpfs);
 		
     	kernel.sysctl = {
+    	  # magic sysrq key, allows low-level commands through keyboard input
       	  "kernel.sysrq" = 0;
 
-          "net.ipv4.conf.all.accept_source_code" = 0;
+          ## TCP hardening
-          "net.ipv6.conf.all.accept_source_code" = 0;
+          # prevent bogus ICMP errors from filling up logs
-          "net.ipv4.conf.default.send_redirects" = 0;
+          "net.ipv4.icmp_ignore_bogus_error_responses" = 1;
+          # do not accept IP source packets (we are not a router)
+          "net.ipv4.conf.all.accept_source_route" = 0;
+          "net.ipv6.conf.all.accept_source_route" = 0;
+          # Don't send ICMP redirects (again, we're not a router)
           "net.ipv4.conf.all.send_redirects" = 0;
-          "net.ipv4.conf.default.accept_redirects" = 0;
+          "net.ipv4.conf.default.send_redirects" = 0;
+          # refuse ICMP redirects (MITM mitigations)
           "net.ipv4.conf.all.accept_redirects" = 0;
-          "net.ipv6.conf.default.accept_redirects" = 0;
+          "net.ipv4.conf.default.accept_redirects" = 0;
-          "net.ipv6.conf.all.accept_redirects" = 0;
-          "net.ipv4.conf.default.secure_redirects" = 0;
           "net.ipv4.conf.all.secure_redirects" = 0;
+          "net.ipv4.conf.default.secure_redirects" = 0;
+          "net.ipv6.conf.all.accept_redirects" = 0;
+          "net.ipv6.conf.default.accept_redirects" = 0;
+          # protects against SYN flood attacks
           "net.ipv4.tcp_syncookies" = 1;
+          # incomplete protection against TIME-WAIT assassination
           "net.ipv4.tcp_rfc1337" = 1;
+
+          ## TCP optimization
+          # TCP fastopen
           "net.ipv4.tcp_fastopen" = 3;
+          # bufferbloat mitigations + improvement in throughput and latency
           "net.ipv4.tcp_conjestion_control" = "bbr";
           "net.core.default_qdisc" = "cake";
         };
+        kernelModules = [ "tcp_bbr" ];
       };
 
       security = {

modules/services/forgejo.nix

@@ -11,10 +11,7 @@ let
   };
 in {
   options.modules.services.forgejo = {
-    enable = mkOption {
+    enable = mkEnableOption "enable forgejo, a lightweight git server";
-      type = types.bool;
-      default = false;
-    };
     domain = mkOption {
       type = types.str;
       default = "git.reidlab.online";

modules/services/metrics.nix

@@ -5,10 +5,7 @@ let
   cfg = config.modules.services.metrics;
 in {
   options.modules.services.metrics = {
-    enable = mkOption {
+    enable = mkEnableOption "enable grafana with loki, prometheus, and promtail";
-      type = types.bool;
-      default = false;
-    };
     domain = mkOption {
       type = types.str;
       default = "grafana.reidlab.online";

modules/services/mosh.nix

@@ -5,10 +5,7 @@ let
   cfg = config.modules.services.mosh;
 in {
   options.modules.services.mosh = {
-    enable = mkOption {
+    enable = mkEnableOption "enable mosh, the mobile SSH shell";
-      type = types.bool;
-      default = false;
-    };
   };
 
   config = mkIf cfg.enable {

modules/services/nginx-conf.nix

@@ -5,10 +5,7 @@ let
   cfg = config.modules.services.nginx-config;
 in {
   options.modules.services.nginx-config = {
-    enable = mkOption {
+	enable = mkEnableOption "enable nginx, a high performance web server along with default configurations";
-      type = types.bool;
-      default = false;
-    };
 
     package = mkOption {
       type = types.package;

modules/services/postgres.nix

@@ -5,10 +5,7 @@ let
   cfg = config.modules.services.postgres;
 in {
   options.modules.services.postgres = {
-    enable = mkOption {
+    enable = mkEnableOption "enable postgres, the database industry standard";
-      type = types.bool;
-      default = false;
-    };
   };
 
   config = mkIf cfg.enable {

modules/services/redis.nix

@@ -5,10 +5,7 @@ let
   cfg = config.modules.services.redis;
 in {
   options.modules.services.redis = {
-    enable = mkOption {
+    enable = mkEnableOption "enable redis, a speedy cache database";
-      type = types.bool;
-      default = false;
-    };
   };
 
   config = mkIf cfg.enable {

modules/services/ssh.nix

@@ -5,11 +5,7 @@ let
   cfg = config.modules.services.ssh;
 in {
   options.modules.services.ssh = {
-    enable = mkOption {
+    enable = mkEnableOption "enable openssh, a server for remote shell access";
-      type = types.bool;
-      default = false;
-      description = "Provide system SSH support though OpenSSH.";
-    };
 
     requirePassword = mkOption {
       type = types.bool;

readme.md

@@ -21,3 +21,4 @@ before committing, please run `nix flake check` and make sure everything is ok
 - remove the lua static stuff from nginx + the cf ip
 - per-host architecture selection, atm it is hardcoded to `aarch64`
 - some weird perl error abt locales when building??? it only happened after the big lib update. help me
+- leverage nixos-hardware