flake.lock: Update

Flake lock file updates:

• Updated input 'ghostty':
    'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=674e2980e2f26f9f0db4a1afa8b4acf8c3bc1340' (2024-12-12)
  → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=ddb51122d0d93458f826881a6179564f3b1a6091' (2024-12-13)

.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

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": [
@@ -258,11 +279,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1733867032,
+        "lastModified": 1734050696,
-        "narHash": "sha256-2ddDF3j8aI70WdWIn+Gsef4XGM2+grIlaEtHlkZmWdY=",
+        "narHash": "sha256-7DulCtU2xsRq4Op2cCjJpQLmsyqqaMv1DR0A7VV/YA4=",
         "ref": "refs/heads/main",
-        "rev": "59df17a699f6f13700823124cefaf91fb0c37d4f",
+        "rev": "ddb51122d0d93458f826881a6179564f3b1a6091",
-        "revCount": 8196,
+        "revCount": 8245,
         "type": "git",
         "url": "ssh://git@github.com/ghostty-org/ghostty"
       },
@@ -540,11 +561,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1733906678,
+        "lastModified": 1733932114,
-        "narHash": "sha256-EsX/UQbVsLypq29dsJLTpgPah5OZ8ay0J9Q2Q4lU1pE=",
+        "narHash": "sha256-LN4pgLjGWztTlJ4oDcKWvDuTFeUUVgbmXoZ2EXG20Gw=",
-        "rev": "4f5e5e9bdf9acfd1ec965eac0949b38c15539ead",
+        "rev": "92ed9fee7d169febf53ea85961174fc0a22c2115",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4f5e5e9bdf9acfd1ec965eac0949b38c15539ead.tar.gz?rev=4f5e5e9bdf9acfd1ec965eac0949b38c15539ead"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/92ed9fee7d169febf53ea85961174fc0a22c2115.tar.gz?rev=92ed9fee7d169febf53ea85961174fc0a22c2115"
       },
       "original": {
         "type": "tarball",
@@ -787,11 +808,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1733926853,
+        "lastModified": 1734029158,
-        "narHash": "sha256-xdibzaRQZEhjQCFRgm3sqlosOqJT+bnL62MPDXXAm6c=",
+        "narHash": "sha256-0ihCBZ53X63fRJ3fCl0MUQmhfbDbBjEljMDV1ad6b84=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "f4d261979a03521b05ecbb4a2ab4903b8d729cb7",
+        "rev": "16242f93092dc6d28e36612410dfb3fc43258acd",
         "type": "github"
       },
       "original": {
@@ -942,6 +963,7 @@
     },
     "root": {
       "inputs": {
+        "NixVirt": "NixVirt",
         "comin": "comin",
         "f1multiviewer": "f1multiviewer",
         "ghostty": "ghostty",
@@ -992,11 +1014,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733785344,
+        "lastModified": 1733965552,
-        "narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=",
+        "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a",
+        "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
         "type": "github"
       },
       "original": {

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";

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;

hosts/othalan/default.nix

@@ -6,6 +6,7 @@
   ...
 }:
 {
+
   oizys =
     {
       nix-ld = enabled // {
@@ -25,6 +26,7 @@
         vbox
         podman
         docker
+        utils
       ''
       |> listify
       |> enableAttrs

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" ];
-  };
-}

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" ];
+  };
+}

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>
+

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;
   };

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 // {

modules/desktop/window-managers/hyprland.nix

@@ -1,12 +1,25 @@
 {
+  inputs,
   pkgs,
   config,
-  mkOizysModule,
+  lib,
+  # mkOizysModule,
   enabled,
   flake,
   ...
 }:
-mkOizysModule config "hyprland" {
+let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.oizys.hyprland;
+in
+{
+  imports = [
+    inputs.hyprland.nixosModules.default
+  ];
+
+  options.oizys.hyprland.enable = mkEnableOption "hyprland";
+
+  config = mkIf cfg.enable {
     programs.hyprland = enabled;
     security.pam.services.swaylock = { };
     # Optional, hint electron apps to use wayland:
@@ -65,21 +78,5 @@ mkOizysModule config "hyprland" {
       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;
-  #   };
-  #
-
 }

modules/essentials.nix

@@ -16,8 +16,6 @@
     gcc
     file
 
-    jq
-
     wget
     curl
     htop

modules/oizys.nix

@@ -43,6 +43,8 @@ in
     restic
 
     llm
+
+    utils
   ];
 
   options.oizys = {

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
+  ];
+}