Merge pull request 'update flake' (#88) from update-flake into main
Reviewed-on: #88
This commit is contained in:
commit
2eaf9d4d39
GPG key ID:
C9974EDF9932B558
5 changed files with 70 additions and 38 deletions
|
|
@ -1,9 +1,10 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
lib,
|
||||
nixos-hardware,
|
||||
nixpkgs,
|
||||
nix-packages,
|
||||
...
|
||||
} @ args: {
|
||||
networking.hostName = "nas";
|
||||
|
|
@ -60,7 +61,6 @@
|
|||
extraOptions = ["--loadavg-target" "5.0"];
|
||||
};
|
||||
|
||||
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_testing_bcachefs;
|
||||
boot.supportedFilesystems = lib.mkForce ["btrfs" "vfat"];
|
||||
|
||||
fileSystems."/" = {
|
||||
|
|
@ -178,4 +178,33 @@
|
|||
"/ip4/0.0.0.0/tcp/5001"
|
||||
"/ip6/::/tcp/5001"
|
||||
]; # Only exposed over the tailed scale
|
||||
|
||||
# Remove when https://nixpk.gs/pr-tracker.html?pr=235815 hits
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
util-linux = super.util-linux.overrideAttrs (super: {
|
||||
patches =
|
||||
super.patches
|
||||
++ [
|
||||
# FIXME: backport bcache detection fixes, remove in next release
|
||||
(self.fetchpatch {
|
||||
url = "https://github.com/util-linux/util-linux/commit/158639a2a4c6e646fd4fa0acb5f4743e65daa415.diff";
|
||||
hash = "sha256-9F1OQFxKuI383u6MVy/UM15B6B+tkZFRwuDbgoZrWME=";
|
||||
})
|
||||
(self.fetchpatch {
|
||||
url = "https://github.com/util-linux/util-linux/commit/00a19fb8cdfeeae30a6688ac6b490e80371b2257.diff";
|
||||
hash = "sha256-w1S6IKSoL6JhVew9t6EemNRc/nrJQ5oMqFekcx0kno8=";
|
||||
})
|
||||
];
|
||||
});
|
||||
inherit (nixpkgs.legacyPackages.x86_64-linux) e2fsprogs openldap;
|
||||
hydra-unstable = nix-packages.packages.x86_64-linux.hydra-unstable.overrideAttrs (super: {
|
||||
doCheck = false;
|
||||
doInstallCheck = false;
|
||||
checkPhase = "true";
|
||||
installCheckPhase = "true";
|
||||
});
|
||||
hydra = self.hydra-unstable;
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,13 @@
|
|||
port = 22;
|
||||
user = "remote-build";
|
||||
};
|
||||
"backup" = {
|
||||
hostname = "backup.int.chir.rs";
|
||||
identitiesOnly = true;
|
||||
identityFile = "${config.home.homeDirectory}/.ssh/builder_id_ed25519";
|
||||
port = 22;
|
||||
user = "backup";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,10 +75,6 @@ in {
|
|||
home = "/backup";
|
||||
isSystemUser = true;
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAN/rVZJuwiO44LwOqimpH4zyGehYUMF2ZhYFXUCkupP hydra-queue-runner@nas"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuWXwZAQYnC2oso7In6BNNM3H+Ek7s6ygIuEvqE3YUf root@nutty-noon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDpO0Lh7eOE/EBttb/XWZ6ISiJ0RkmBYfruq3U6linEz root@nixos-8gb-fsn1-1"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKB8oH1XbuGrKn/SeguXz96sw4AjJQQvZyAdpptotzOr root@thinkrac"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINN5Q/L2FyB3DIgdJRYnTGHW3naw5VQ9coOdwHYmv0aZ darkkirb@thinkrac"
|
||||
];
|
||||
group = "backup";
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
installPhase = ''
|
||||
mkdir $out
|
||||
cd $out
|
||||
7z x ${win11Iso} boot efi sources/boot.wim
|
||||
7z x ${win11Iso} efi/microsoft/boot/bcd boot/fonts/segmono_boot.ttf boot/fonts/segoe_slboot.ttf boot/fonts/segoen_slboot.ttf boot/fonts/wgl4_boot.ttf boot/boot.sdi sources/boot.wim
|
||||
ln -sv ${installBat} install.bat
|
||||
ln -sv ${winpeshlIni} winpeshl.ini
|
||||
'';
|
||||
|
|
|
|||
62
flake.lock
62
flake.lock
|
|
@ -243,11 +243,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682020898,
|
||||
"narHash": "sha256-XYSSFmqIjsvmgusWaOSD/WeaTyH8o83i+qma1BQgARU=",
|
||||
"lastModified": 1686221213,
|
||||
"narHash": "sha256-9Uc1jBc5a3EaOH80P6YPILL+GXlul7lEJIKAZ/BXELw=",
|
||||
"owner": "AgathaSorceress",
|
||||
"repo": "colorpickle",
|
||||
"rev": "2574b83cb0454a146a0346bf0d6a134d62241e60",
|
||||
"rev": "d1c210c494c0eaf69426ec411c2cf74c79b0129d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -833,11 +833,11 @@
|
|||
},
|
||||
"haskell-flake": {
|
||||
"locked": {
|
||||
"lastModified": 1685727978,
|
||||
"narHash": "sha256-kSDetNgDoaIFO11vAyJXaO9Eh3iGhpZbve6AKib7ctw=",
|
||||
"lastModified": 1686160859,
|
||||
"narHash": "sha256-UE+0TQHyPxF8jhbLEeqvNQAy7B79bBix/rpFrf5nsn0=",
|
||||
"owner": "srid",
|
||||
"repo": "haskell-flake",
|
||||
"rev": "1f0a5ee4f69b0740ad6eb93cd0b4fb4265f7f6b6",
|
||||
"rev": "908a59167f78035a123ab71ed77af79bed519771",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -868,11 +868,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685721552,
|
||||
"narHash": "sha256-ifvq/zlO7lck8q+YkC5uom/h8/MVdMcQEldOL3cDQW0=",
|
||||
"lastModified": 1686241374,
|
||||
"narHash": "sha256-fxlUjZx3VtQvNPTp/YX9uY//1UPbR3CBvUL3ajDRCyE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "29519461834c08395b35f840811faf8c23e3b61c",
|
||||
"rev": "f889ec0ec366e3ad8fb94e3afa7a31f3ee1da3b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -905,11 +905,11 @@
|
|||
"hosts-list": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1685762521,
|
||||
"narHash": "sha256-MPBSGZes2bqjSi26cKjzZBs19QaPzroccW6PGVguuNE=",
|
||||
"lastModified": 1686096228,
|
||||
"narHash": "sha256-DKj2lxgdfkrWR/hNuP4kzqdcSEsqOKP9Mo7hEBxHp/o=",
|
||||
"owner": "StevenBlack",
|
||||
"repo": "hosts",
|
||||
"rev": "cbadab339ba40f6da9b1638cd6789b81269ec291",
|
||||
"rev": "a7d1521e95aecc47fd807d7163858a94ef53327f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1229,11 +1229,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685790655,
|
||||
"narHash": "sha256-l42Iltftfg2OVEiP91BT4jVdbXDbO0OXddENlglCrrU=",
|
||||
"lastModified": 1686293339,
|
||||
"narHash": "sha256-E3A9WXX8MLBLzk3bAmUK8uDSr9ctcOEaMMoKtBWMxpc=",
|
||||
"ref": "main",
|
||||
"rev": "b10293efa3a072e768bce5868368c9122f1a72ef",
|
||||
"revCount": 886,
|
||||
"rev": "0a59fc8f2942bb2909781a5396336485b4ba6e70",
|
||||
"revCount": 892,
|
||||
"type": "git",
|
||||
"url": "https://git.chir.rs/darkkirb/nix-packages.git"
|
||||
},
|
||||
|
|
@ -1381,11 +1381,11 @@
|
|||
},
|
||||
"nixos-hardware_2": {
|
||||
"locked": {
|
||||
"lastModified": 1684899633,
|
||||
"narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=",
|
||||
"lastModified": 1686217350,
|
||||
"narHash": "sha256-Nb9b3m/GEK8jyFsYfUkXGsqj6rH05GgJ2QWcNNbK7dw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "4cc688ee711159b9bcb5a367be44007934e1a49d",
|
||||
"rev": "e4b34b90f27696ec3965fa15dcbacc351293dc67",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1556,11 +1556,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1685790686,
|
||||
"narHash": "sha256-dpKdQ6L/86Kp5oq1NcjhSRGGzwATns1GiGZOf9mtwHE=",
|
||||
"lastModified": 1686250461,
|
||||
"narHash": "sha256-ouMNBN3q4kk3lyP110mh4xmEgV2eq2dx29UL180QeLI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "182977d19e6817fcfbdae3cd9735085d5d5407f9",
|
||||
"rev": "3a1e7765172c444c348dde552ab4fa549ef59b27",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1586,11 +1586,11 @@
|
|||
},
|
||||
"nur_2": {
|
||||
"locked": {
|
||||
"lastModified": 1685791145,
|
||||
"narHash": "sha256-QXxyI9k34ZhhpWpURwzq0Yum+KTXY1q+843DPJ0gS/0=",
|
||||
"lastModified": 1686244012,
|
||||
"narHash": "sha256-HZkIAxi2fEAB6yyBQ68Z704QW6dOXIFSgzL3JjL5qEE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "eec5e7defd8ea2013dab8622e38d9e7b5d176bb7",
|
||||
"rev": "6b325c5e50e53d9e9dcfde08caee143cde7940b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1661,11 +1661,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685759304,
|
||||
"narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=",
|
||||
"lastModified": 1686191569,
|
||||
"narHash": "sha256-8ey5FOXNms9piFGTn6vJeAQmSKk+NL7GTMSoVttsNTs=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "c535b4f3327910c96dcf21851bbdd074d0760290",
|
||||
"rev": "b4b71458b92294e8f1c3a112d972e3cff8a2ab71",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1709,11 +1709,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685434555,
|
||||
"narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=",
|
||||
"lastModified": 1685848844,
|
||||
"narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "876846cde9762ae563f018c17993354875e2538e",
|
||||
"rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
Loading…
Reference in a new issue