Merge branch 'master' of git.bitlab21.com:sam/nixos

This commit is contained in:
Sam 2025-01-26 11:49:02 +00:00
commit 08e680752c
2 changed files with 14 additions and 14 deletions

24
flake.lock generated
View file

@ -601,11 +601,11 @@
},
"nixpkgs-unstable_2": {
"locked": {
"lastModified": 1737469691,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"lastModified": 1737632463,
"narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github"
},
"original": {
@ -633,11 +633,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1737584761,
"narHash": "sha256-xP8UQqo3XSXy92tQ+wFvps46rVHnIc8W7ShQ5CUQALo=",
"lastModified": 1737761447,
"narHash": "sha256-iF7lFu65s358zskK12Zd8mY68mU8EdEKfEyflvsC94U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f7b572b004be8e60c6727b3856a13efe17323212",
"rev": "8827312350044725e010d9fe11dc50869f1c64f8",
"type": "github"
},
"original": {
@ -649,11 +649,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1737469691,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"lastModified": 1737632463,
"narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github"
},
"original": {
@ -699,11 +699,11 @@
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1737602136,
"narHash": "sha256-Jr7tmhsZVAebD/TCpijDqcxr4w15wnPCOrlk+t4lrJA=",
"lastModified": 1737774428,
"narHash": "sha256-oSmrvHlvITBCK49l7hn6M19LmZ6wqLWWsu5KeK4xbLE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "80b6ff6a51dbebbe0bcc71858ae9a299e1207704",
"rev": "6872236a5739af0352f764ba00bc537d985e36e5",
"type": "github"
},
"original": {

View file

@ -8,7 +8,7 @@
user = "admin";
merlinIp = configVars.networking.addresses.merlin.ip;
cloudnixIp = configVars.networking.addresses.cloudnix.ip;
btrfsMountDevice = "/dev/sda2";
btrfsMountDevice = "/dev/disk/by-uuid/2aec8052-68fc-4bac-9b8d-c10b9b659ad8";
in {
imports = [
# Create users for this host
@ -39,7 +39,7 @@ in {
efi.canTouchEfiVariables = false;
grub = {
enable = true;
devices = ["/dev/sda"];
devices = ["/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_57492184"];
};
};
};