From 0a4d68e3fd491809a530e4f174612e0426868e89 Mon Sep 17 00:00:00 2001 From: Kris Date: Wed, 25 Feb 2026 16:05:08 +0200 Subject: [PATCH] server: add 1.0.0.1 fallback to forced resolv.conf --- flake.nix | 5 +-- hosts/server/configuration.nix | 4 +- hosts/server/hardware-configuration.nix | 51 +++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 hosts/server/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 94819b1..d14e7f0 100644 --- a/flake.nix +++ b/flake.nix @@ -88,10 +88,9 @@ inputs.chaotic.nixosModules.nyx-overlay inputs.chaotic.nixosModules.nyx-registry - # lil hack to not use --impure when rebuilding nixos >:3 - "/etc/nixos/hardware-configuration.nix" - ./hosts/server/configuration.nix + ./hosts/server/hardware-configuration.nix + ]; }; nixosConfigurations.fix_nixpkgs = nixpkgs.lib.nixosSystem { diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 44f4fc1..2853118 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -134,12 +134,12 @@ ]; # Force resolver config to Cloudflare only. - networking.nameservers = lib.mkForce [ "1.1.1.1" ]; + networking.nameservers = lib.mkForce [ "1.1.1.1" "1.0.0.1" ]; environment.etc."resolv.conf".text = lib.mkForce '' nameserver 1.1.1.1 + nameserver 1.0.0.1 ''; - catppuccin = { enable = true; flavor = "mocha"; diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix new file mode 100644 index 0000000..e7dc2b3 --- /dev/null +++ b/hosts/server/hardware-configuration.nix @@ -0,0 +1,51 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/5ca305a1-d705-4c99-913c-a2d1c3447282"; + fsType = "btrfs"; + options = [ "subvol=root" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/5ca305a1-d705-4c99-913c-a2d1c3447282"; + fsType = "btrfs"; + options = [ "subvol=home" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/5ca305a1-d705-4c99-913c-a2d1c3447282"; + fsType = "btrfs"; + options = [ "subvol=nix" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/732D-084E"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + # swapDevices = [ { device = "/swap/swapfile"; } ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}