tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Format & add hostnames

Browse source
This commit is contained in:
Tristan D. 2024-11-18 00:09:11 +01:00
parent f50259785f
commit 67ea5d6550
Signed by: tristan
SSH key fingerprint: SHA256:3RU4RLOoM8oAjFU19f1W6t8uouZbA7GWkaSW6rjp1k8
2 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
systems/nixos-desk/default.nix
View file

@ -83,6 +83,20 @@
networking = { networking = {
hostName = "nixos-desk"; hostName = "nixos-desk";
useDHCP = lib.mkDefault true; useDHCP = lib.mkDefault true;
extraHosts = ''
100.64.0.1 oekonzept.net
100.64.0.1 camt.oekonzept.net
100.64.0.1 camt-cbg.oekonzept.net
100.64.0.1 camt-eth.oekonzept.net
100.64.0.1 camt-pro.oekonzept.net
100.64.0.1 camt-swbfk.oekonzept.net
100.64.0.1 cloud.oekonzept.net
100.64.0.1 office.oekonzept.net
100.64.0.1 llama.oekonzept.net
100.64.0.1 netdata.oekonzept.net
100.64.0.1 oproject.oekonzept.net
100.64.0.1 leantime.oekonzept.net
'';
}; };
hardware = { hardware = {
enableRedistributableFirmware = true; enableRedistributableFirmware = true;

33
systems/rescue-iso/default.nix
View file

@ -26,21 +26,26 @@
kernelPatches = pkgs.callPackage "${inputs.nixpkgs}/pkgs/os-specific/linux/kernel/patches.nix" { }; kernelPatches = pkgs.callPackage "${inputs.nixpkgs}/pkgs/os-specific/linux/kernel/patches.nix" { };
# ref = "6efbea77b390604a7be7364583e19cd2d6a1291b"; # ref = "6efbea77b390604a7be7364583e19cd2d6a1291b";
ref = "bc6d2d10418e1bfdb95b16f5dd4cca42d5dec766"; ref = "bc6d2d10418e1bfdb95b16f5dd4cca42d5dec766";
linux_mainline = { buildLinux, fetchzip, ... } @ args: buildLinux { linux_mainline =
version = version; { buildLinux
src = fetchzip { , fetchzip
# url = "https://git.kernel.org/torvalds/t/linux-${ref}.tar.gz"; , ...
# hash = ""; } @ args:
url = "https://github.com/koverstreet/bcachefs/archive/${ref}.tar.gz"; buildLinux {
hash = "sha256-tq0dXKVtW1R+Yenv7HG4Qqc1P49OzcJgICpoZLkA/K4="; version = version;
src = fetchzip {
# url = "https://git.kernel.org/torvalds/t/linux-${ref}.tar.gz";
# hash = "";
url = "https://github.com/koverstreet/bcachefs/archive/${ref}.tar.gz";
hash = "sha256-tq0dXKVtW1R+Yenv7HG4Qqc1P49OzcJgICpoZLkA/K4=";
};
modDirVersion = lib.versions.pad 3 version;
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
extraMeta.branch = "master";
}; };
modDirVersion = lib.versions.pad 3 version;
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
extraMeta.branch = "master";
};
linuxMainlinePkg = pkgs.callPackage linux_mainline { }; linuxMainlinePkg = pkgs.callPackage linux_mainline { };
linuxMainlinePkgs = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linuxMainlinePkg); linuxMainlinePkgs = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linuxMainlinePkg);
in in