daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 06:00:45 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:cc2c38da73368f9781df8f2084d32c3afcbca8c7
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:db2bea7e8072fad5c77839f41c28c463818df756
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "cc2c38da73368f9781df8f2084d32c3afcbca8c7" and "db2bea7e8072fad5c77839f41c28c463818df756" have entirely different histories.
cc2c38da73 ... db2bea7e80

14 changed files with 162 additions and 442 deletions
Show stats Expand all files Collapse all files

3
.sops.yaml
View file

@ -4,6 +4,7 @@
# for a more complex example. # for a more complex example.
keys: keys:
- &admin_daylin age10ft5tkswydhmassqeqzr8frpx6vc07g4rwam09rs8agvgfrsn95q9ml7u3 - &admin_daylin age10ft5tkswydhmassqeqzr8frpx6vc07g4rwam09rs8agvgfrsn95q9ml7u3
- &admin_daylin_algiz age10ft5tkswydhmassqeqzr8frpx6vc07g4rwam09rs8agvgfrsn95q9ml7u3
- &host_othalan age1t4k04mjltmmhljnwugm6y4dejtu72vv4fd4anxxfsdpkapfnfauqe765gy - &host_othalan age1t4k04mjltmmhljnwugm6y4dejtu72vv4fd4anxxfsdpkapfnfauqe765gy
- &host_algiz age1ks6753mqsze8an0vx69gjglc7zwzjw7m0ccmzem30hm0jw0zr42qg0g2kj - &host_algiz age1ks6753mqsze8an0vx69gjglc7zwzjw7m0ccmzem30hm0jw0zr42qg0g2kj
creation_rules: creation_rules:
@ -16,4 +17,4 @@ creation_rules:
key_groups: key_groups:
- age: - age:
- *host_algiz - *host_algiz
- *admin_daylin - *admin_daylin_algiz

128
flake.lock
View file

@ -1,26 +1,5 @@
{ {
"nodes": { "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": { "aquamarine": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": [
@ -113,11 +92,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1696426674,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +201,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1726560853,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -279,11 +258,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1734039556, "lastModified": 1733704542,
"narHash": "sha256-XxXug+6zLwJovwzyLFwhJdc5Mtz95LSgizWZzZh3h5M=", "narHash": "sha256-tGY+WuCTF/hoZpISys+jLaPXvQV4QyGmSTyecFV1R3I=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "674e2980e2f26f9f0db4a1afa8b4acf8c3bc1340", "rev": "ae2cf8dc371c960aa0772065c7f2a741c8bdc91b",
"revCount": 8227, "revCount": 8188,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty" "url": "ssh://git@github.com/ghostty-org/ghostty"
}, },
@ -478,11 +457,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731702627, "lastModified": 1732288281,
"narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -561,11 +540,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733932114, "lastModified": 1733448312,
"narHash": "sha256-LN4pgLjGWztTlJ4oDcKWvDuTFeUUVgbmXoZ2EXG20Gw=", "narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=",
"rev": "92ed9fee7d169febf53ea85961174fc0a22c2115", "rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/92ed9fee7d169febf53ea85961174fc0a22c2115.tar.gz?rev=92ed9fee7d169febf53ea85961174fc0a22c2115" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a9e560570982a91937d199af3e7b7a8f3cbe14b.tar.gz?rev=2a9e560570982a91937d199af3e7b7a8f3cbe14b"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -678,11 +657,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1733909753, "lastModified": 1732631228,
"narHash": "sha256-5GChR6LKh6EwGXLfR3HLW2Z0AWoyce4Hyp3VB5C4FCk=", "narHash": "sha256-/7Wyhp00yecUMPNz79gGZpjos8OLHqOfdiWWIQfZA1M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "b1f94fed4af8e7f30665a3bf8b369dc3b8a95884", "rev": "8f56354b794624689851b2d86c2ce0209cc8f0cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -740,11 +719,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1733854371, "lastModified": 1733649718,
"narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=", "narHash": "sha256-aSgFyFyLP/BExTOB0jGOa5q4WFvvTzc9KGyqwCyILoc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "dee4425dcee3149475ead0cb6a616b8a028c5888", "rev": "a42dc85db24821b1a5bca3e11803a0c70555b5c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -755,11 +734,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1733392399,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -808,11 +787,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1734029158, "lastModified": 1733700989,
"narHash": "sha256-0ihCBZ53X63fRJ3fCl0MUQmhfbDbBjEljMDV1ad6b84=", "narHash": "sha256-T9/TRCUtWWToYOy36/xDgq+29/akx3fxmREuUTryjwE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "16242f93092dc6d28e36612410dfb3fc43258acd", "rev": "5f2e6fdff917c6090187fc71bbbccd8f2b268100",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -839,11 +818,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1733384649, "lastModified": 1729973466,
"narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=", "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13", "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -855,11 +834,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1733749988, "lastModified": 1733376361,
"narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", "narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -887,11 +866,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1733759999, "lastModified": 1733581040,
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -924,11 +903,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733852083, "lastModified": 1733165916,
"narHash": "sha256-YOsI10F1NowyOUOq5/Z9anYv8J4nf3ZethaVZXOAe28=", "narHash": "sha256-RD2GTloevZPePtWWJV6Doi4vEHxmqoRUJlKTtDJPEP4=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "pixi-flake", "repo": "pixi-flake",
"rev": "59e02435f47710f2dbb57e441172a53f0582dfc4", "rev": "657b09c683100f21633818ee13564447b0ab487b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -948,11 +927,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1732021966, "lastModified": 1733318908,
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -963,7 +942,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"NixVirt": "NixVirt",
"comin": "comin", "comin": "comin",
"f1multiviewer": "f1multiviewer", "f1multiviewer": "f1multiviewer",
"ghostty": "ghostty", "ghostty": "ghostty",
@ -1014,11 +992,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733965552, "lastModified": 1733128155,
"narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1029,11 +1007,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1733730953, "lastModified": 1733384649,
"narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7109b680d161993918b0a126f38bc39763e5a709", "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1229,11 +1207,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731703417, "lastModified": 1733157064,
"narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", "narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "8070f36deec723de71e7557441acb17e478204d3", "rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -83,12 +83,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
NixVirt = {
# master as of 2024.12.12
url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
inputs.nixpkgs.follows = "nixpkgs";
};
# roc = { # roc = {
# url = "github:roc-lang/roc"; # url = "github:roc-lang/roc";
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";

5
hosts/algiz/default.nix
View file

@ -1,5 +1,4 @@
{ {
inputs,
config, config,
enabled, enabled,
enableAttrs, enableAttrs,
@ -7,10 +6,6 @@
... ...
}: }:
{ {
imports = [
inputs.comin.nixosModules.comin
];
oizys = { oizys = {
rune.motd = enabled; rune.motd = enabled;
languages = "nim|node|python|nushell" |> listify; languages = "nim|node|python|nushell" |> listify;

2
hosts/othalan/default.nix
View file

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

26
hosts/othalan/virt.nix Normal file
View file

@ -0,0 +1,26 @@
{
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" ];
};
}

48
hosts/othalan/virt/default.nix
View file

@ -1,48 +0,0 @@
{
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" ];
};
}

215
hosts/othalan/virt/win11.xml
View file

@ -1,215 +0,0 @@
<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>

2
lib/extended.nix
View file

@ -104,10 +104,8 @@ let
pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}"; pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
pkgFromSystem = system: flake: (pkgsFromSystem system flake).default; pkgFromSystem = system: flake: (pkgsFromSystem system flake).default;
overlayFrom = flake: inputs."${flake}".overlays.default; overlayFrom = flake: inputs."${flake}".overlays.default;
nixosModuleFrom = flake: inputs."${flake}".nixosModules.default;
flakeFromSystem = system: { flakeFromSystem = system: {
overlay = overlayFrom; overlay = overlayFrom;
module = nixosModuleFrom;
pkgs = pkgsFromSystem system; pkgs = pkgsFromSystem system;
pkg = pkgFromSystem system; pkg = pkgFromSystem system;
}; };

7
lib/generators.nix
View file

@ -20,6 +20,7 @@ let
flake = flakeFromSystem "x86_64-linux"; flake = flakeFromSystem "x86_64-linux";
hostPath = host: ../. + "/hosts/${host}"; hostPath = host: ../. + "/hosts/${host}";
# all nix files not including pkgs.nix
hostFiles = host: host |> hostPath |> listFilesRecursive |> filter isNixFile; hostFiles = host: host |> hostPath |> listFilesRecursive |> filter isNixFile;
nixosModules = names: names |> listify |> map (n: inputs.${n}.nixosModules.default); nixosModules = names: names |> listify |> map (n: inputs.${n}.nixosModules.default);
@ -45,9 +46,11 @@ let
nixosSystem { nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
[] [
inputs.comin.nixosModules.comin
]
++ (selfModules ''oizys'') ++ (selfModules ''oizys'')
++ (nixosModules ''lix-module|sops-nix'') ++ (nixosModules ''lix-module|hyprland|sops-nix'')
++ (hostFiles hostName); ++ (hostFiles hostName);
specialArgs = commonSpecialArgs // { specialArgs = commonSpecialArgs // {

145
modules/desktop/window-managers/hyprland.nix
View file

@ -1,82 +1,85 @@
{ {
inputs,
pkgs, pkgs,
config, config,
lib, mkOizysModule,
# mkOizysModule,
enabled, enabled,
flake, flake,
... ...
}: }:
let mkOizysModule config "hyprland" {
inherit (lib) mkEnableOption mkIf; programs.hyprland = enabled;
cfg = config.oizys.hyprland; security.pam.services.swaylock = { };
in # Optional, hint electron apps to use wayland:
{ environment.sessionVariables.NIXOS_OZONE_WL = "1";
imports = [
inputs.hyprland.nixosModules.default 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")
]; ];
options.oizys.hyprland.enable = mkEnableOption "hyprland"; services.getty = {
extraArgs = [ "--skip-login" ];
config = mkIf cfg.enable { loginOptions = "-p -- ${config.oizys.user}";
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;
# };
#
} }

2
modules/essentials.nix
View file

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

2
modules/oizys.nix
View file

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

13
modules/utils/default.nix
View file

@ -1,13 +0,0 @@
{
config,
pkgs,
mkOizysModule,
...
}:
mkOizysModule config "utils" {
# a grab bag of classic utils I probably want installed by default
environment.systemPackages = with pkgs; [
feh
jq
];
}