hosts: Refactor and new nomenclature

config/profiles/gui/nfs.nix

@@ -3,11 +3,13 @@
 {
   boot.supportedFilesystems = [ "nfs" ];
 
-  fileSystems."/mnt/kat-nas" = lib.mkIf (config.networking.hostName != "beltane") {
-    device = "${meta.network.nodes.beltane.network.addresses.wireguard.domain}:/mnt/zraw/media";
+  /*
+  fileSystems."/mnt/kat-nas" = lib.mkIf (config.networking.hostName != "yukari") {
+    device = "${meta.network.nodes.yukari.network.addresses.wireguard.domain}:/mnt/zraw/media";
     fsType = "nfs";
     options = [ "x-systemd.automount" "noauto" "nfsvers=4" "soft" "retrans=2" "timeo=60" ];
-  };
+    };
+    */
 
   /*
     fileSystems."/mnt/hex-corn" = {

config/profiles/hardware/bamboo.nix

@@ -0,0 +1,30 @@
+{ config, lib, ... }: with lib; {
+  options = {
+    hardware.bamboo.display = mkOption {
+      type = types.str;
+    };
+    home-manager.users = let
+        userBambooExtend = { config, nixos, ... }: {
+          config = mkIf config.wayland.windowManager.sway.enable {
+            wayland.windowManager.sway.config.input = {
+              "1386:215:Wacom_BambooPT_2FG_Small_Pen" = {
+                map_to_output = nixos.hardware.bamboo.display;
+              };
+              "1386:215:Wacom_BambooPT_2FG_Small_Finger" = {
+                natural_scroll = "enabled";
+                middle_emulation = "enabled";
+                tap = "enabled";
+                dwt = "enabled";
+                accel_profile = "flat";
+                pointer_accel = "0.05";
+              };
+            };
+          };
+        };
+      in mkOption {
+      type = types.attrsOf (types.submoduleWith {
+        modules = singleton userBambooExtend;
+      });
+    };
+  };
+}

config/profiles/hardware/oracle/common.nix

@@ -92,7 +92,8 @@ in
             in
             {
               enable = true;
-              nixos.ipv6.address = mkIf (tf.state.resources ? ${tf.resources.${config.networking.hostName}.out.reference}) addr_ipv6_nix;
+              #nixos.ipv6.address = mkIf (tf.state.resources ? ${tf.resources.${config.networking.hostName}.out.reference}) addr_ipv6_nix;
+              nixos.ipv6.address = addr_ipv6_nix;
               tf.ipv6.address = tf.resources."${config.networking.hostName}_ipv6".refAttr "ip_address";
             };
         };
@@ -214,6 +215,7 @@ in
               };
               lifecycle.ignoreChanges = [
                 "source_details[0].source_id"
+                "metadata"
               ];
               connection = {
                 type = "ssh";

config/profiles/hardware/razer.nix

@@ -0,0 +1,20 @@
+{ config, lib, ... }: with lib; {
+  options = {
+    home-manager.users = let
+        userRazerExtend = { config, nixos, ... }: {
+          config = mkIf (config.wayland.windowManager.sway.enable && nixos.hardware.openrazer.enable) {
+            wayland.windowManager.sway.config.input = {
+              "5426:103:Razer_Razer_Naga_Trinity" = {
+                accel_profile = "adaptive";
+                pointer_accel = "-0.5";
+              };
+            };
+          };
+        };
+      in mkOption {
+      type = types.attrsOf (types.submoduleWith {
+        modules = singleton userRazerExtend;
+      });
+    };
+  };
+}

config/profiles/hardware/v330-14arr.nix

@@ -1,15 +1,33 @@
-{ config, ... }:
+{ config, lib, ... }: with lib;
 
 /*
   This hardware profile corresponds to the Lenovo IdeaPad v330-14ARR.
 */
 
 {
-  deploy.profile.hardware.v330-14arr = true;
+  options.home-manager.users = let
+    userTouchpadExtend = { config, nixos, ... }: {
+      wayland.windowManager.sway.config.input."1739:33362:Synaptics_TM3336-002" = {
+        dwt = "enabled";
+        tap = "enabled";
+        natural_scroll = "enabled";
+        middle_emulation = "enabled";
+        click_method = "clickfinger";
+      };
+    };
+  in mkOption {
+    type = types.attrsOf (types.submoduleWith {
+      modules = singleton userTouchpadExtend;
+    });
+  };
 
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
+  config = {
+    deploy.profile.hardware.v330-14arr = true;
+
+    boot.initrd.availableKernelModules =
+      [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
+    boot.initrd.kernelModules = [ ];
+    boot.kernelModules = [ ];
+    boot.extraModulePackages = [ ];
+  };
 }

config/profiles/network.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: with lib;
+{ config, lib, pkgs, sources, ... }: with lib;
 
 {
   options.network = with lib; {
@@ -9,6 +9,28 @@
   };
 
   config = {
+    network.yggdrasil.extern = let
+      hexchen = (import sources.hexchen) { };
+      hexYgg = filterAttrs (_: c: c.enable)
+        (mapAttrs (_: host: host.config.network.yggdrasil) hexchen.hosts);
+    in {
+      endpoints = flatten (map (c: c.listen.endpoints) (filter
+        (c:
+          c.listen.enable && (c.pubkey
+          != "0000000000000000000000000000000000000000000000000000000000000000"))
+          (attrValues hexYgg)));
+      pubkeys = {
+        satorin =
+          "53d99a74a648ff7bd5bc9ba68ef4f472fb4fb8b2e26dfecea33c781f0d5c9525";
+        shanghai =
+          "0cc3c26366cbfddfb1534b25c5655733d8f429edc941bcce674c46566fc87027";
+        grimoire =
+          "2a1567a2848540070328c9e938c58d40f2b1a3f08982c15c7edc5dcabfde3330";
+        boline =
+          "89684441745467da0d1bf7f47dc74ec3ca65e05c72f752298ef3c22a22024d43";
+      } // (mapAttrs (_: c: c.pubkey) hexYgg);
+    };
+
     networking.firewall.extraCommands = "ip6tables -A INPUT -p 89 -i wgmesh-+ -j ACCEPT";
     networking.nftables.extraInput = ''
       meta l4proto 89 iifname wgmesh-* accept

config/profiles/vfio/profile.nix

@@ -1,8 +1,4 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
+{ config, pkgs, lib, ... }: with lib; let
   win10-screenstub = pkgs.writeShellScriptBin "win10-screenstub" ''
     ${pkgs.screenstub-kat}/bin/screenstub -c "${./screenstub.yml}" x
   '';
@@ -11,62 +7,75 @@ let
   '';
 in
 {
-  # TODO: move to upstream screenstub with config options, move screenstub.yml into specific host
-  deploy.profile.vfio = true;
-
-  environment.systemPackages = with pkgs; [
-    win10-screenstub
-    win10-vm
-    win10-diskmapper
-    ddcutil
-  ];
-
-
-  users.users.kat.extraGroups = [ "vfio" "input" "uinput" ];
-  users.groups = { uinput = { }; vfio = { }; };
-
-  boot = lib.mkMerge [{
-    initrd.kernelModules = mkBefore [ "vfio" "vfio_iommu_type1" "vfio_pci" "vfio_virqfd" ];
-    kernelModules = [ "i2c-dev" ]; # i2c-dev is required for DDC/CI for screenstub
-    kernelPatches = with pkgs.kernelPatches; [
-      (mkIf config.deploy.profile.hardware.acs-override acs-override)
-    ];
-  }
-    (mkIf (config.deploy.profile.hardware.amdgpu) {
-      kernelParams = [
-        "video=efifb:off"
-      ];
-      extraModulePackages = [
-        (pkgs.linuxPackagesFor config.boot.kernelPackages.kernel).vendor-reset
-      ];
-    })
-    (mkIf (config.deploy.profile.hardware.acs-override) {
-      kernelParams = [
-        "pci=noats"
-        "pcie_acs_override=downstream,multifunction"
-      ];
-    })];
-
-  environment.etc."qemu/bridge.conf".text = "allow br";
-
-  security.wrappers = {
-    qemu-bridge-helper = {
-      source = "${pkgs.qemu-vfio}/libexec/qemu-bridge-helper";
-    };
+  options.home-manager.users = let
+      userVFIOExtend = { config, ... }: {
+        config = mkIf config.wayland.windowManager.sway.enable {
+          wayland.windowManager.sway.config.input = genAttrs [ "tablet" "mouse" "kbd" ] (t:
+            nameValuePair "5824:1503:screenstub-${t}" ({ events = "disabled"; })
+          );
+        };
+      };
+    in mkOption {
+    type = types.attrsOf (types.submoduleWith {
+      modules = singleton userVFIOExtend;
+    });
   };
 
-  services.udev.extraRules = ''
-    SUBSYSTEM=="i2c-dev", GROUP="vfio", MODE="0660"
-    SUBSYSTEM=="misc", KERNEL=="uinput", OPTIONS+="static_node=uinput", MODE="0660", GROUP="uinput"
-    SUBSYSTEM=="vfio", OWNER="root", GROUP="vfio"
-  '';
+  config = {
+    deploy.profile.vfio = true;
 
-  security.pam.loginLimits = [{
-    domain = "@vfio";
-    type = "-";
-    item = "memlock";
-    value = "unlimited";
-  }];
+    environment.systemPackages = with pkgs; [
+      win10-screenstub
+      win10-vm
+      win10-diskmapper
+      ddcutil
+    ];
 
-  systemd.extraConfig = "DefaultLimitMEMLOCK=infinity";
+    users.groups = { uinput = { }; vfio = { }; };
+
+    boot = lib.mkMerge [{
+      initrd.kernelModules = mkBefore [ "vfio" "vfio_iommu_type1" "vfio_pci" "vfio_virqfd" ];
+      kernelModules = [ "i2c-dev" ]; # i2c-dev is required for DDC/CI for screenstub
+      kernelPatches = with pkgs.kernelPatches; [
+        (mkIf config.deploy.profile.hardware.acs-override acs-override)
+      ];
+    }
+      (mkIf (config.deploy.profile.hardware.amdgpu) {
+        kernelParams = [
+          "video=efifb:off"
+        ];
+        extraModulePackages = [
+          (pkgs.linuxPackagesFor config.boot.kernelPackages.kernel).vendor-reset
+        ];
+      })
+      (mkIf (config.deploy.profile.hardware.acs-override) {
+        kernelParams = [
+          "pci=noats"
+          "pcie_acs_override=downstream,multifunction"
+        ];
+      })];
+
+    environment.etc."qemu/bridge.conf".text = "allow br";
+
+    security.wrappers = {
+      qemu-bridge-helper = {
+        source = "${pkgs.qemu-vfio}/libexec/qemu-bridge-helper";
+      };
+    };
+
+    services.udev.extraRules = ''
+      SUBSYSTEM=="i2c-dev", GROUP="vfio", MODE="0660"
+      SUBSYSTEM=="misc", KERNEL=="uinput", OPTIONS+="static_node=uinput", MODE="0660", GROUP="uinput"
+      SUBSYSTEM=="vfio", OWNER="root", GROUP="vfio"
+    '';
+
+    security.pam.loginLimits = [{
+      domain = "@vfio";
+      type = "-";
+      item = "memlock";
+      value = "unlimited";
+    }];
+
+    systemd.extraConfig = "DefaultLimitMEMLOCK=infinity";
+  };
 }