remove redundant key

simplify modules included in generator
flake.lock: Update
2024-12-21 09:20:44 -06:00 · 2024-12-12 17:25:11 -06:00 · 2024-12-12 16:54:41 -06:00 · 2024-12-12 21:42:55 +00:00 · 2024-12-12 15:36:25 -06:00 · 2024-12-12 15:36:25 -06:00
14 changed files with 442 additions and 162 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -4,7 +4,6 @@
 # for a more complex example.
 keys:
  - &admin_daylin age10ft5tkswydhmassqeqzr8frpx6vc07g4rwam09rs8agvgfrsn95q9ml7u3
-  - &admin_daylin_algiz age10ft5tkswydhmassqeqzr8frpx6vc07g4rwam09rs8agvgfrsn95q9ml7u3
  - &host_othalan age1t4k04mjltmmhljnwugm6y4dejtu72vv4fd4anxxfsdpkapfnfauqe765gy
  - &host_algiz age1ks6753mqsze8an0vx69gjglc7zwzjw7m0ccmzem30hm0jw0zr42qg0g2kj
 creation_rules:
@ -17,4 +16,4 @@ creation_rules:
    key_groups:
    - age:
      - *host_algiz
-      - *admin_daylin_algiz
+      - *admin_daylin
--- a/flake.lock
+++ b/flake.lock
@ -1,5 +1,26 @@
 {
  "nodes": {
+    "NixVirt": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732406038,
+        "narHash": "sha256-BYNBN+Rtc/SX6qI7m3nmryufRPn0ZYd40yHDo9VQaNE=",
+        "owner": "AshleyYakeley",
+        "repo": "NixVirt",
+        "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AshleyYakeley",
+        "repo": "NixVirt",
+        "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
+        "type": "github"
+      }
+    },
    "aquamarine": {
      "inputs": {
        "hyprutils": [
@ -92,11 +113,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@ -201,11 +222,11 @@
        "systems": "systems_5"
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@ -258,11 +279,11 @@
        "zig": "zig"
      },
      "locked": {
-        "lastModified": 1733704542,
-        "narHash": "sha256-tGY+WuCTF/hoZpISys+jLaPXvQV4QyGmSTyecFV1R3I=",
+        "lastModified": 1734039556,
+        "narHash": "sha256-XxXug+6zLwJovwzyLFwhJdc5Mtz95LSgizWZzZh3h5M=",
        "ref": "refs/heads/main",
-        "rev": "ae2cf8dc371c960aa0772065c7f2a741c8bdc91b",
-        "revCount": 8188,
+        "rev": "674e2980e2f26f9f0db4a1afa8b4acf8c3bc1340",
+        "revCount": 8227,
        "type": "git",
        "url": "ssh://git@github.com/ghostty-org/ghostty"
      },
@ -457,11 +478,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732288281,
-        "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
+        "lastModified": 1731702627,
+        "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
+        "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1",
        "type": "github"
      },
      "original": {
@ -540,11 +561,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1733448312,
-        "narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=",
-        "rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b",
+        "lastModified": 1733932114,
+        "narHash": "sha256-LN4pgLjGWztTlJ4oDcKWvDuTFeUUVgbmXoZ2EXG20Gw=",
+        "rev": "92ed9fee7d169febf53ea85961174fc0a22c2115",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a9e560570982a91937d199af3e7b7a8f3cbe14b.tar.gz?rev=2a9e560570982a91937d199af3e7b7a8f3cbe14b"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/92ed9fee7d169febf53ea85961174fc0a22c2115.tar.gz?rev=92ed9fee7d169febf53ea85961174fc0a22c2115"
      },
      "original": {
        "type": "tarball",
@ -657,11 +678,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1732631228,
-        "narHash": "sha256-/7Wyhp00yecUMPNz79gGZpjos8OLHqOfdiWWIQfZA1M=",
+        "lastModified": 1733909753,
+        "narHash": "sha256-5GChR6LKh6EwGXLfR3HLW2Z0AWoyce4Hyp3VB5C4FCk=",
        "owner": "nix-community",
        "repo": "nix-eval-jobs",
-        "rev": "8f56354b794624689851b2d86c2ce0209cc8f0cf",
+        "rev": "b1f94fed4af8e7f30665a3bf8b369dc3b8a95884",
        "type": "github"
      },
      "original": {
@ -719,11 +740,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1733649718,
-        "narHash": "sha256-aSgFyFyLP/BExTOB0jGOa5q4WFvvTzc9KGyqwCyILoc=",
+        "lastModified": 1733854371,
+        "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "a42dc85db24821b1a5bca3e11803a0c70555b5c2",
+        "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
        "type": "github"
      },
      "original": {
@ -734,11 +755,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1733392399,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
        "type": "github"
      },
      "original": {
@ -787,11 +808,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1733700989,
-        "narHash": "sha256-T9/TRCUtWWToYOy36/xDgq+29/akx3fxmREuUTryjwE=",
+        "lastModified": 1734029158,
+        "narHash": "sha256-0ihCBZ53X63fRJ3fCl0MUQmhfbDbBjEljMDV1ad6b84=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "5f2e6fdff917c6090187fc71bbbccd8f2b268100",
+        "rev": "16242f93092dc6d28e36612410dfb3fc43258acd",
        "type": "github"
      },
      "original": {
@ -818,11 +839,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1729973466,
-        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+        "lastModified": 1733384649,
+        "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
+        "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
        "type": "github"
      },
      "original": {
@ -834,11 +855,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1733376361,
-        "narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=",
+        "lastModified": 1733749988,
+        "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c",
+        "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68",
        "type": "github"
      },
      "original": {
@ -866,11 +887,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1733581040,
-        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
+        "lastModified": 1733759999,
+        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
+        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
        "type": "github"
      },
      "original": {
@ -903,11 +924,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733165916,
-        "narHash": "sha256-RD2GTloevZPePtWWJV6Doi4vEHxmqoRUJlKTtDJPEP4=",
+        "lastModified": 1733852083,
+        "narHash": "sha256-YOsI10F1NowyOUOq5/Z9anYv8J4nf3ZethaVZXOAe28=",
        "owner": "daylinmorgan",
        "repo": "pixi-flake",
-        "rev": "657b09c683100f21633818ee13564447b0ab487b",
+        "rev": "59e02435f47710f2dbb57e441172a53f0582dfc4",
        "type": "github"
      },
      "original": {
@ -927,11 +948,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1733318908,
-        "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
+        "lastModified": 1732021966,
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
        "type": "github"
      },
      "original": {
@ -942,6 +963,7 @@
    },
    "root": {
      "inputs": {
+        "NixVirt": "NixVirt",
        "comin": "comin",
        "f1multiviewer": "f1multiviewer",
        "ghostty": "ghostty",
@ -992,11 +1014,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733128155,
-        "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
+        "lastModified": 1733965552,
+        "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
+        "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
        "type": "github"
      },
      "original": {
@ -1007,11 +1029,11 @@
    },
    "stable": {
      "locked": {
-        "lastModified": 1733384649,
-        "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
+        "lastModified": 1733730953,
+        "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
+        "rev": "7109b680d161993918b0a126f38bc39763e5a709",
        "type": "github"
      },
      "original": {
@ -1207,11 +1229,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733157064,
-        "narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=",
+        "lastModified": 1731703417,
+        "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f",
+        "rev": "8070f36deec723de71e7557441acb17e478204d3",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -83,6 +83,12 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    NixVirt = {
+      # master as of 2024.12.12
+      url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
    # roc = {
    #   url = "github:roc-lang/roc";
    #   inputs.nixpkgs.follows = "nixpkgs";
--- a/hosts/algiz/default.nix
+++ b/hosts/algiz/default.nix
@ -1,4 +1,5 @@
 {
+  inputs,
  config,
  enabled,
  enableAttrs,
@ -6,6 +7,10 @@
  ...
 }:
 {
+  imports = [
+    inputs.comin.nixosModules.comin
+  ];
+
  oizys = {
    rune.motd = enabled;
    languages = "nim|node|python|nushell" |> listify;
--- a/hosts/othalan/default.nix
+++ b/hosts/othalan/default.nix
@ -6,6 +6,7 @@
  ...
 }:
 {
+
  oizys =
    {
      nix-ld = enabled // {
@ -25,6 +26,7 @@
        vbox
        podman
        docker
+        utils
      ''
      |> listify
      |> enableAttrs
--- a/hosts/othalan/virt.nix
+++ b/hosts/othalan/virt.nix
@ -1,26 +0,0 @@
-{
-  pkgs,
-  enabled,
-  ...
-}:
-{
-  programs.virt-manager = enabled;
-
-  virtualisation = {
-    libvirtd = enabled // {
-      # Enable TPM emulation (optional)
-      qemu = {
-        swtpm = enabled;
-        ovmf.packages = [ pkgs.OVMFFull.fd ];
-      };
-
-    };
-
-    # Enable USB redirection (optional)
-    spiceUSBRedirection = enabled;
-  };
-
-  users.users.daylin = {
-    extraGroups = [ "libvirtd" ];
-  };
-}
--- a/hosts/othalan/virt/default.nix
+++ b/hosts/othalan/virt/default.nix
@ -0,0 +1,48 @@
+{
+  inputs,
+  pkgs,
+  flake,
+  enabled,
+  ...
+}:
+let
+  inherit (inputs) NixVirt;
+  defaultNetwork = {
+    definition = NixVirt.lib.network.writeXML (
+      NixVirt.lib.network.templates.bridge {
+        uuid = "e7955c23-8750-4405-ab2c-37aeee441f67";
+        subnet_byte = 24;
+      }
+    );
+  };
+in
+{
+  imports = [
+    (flake.module "NixVirt")
+  ];
+
+  programs.virt-manager = enabled;
+
+  virtualisation = {
+    libvirt = enabled // {
+      swtpm = enabled;
+      connections."qemu:///system" = {
+        networks = [ defaultNetwork ];
+        domains = [
+          { definition = ./win11.xml; }
+        ];
+      };
+    };
+    libvirtd.qemu = {
+      # ovmf.packages = [ pkgs.OVMFFull.fd ];
+      vhostUserPackages = [ pkgs.virtiofsd ];
+    };
+
+    # Enable USB redirection (optional)
+    spiceUSBRedirection = enabled;
+  };
+
+  users.users.daylin = {
+    extraGroups = [ "libvirtd" ];
+  };
+}
--- a/hosts/othalan/virt/win11.xml
+++ b/hosts/othalan/virt/win11.xml
@ -0,0 +1,215 @@
+<domain type='kvm'>
+  <name>win11</name>
+  <uuid>696578df-2a3d-4c40-814d-8d126a5699cd</uuid>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://microsoft.com/win/11"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory unit='KiB'>16777216</memory>
+  <currentMemory unit='KiB'>16777216</currentMemory>
+  <memoryBacking>
+    <source type='memfd'/>
+    <access mode='shared'/>
+  </memoryBacking>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-q35-9.1'>hvm</type>
+    <loader readonly='yes' type='pflash'>/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader>
+    <nvram template='/run/libvirt/nix-ovmf/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/win11_VARS.fd</nvram>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <hyperv mode='custom'>
+      <relaxed state='on'/>
+      <vapic state='on'/>
+      <spinlocks state='on' retries='8191'/>
+      <vpindex state='on'/>
+      <runtime state='on'/>
+      <synic state='on'/>
+      <stimer state='on'/>
+      <frequencies state='on'/>
+      <tlbflush state='on'/>
+      <ipi state='on'/>
+      <evmcs state='on'/>
+      <avic state='on'/>
+    </hyperv>
+    <vmport state='off'/>
+  </features>
+  <cpu mode='host-passthrough' check='none' migratable='on'>
+    <topology sockets='1' dies='1' clusters='1' cores='4' threads='1'/>
+  </cpu>
+  <clock offset='localtime'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+    <timer name='hypervclock' present='yes'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
+  <devices>
+    <emulator>/run/libvirt/nix-emulators/qemu-system-x86_64</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2' discard='unmap'/>
+      <source file='/home/daylin/vm/images/win11.qcow2'/>
+      <target dev='vda' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/home/daylin/vm/isos/Win11_24H2_English_x64.iso'/>
+      <target dev='sdb' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/home/daylin/vm/isos/virtio-win-0.1.266.iso'/>
+      <target dev='sdc' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='2'/>
+    </disk>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type='pci' index='1' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='1' port='0x10'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='2' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='2' port='0x11'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
+    </controller>
+    <controller type='pci' index='3' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='3' port='0x12'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
+    </controller>
+    <controller type='pci' index='4' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='4' port='0x13'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
+    </controller>
+    <controller type='pci' index='5' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='5' port='0x14'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
+    </controller>
+    <controller type='pci' index='6' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='6' port='0x15'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
+    </controller>
+    <controller type='pci' index='7' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='7' port='0x16'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
+    </controller>
+    <controller type='pci' index='8' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='8' port='0x17'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
+    </controller>
+    <controller type='pci' index='9' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='9' port='0x18'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='10' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='10' port='0x19'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
+    </controller>
+    <controller type='pci' index='11' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='11' port='0x1a'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
+    </controller>
+    <controller type='pci' index='12' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='12' port='0x1b'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
+    </controller>
+    <controller type='pci' index='13' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='13' port='0x1c'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
+    </controller>
+    <controller type='pci' index='14' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='14' port='0x1d'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
+    </controller>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
+    </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <driver type='virtiofs' queue='1024'/>
+      <source dir='/home/daylin/vm/viofs'/>
+      <target dir='shared'/>
+      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
+    </filesystem>
+    <interface type='network'>
+      <mac address='52:54:00:cd:cd:18'/>
+      <source network='default'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
+    <input type='tablet' bus='usb'>
+      <address type='usb' bus='0' port='1'/>
+    </input>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <tpm model='tpm-crb'>
+      <backend type='emulator' version='2.0'/>
+    </tpm>
+    <graphics type='spice' autoport='yes'>
+      <listen type='address'/>
+      <image compression='off'/>
+    </graphics>
+    <sound model='ich9'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
+    </sound>
+    <audio id='1' type='spice'/>
+    <video>
+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
+    </video>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='2'/>
+    </redirdev>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='3'/>
+    </redirdev>
+    <watchdog model='itco' action='reset'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>
+
--- a/lib/extended.nix
+++ b/lib/extended.nix
@ -104,8 +104,10 @@ let
  pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
  pkgFromSystem = system: flake: (pkgsFromSystem system flake).default;
  overlayFrom = flake: inputs."${flake}".overlays.default;
+  nixosModuleFrom = flake: inputs."${flake}".nixosModules.default;
  flakeFromSystem = system: {
    overlay = overlayFrom;
+    module = nixosModuleFrom;
    pkgs = pkgsFromSystem system;
    pkg = pkgFromSystem system;
  };
--- a/lib/generators.nix
+++ b/lib/generators.nix
@ -20,7 +20,6 @@ let
  flake = flakeFromSystem "x86_64-linux";
  hostPath = host: ../. + "/hosts/${host}";

-  # all nix files not including pkgs.nix
  hostFiles = host: host |> hostPath |> listFilesRecursive |> filter isNixFile;

  nixosModules = names: names |> listify |> map (n: inputs.${n}.nixosModules.default);
@ -46,11 +45,9 @@ let
    nixosSystem {
      system = "x86_64-linux";
      modules =
-        [
-          inputs.comin.nixosModules.comin
-        ]
+        []
        ++ (selfModules ''oizys'')
-        ++ (nixosModules ''lix-module|hyprland|sops-nix'')
+        ++ (nixosModules ''lix-module|sops-nix'')
        ++ (hostFiles hostName);

      specialArgs = commonSpecialArgs // {
--- a/modules/desktop/window-managers/hyprland.nix
+++ b/modules/desktop/window-managers/hyprland.nix
@ -1,85 +1,82 @@
 {
+  inputs,
  pkgs,
  config,
-  mkOizysModule,
+  lib,
+  # mkOizysModule,
  enabled,
  flake,
  ...
 }:
-mkOizysModule config "hyprland" {
-  programs.hyprland = enabled;
-  security.pam.services.swaylock = { };
-  # Optional, hint electron apps to use wayland:
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-  environment.systemPackages =
-    (with pkgs; [
-      wl-mirror
-      wlr-randr
-      kanshi
-
-      brightnessctl
-      udiskie
-      eww
-
-      # notifications
-      libnotify
-      mako
-
-      # utils
-      grimblast
-      ksnip
-      wl-clipboard
-      rofi-wayland
-      pwvucontrol
-
-      #hypr ecosystem
-      hyprlock
-      hypridle
-
-      catppuccin-cursors.mochaDark
-
-      # not even clear why I need to add this but ¯\_(ツ)_/¯
-      kdePackages.qtwayland
-
-    ])
-    ++ [
-      (flake.pkg "hyprman")
-    ]
-
-    # swww-git is broken
-    ++ (with (flake.pkgs "nixpkgs-wayland"); [
-      mako
-      eww
-      wlr-randr
-      swww
-    ]);
-
-  nixpkgs.overlays = [
-    (flake.overlay "hyprland-contrib")
-    # (overlayFrom "nixpkgs-wayland")
-    # (overlayFrom "hyprland")
+let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.oizys.hyprland;
+in
+{
+  imports = [
+    inputs.hyprland.nixosModules.default
  ];

-  services.getty = {
-    extraArgs = [ "--skip-login" ];
-    loginOptions = "-p -- ${config.oizys.user}";
+  options.oizys.hyprland.enable = mkEnableOption "hyprland";
+
+  config = mkIf cfg.enable {
+    programs.hyprland = enabled;
+    security.pam.services.swaylock = { };
+    # Optional, hint electron apps to use wayland:
+    environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+    environment.systemPackages =
+      (with pkgs; [
+        wl-mirror
+        wlr-randr
+        kanshi
+
+        brightnessctl
+        udiskie
+        eww
+
+        # notifications
+        libnotify
+        mako
+
+        # utils
+        grimblast
+        ksnip
+        wl-clipboard
+        rofi-wayland
+        pwvucontrol
+
+        #hypr ecosystem
+        hyprlock
+        hypridle
+
+        catppuccin-cursors.mochaDark
+
+        # not even clear why I need to add this but ¯\_(ツ)_/¯
+        kdePackages.qtwayland
+
+      ])
+      ++ [
+        (flake.pkg "hyprman")
+      ]
+
+      # swww-git is broken
+      ++ (with (flake.pkgs "nixpkgs-wayland"); [
+        mako
+        eww
+        wlr-randr
+        swww
+      ]);
+
+    nixpkgs.overlays = [
+      (flake.overlay "hyprland-contrib")
+      # (overlayFrom "nixpkgs-wayland")
+      # (overlayFrom "hyprland")
+    ];
+
+    services.getty = {
+      extraArgs = [ "--skip-login" ];
+      loginOptions = "-p -- ${config.oizys.user}";
+    };
  };
-
-  # using the below to autostart Hyprland
-  # broke my keybindings that were working before
-  # environment.etc =
-  #   let
-  #     activate-snippet = ''
-  #       if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
-  #         exec Hyprland
-  #       fi
-  #     '';
-  #   in
-  #   {
-  #     "bashrc.local".text = activate-snippet;
-  #     "zshenv.local".text = activate-snippet;
-  #   };
-  #
-
 }
--- a/modules/essentials.nix
+++ b/modules/essentials.nix
@ -16,8 +16,6 @@
    gcc
    file

-    jq
-
    wget
    curl
    htop
--- a/modules/oizys.nix
+++ b/modules/oizys.nix
@ -43,6 +43,8 @@ in
    restic

    llm
+
+    utils
  ];

  options.oizys = {
--- a/modules/utils/default.nix
+++ b/modules/utils/default.nix
@ -0,0 +1,13 @@
+{
+  config,
+  pkgs,
+  mkOizysModule,
+  ...
+}:
+mkOizysModule config "utils" {
+  # a grab bag of classic utils I probably want installed by default
+  environment.systemPackages = with pkgs; [
+    feh
+    jq
+  ];
+}
Author	SHA1	Message	Date
Daylin Morgan	cc2c38da73	remove redundant key	2024-12-12 17:25:11 -06:00
Daylin Morgan	bb8ed69269	simplify modules included in generator	2024-12-12 16:54:41 -06:00
daylin-bot	847a5d4c99	flake.lock: Update Flake lock file updates: • Updated input 'ghostty': 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=ae2cf8dc371c960aa0772065c7f2a741c8bdc91b' (2024-12-09) → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=674e2980e2f26f9f0db4a1afa8b4acf8c3bc1340' (2024-12-12) • Updated input 'hyprland/hyprutils': 'github:hyprwm/hyprutils/b26f33cc1c8a7fd5076e19e2cce3f062dca6351c' (2024-11-22) → 'github:hyprwm/hyprutils/e911361a687753bbbdfe3b6a9eab755ecaf1d9e1' (2024-11-15) • Updated input 'hyprland/nixpkgs': 'github:NixOS/nixpkgs/d0797a04b81caeae77bcff10a9dde78bc17f5661' (2024-12-05) → 'github:NixOS/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add' (2024-11-15) • Updated input 'hyprland/pre-commit-hooks': 'github:cachix/git-hooks.nix/6f4e2a2112050951a314d2733a994fbab94864c6' (2024-12-04) → 'github:cachix/git-hooks.nix/3308484d1a443fc5bc92012435d79e80458fe43c' (2024-11-19) • Updated input 'hyprland/xdph': 'github:hyprwm/xdg-desktop-portal-hyprland/fd85ef39369f95eed67fdf3f025e86916edeea2f' (2024-12-02) → 'github:hyprwm/xdg-desktop-portal-hyprland/8070f36deec723de71e7557441acb17e478204d3' (2024-11-15) • Updated input 'lix': '`2a9e560570`.tar.gz?narHash=sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM%3D&rev=2a9e560570982a91937d199af3e7b7a8f3cbe14b' (2024-12-06) → '`92ed9fee7d`.tar.gz?narHash=sha256-LN4pgLjGWztTlJ4oDcKWvDuTFeUUVgbmXoZ2EXG20Gw%3D&rev=92ed9fee7d169febf53ea85961174fc0a22c2115' (2024-12-11) • Updated input 'nixos-wsl': 'github:nix-community/NixOS-WSL/a42dc85db24821b1a5bca3e11803a0c70555b5c2' (2024-12-08) → 'github:nix-community/NixOS-WSL/dee4425dcee3149475ead0cb6a616b8a028c5888' (2024-12-10) • Updated input 'nixos-wsl/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04) • Updated input 'nixos-wsl/flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13) • Updated input 'nixos-wsl/nixpkgs': 'github:NixOS/nixpkgs/cd3e8833d70618c4eea8df06f95b364b016d4950' (2024-10-26) → 'github:NixOS/nixpkgs/190c31a89e5eec80dd6604d7f9e5af3802a58a13' (2024-12-05) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/929116e316068c7318c54eb4d827f7d9756d5e9c' (2024-12-05) → 'github:nixos/nixpkgs/bc27f0fde01ce4e1bfec1ab122d72b7380278e68' (2024-12-09) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/5f2e6fdff917c6090187fc71bbbccd8f2b268100' (2024-12-08) → 'github:nix-community/nixpkgs-wayland/16242f93092dc6d28e36612410dfb3fc43258acd' (2024-12-12) • Updated input 'nixpkgs-wayland/nix-eval-jobs': 'github:nix-community/nix-eval-jobs/8f56354b794624689851b2d86c2ce0209cc8f0cf' (2024-11-26) → 'github:nix-community/nix-eval-jobs/b1f94fed4af8e7f30665a3bf8b369dc3b8a95884' (2024-12-11) • Updated input 'nixpkgs-wayland/nixpkgs': 'github:nixos/nixpkgs/22c3f2cf41a0e70184334a958e6b124fb0ce3e01' (2024-12-07) → 'github:nixos/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56' (2024-12-09) • Updated input 'pixi': 'github:daylinmorgan/pixi-flake/657b09c683100f21633818ee13564447b0ab487b' (2024-12-02) → 'github:daylinmorgan/pixi-flake/59e02435f47710f2dbb57e441172a53f0582dfc4' (2024-12-10) • Updated input 'sops-nix': 'github:Mic92/sops-nix/c6134b6fff6bda95a1ac872a2a9d5f32e3c37856' (2024-12-02) → 'github:Mic92/sops-nix/2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004' (2024-12-12) • Updated input 'stable': 'github:nixos/nixpkgs/190c31a89e5eec80dd6604d7f9e5af3802a58a13' (2024-12-05) → 'github:nixos/nixpkgs/7109b680d161993918b0a126f38bc39763e5a709' (2024-12-09)	2024-12-12 21:42:55 +00:00
Daylin Morgan	9d96327ba5	utilize nixvirt	2024-12-12 15:36:25 -06:00
Daylin Morgan	ab17f947d3	add virtiofs support	2024-12-12 15:36:25 -06:00
Daylin Morgan	3c94b8a4c4	add module to flake lib helper	2024-12-12 15:34:03 -06:00
Daylin Morgan	ba6127d5e7	make utils module	2024-12-12 15:31:51 -06:00