diff --git a/systems/nixos-desk/default.nix b/systems/nixos-desk/default.nix index 18ec9a7..f2d583d 100644 --- a/systems/nixos-desk/default.nix +++ b/systems/nixos-desk/default.nix @@ -83,6 +83,20 @@ networking = { hostName = "nixos-desk"; 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 = { enableRedistributableFirmware = true; diff --git a/systems/rescue-iso/default.nix b/systems/rescue-iso/default.nix index 1e49891..df2cd75 100644 --- a/systems/rescue-iso/default.nix +++ b/systems/rescue-iso/default.nix @@ -26,21 +26,26 @@ kernelPatches = pkgs.callPackage "${inputs.nixpkgs}/pkgs/os-specific/linux/kernel/patches.nix" { }; # ref = "6efbea77b390604a7be7364583e19cd2d6a1291b"; ref = "bc6d2d10418e1bfdb95b16f5dd4cca42d5dec766"; - linux_mainline = { buildLinux, fetchzip, ... } @ args: buildLinux { - 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="; + linux_mainline = + { buildLinux + , fetchzip + , ... + } @ args: + buildLinux { + 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 { }; linuxMainlinePkgs = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linuxMainlinePkg); in