Cleanup and fixed

modules/home/gui/games/default.nix

@@ -11,7 +11,7 @@
       gamemode
       #gamescope
       #mangohud
-      #prismlauncher
+      prismlauncher
       openttd-jgrpp
       #bottles
       lutris

modules/server/nftables/default.nix

@@ -1,7 +1,7 @@
 
 
 { config, lib, ... }:{
-  config = lib.mkIf (config.syscfg.server.nftables.enable) {
+  config = lib.mkIf (config.syscfg.server ? nftables.enable) {
     boot.kernel.sysctl = {
       "net.ipv4.ip_forward" = 1;
       "net.ipv6.conf.all.forwarding" = 1;

modules/server/openssh/default.nix

@@ -5,7 +5,7 @@ let
   allowedUsernames = map (u: u.username) config.syscfg.users;
   activeUsers = lib.filterAttrs (name: _: lib.elem name allowedUsernames) groupedUsers;
 in {
-  config = lib.mkIf (config.syscfg.server.nftables.enable) {
+  config = lib.mkIf (config.syscfg.server ? nftables.enable) {
     services.openssh = {
         enable = true;
         ports = [ 422 ];

systems/ci/cfg.nix

@@ -21,16 +21,5 @@
       game = true;
       develop = true;
     };
-    net = {
-      wlp = {
-        enable = false;
-        nif = "NA";
-      };
-      wg = {
-        enable = false;
-        ip4 = "";
-        ip6 = "";
-      };
-    };
   };
 }

systems/gateway/cfg.nix

@@ -18,7 +18,6 @@
       cli = true;
     };
     net = {
-      wlp = { enable = false; };
       wg = {
         enable = true;
         ip4 = "10.10.1.1/32";

systems/sandbox/cfg.nix

@@ -1,11 +1,12 @@
 {
   syscfg = {
-    hostname = "sandbox";
+    hostname = "gateway";
     type = "nixos";
     system = "x86_64-linux";
     defaultUser = "sora";
     users = [{
       username = "sora";
+      pubssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrrUB0KBjeAKPVG2Bdcm4mI9AMab7y97SOCdEHGogYv sora@gateway";
       wm = "-";
       git = {
         email = "soraefir+git@helcel";
@@ -14,27 +15,11 @@
       };
     }];
     make = {
-      gui = false;
       cli = true;
-      virt = true;
-      power = false;
-      game = false;
-      develop = false;
-    };
-    net = {
-      wlp = { enable = false; };
-      wg = { enable = false; };
     };
     server = {
-      hostDomain = "test.helcel.net";
-      mailDomain = "mail.helcel.net";
-      mailServer = "mail.helcel.net";
-
-      dbHost = "localhost";
-      dbPort = "3306";
-
-      configPath = "/home/media/config";
-      dataPath = "/home/media/data";
+      openssh = true;
+      web = true;
     };
   };
 }

systems/sandbox/hardware.nix

@@ -1,14 +1,27 @@
 { config, lib, pkgs, modulesPath, ... }: {
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix" ) ];
+
   boot.kernelPackages = pkgs.linuxPackages_latest;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  boot.loader.grub.device = "/dev/sda";
+
+  boot.loader.systemd-boot.enable = lib.mkForce false;
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/sda";
+    efiSupport = true;
+  };
+
   boot.initrd.availableKernelModules =
     [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
   boot.initrd.kernelModules = [ "nvme" ];
 
   fileSystems."/" = {
-    device = "/dev/sda3";
+    device = "/dev/disk/by-uuid/abc944c6-484a-4abe-a675-906e3781d71f";
     fsType = "btrfs";
   };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/C555-300B";
+    fsType = "vfat";
+    options = [ "defaults" ];
+  };
 }