cleanup

modules/nixos/disko/options.nix

@@ -1,5 +1,8 @@
 { lib, namespace, ... }:
 with lib;
+let
+  inherit (lib.${namespace}) mkOpt mkBoolOpt;
+in
 {
   options.${namespace}.hardware.disko = {
     enable = mkEnableOption "enable disko";
@@ -11,5 +14,9 @@ with lib;
       default = "btrfs";
       description = "Filesystem to use for the root partition";
     };
+
+    enableSwap = mkBoolOpt false "Enable swap";
+
+    swapSize = mkOpt types.str "16G" "size of swap part";
   };
 }

modules/nixos/disko/x86_64-linux/default.nix

@@ -102,6 +102,11 @@ in
                   };
                 };
 
+                swap = lib.mkIf cfg.enableSwap {
+                  type = "8200";
+                  size = cfg.swapSize;
+                };
+
                 root = if cfg.filesystem == "btrfs" then btrfsRoot else bcachefsRoot;
               };
             };

modules/nixos/services/common/default.nix

@@ -40,6 +40,8 @@
       };
     };
 
+    udisks2.enable = true;
+
     # configure pipewire
     pipewire = {
       enable = lib.mkDefault true;

modules/nixos/services/minecraft/default.nix

@@ -0,0 +1,23 @@
+{ config, ... }:
+{
+  minecraft-server = {
+    enable = false;
+    eula = true;
+    declarative = true;
+    openFirewall = true;
+    dataDir = "/media/nas/main/ssd_app_data/minecraft";
+    serverProperties = {
+      enforce-whitelist = true;
+      white-list = true;
+      "enable-rcon" = true;
+      "rcon.password" = config.sops.secrets."jallen-nas/admin_password".path;
+    };
+    whitelist = {
+      mjallen18 = "03d9fba9-4453-4ad1-afa6-c67738685189";
+      AlpineScent = "76ff084d-2e66-4877-aec2-d6b278431bda";
+      Fortltude = "61a01913-8b10-4d64-b7ce-7958088cd6d3";
+      SpicyNick = "8bb5976f-6fd9-4fa5-8697-6ecb4ee38427";
+    };
+    jvmOpts = "-Xms4092M -Xmx4092M -XX:+UseG1GC -XX:ParallelGCThreads=2 -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10";
+  };
+}

modules/nixos/services/samba/default.nix

@@ -2,6 +2,27 @@
 with lib;
 let
   cfg = config.nas-samba;
+  sambaShares = 
+  let
+    make =
+      name: share:
+      nameValuePair "${name}" {
+        path = share.sharePath;
+        public = if share.enableTimeMachine then "no" else "yes";
+        browseable = if share.browseable then "yes" else "no";
+        writable = "yes";
+        "force group" = "jallen-nas";
+        "read only" = if share.readOnly then "yes" else "no";
+        "guest ok" = if share.guestOk then "yes" else "no";
+        "create mask" = share.createMask;
+        "directory mask" = share.directoryMask;
+        "fruit:aapl" = if share.enableTimeMachine then "yes" else "no";
+        "fruit:time machine" = if share.enableTimeMachine then "yes" else "no";
+        "vfs objects" = "catia fruit streams_xattr";
+        "fruit:time machine max size" = share.timeMachineMaxSize;
+      };
+  in
+  mapAttrs' make cfg.shares;
 in
 {
   imports = [ ./options.nix ];
@@ -32,27 +53,21 @@ in
       openFirewall = true;
       nsswins = true;
       nmbd.enable = true;
-      settings =
-        let
-          make =
-            name: share:
-            nameValuePair "${name}" {
-              path = share.sharePath;
-              public = if share.enableTimeMachine then "no" else "yes";
-              browseable = if share.browseable then "yes" else "no";
-              writable = "yes";
-              "force group" = "jallen-nas";
-              "read only" = if share.readOnly then "yes" else "no";
-              "guest ok" = if share.guestOk then "yes" else "no";
-              "create mask" = share.createMask;
-              "directory mask" = share.directoryMask;
-              "fruit:aapl" = if share.enableTimeMachine then "yes" else "no";
-              "fruit:time machine" = if share.enableTimeMachine then "yes" else "no";
-              "vfs objects" = "catia fruit streams_xattr";
-              "fruit:time machine max size" = share.timeMachineMaxSize;
-            };
-        in
-        mapAttrs' make cfg.shares;
+      settings = {
+        global = {
+          "workgroup" = "WORKGROUP";
+          "server string" = "Jallen-NAS";
+          "netbios name" = "Jallen-NAS";
+          "security" = "user";
+          #"use sendfile" = "yes";
+          #"max protocol" = "smb2";
+          # note: localhost is the ipv6 localhost ::1
+          "hosts allow" = "10.0.1. 127.0.0.1 localhost";
+          "hosts deny" = "0.0.0.0/0";
+          "guest account" = "nobody";
+          "map to guest" = "bad user";
+        };
+      } // sambaShares;
     };
   };
 }