geekygays
/
nixconf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'magrathea' of git.solarpunk.moe:geekygays/nixconf into magrathea

This commit is contained in:
Bit Borealis 2024-03-30 01:02:12 +00:00
parent c05217f296 a50c0a316e
commit e10cc0e9dc
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -149,11 +149,19 @@
},
"nixpkgs": {
"locked": {
<<<<<<< HEAD
"lastModified": 1711738046,
"narHash": "sha256-J7/vq+qaf2gZPPKAH+dK9pZAwR6wxuOVNozRQoAstHQ=",
"owner": "geekygays",
"repo": "nixpkgs",
"rev": "9b978713e26536cbc555ac33c4a4b1733a7c3eae",
=======
"lastModified": 1711712949,
"narHash": "sha256-8/qCHYhBTQx7rg65cXE8hOOCIvazEm+VnoFaSzZctMw=",
"owner": "geekygays",
"repo": "nixpkgs",
"rev": "c81d1240f87279aacaad75b0ee73ef395325f855",
>>>>>>> a50c0a316efe8a36ab5b01db9bcd0a388ec41b8b
"type": "github"
},
"original": {

6
flake.nix
View File

@ -54,9 +54,9 @@
disko.nixosModules.disko
];
systems.hosts.magrathea.modules = with inputs; [
nixos-hardware.nixosModules.starfive-visionfive-2
];
systems.hosts.magrathea.modules = with inputs; [
nixos-hardware.nixosModules.starfive-visionfive-2
];
templates.shim.description = "/etc/nixos shim for geekygay nixconf";