diff --git a/flake.lock b/flake.lock index ab624f2..898194d 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703371241, - "narHash": "sha256-f7ZcabJ5iAH2IRfVuI55xSPZ9TbegFzvFxoKtIPNEn8=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "457669db4259ff69d1ac1183aaa6000420940c1f", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1703368619, - "narHash": "sha256-ZGPMYL7FMA6enhuwby961bBANmoFX14EA86m2/Jw5Jo=", + "lastModified": 1703674883, + "narHash": "sha256-Jna6MOmLdfgot+AopHv28L+wpwVDfaiafLtO7E4bkj0=", "owner": "nix-community", "repo": "home-manager", - "rev": "a2523ea0343b056ba240abbac90ab5f116a7aa7b", + "rev": "458544594ba7f0333cf5718045ee7a8eaf5de433", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "impermanence": { "locked": { - "lastModified": 1702984171, - "narHash": "sha256-reIUBrUXibohXmvXRsgpvtlCE0QQSvWSA+qQCKohgR0=", + "lastModified": 1703656108, + "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=", "owner": "nix-community", "repo": "impermanence", - "rev": "123e94200f63952639492796b8878e588a4a2851", + "rev": "033643a45a4a920660ef91caa391fbffb14da466", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1702864432, - "narHash": "sha256-xR5Igg2hnm979W3YgMDrSjErHFhHo4rbMboF6DC0mbc=", + "lastModified": 1703387252, + "narHash": "sha256-XKJqGj0BaEn/zyctEnkgVIh6Ba1rgTRc+UBi9EU8Y54=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4605ccd764fac78b9e4b5b058698cb9f04430b91", + "rev": "f4340c1a42c38d79293ba69bfd839fbd6268a538", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703438236, + "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "type": "github" }, "original": { diff --git a/hosts/falkenstein/default.nix b/hosts/falkenstein/default.nix index a7f2e86..83aa8df 100644 --- a/hosts/falkenstein/default.nix +++ b/hosts/falkenstein/default.nix @@ -25,6 +25,7 @@ efi.efiSysMountPoint = "/boot/efi"; }; initrd.systemd.enable = true; + kernelPackages = pkgs.linuxPackages_latest; }; zramSwap.enable = true; diff --git a/hosts/falkenstein/modules/networks/default.nix b/hosts/falkenstein/modules/networks/default.nix index a1d140d..4452579 100644 --- a/hosts/falkenstein/modules/networks/default.nix +++ b/hosts/falkenstein/modules/networks/default.nix @@ -44,6 +44,10 @@ }; networks."10-wired" = { matchConfig.Name = "ens3"; + dns = [ + "2a01:4ff:ff00::add:1" + "2a01:4ff:ff00::add:2" + ]; networkConfig = { DHCP = "ipv4"; IPv6AcceptRA = "yes"; @@ -77,17 +81,11 @@ networks."30-dorm" = { matchConfig.Name = "wg0"; networkConfig = { + Address = "192.168.43.4/32"; DNS = "192.168.42.1"; DNSSEC = true; BindCarrier = [ "ens3" ]; }; - addresses = [ - { - addressConfig = { - Address = "192.168.43.4/32"; - }; - } - ]; }; }; } diff --git a/hosts/nuc/default.nix b/hosts/nuc/default.nix index 1ee4e45..e1fbaac 100644 --- a/hosts/nuc/default.nix +++ b/hosts/nuc/default.nix @@ -19,6 +19,8 @@ loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; tmp.useTmpfs = true; + kernelPackages = pkgs.linuxPackages_latest; + }; services.btrfs.autoScrub.enable = true; diff --git a/hosts/nuc/modules/networks/default.nix b/hosts/nuc/modules/networks/default.nix index 19eaf26..50b8ba9 100644 --- a/hosts/nuc/modules/networks/default.nix +++ b/hosts/nuc/modules/networks/default.nix @@ -12,7 +12,6 @@ ''; }; }; - services.lldpd.enable = true; services.resolved = { enable = true; # dnssec = "true"; @@ -39,6 +38,8 @@ matchConfig.Name = "eno1"; networkConfig = { DHCP = "yes"; + LLDP = true; + EmitLLDP = "nearest-bridge"; }; }; }; diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix index b146eac..e0aafe5 100644 --- a/hosts/thinkpad/modules/networks/default.nix +++ b/hosts/thinkpad/modules/networks/default.nix @@ -24,7 +24,6 @@ wget dnsutils ]; - services.lldpd.enable = true; services.resolved = { fallbackDns = [ "9.9.9.9" @@ -163,17 +162,11 @@ matchConfig.Name = "wg0"; linkConfig.RequiredForOnline = "carrier"; networkConfig = { + Address = "192.168.43.3/32"; DNS = "192.168.42.1"; DNSSEC = true; BindCarrier = [ "wlp9s0" "enp0s31f6" ]; }; - addresses = [ - { - addressConfig = { - Address = "192.168.43.3/32"; - }; - } - ]; }; }; programs.wireshark = { diff --git a/users/rouven/default.nix b/users/rouven/default.nix index 25d47a6..51f36c0 100644 --- a/users/rouven/default.nix +++ b/users/rouven/default.nix @@ -5,7 +5,7 @@ users.users.rouven = { description = "Rouven Seifert"; isNormalUser = true; - extraGroups = [ "wheel" "video" "libvirtd" "tss" "input" "_lldpd" "wireshark" "etherape" ]; + extraGroups = [ "wheel" "video" "libvirtd" "tss" "input" "wireshark" "etherape" ]; initialHashedPassword = "$6$X3XERQv28Nt1UUT5$MjdMBDuXyEwexkuKqmNFweez69q4enY5cjMXSbBxOc6Bq7Fhhp7OqmCm02k3OGjoZFXzPV9ZHuMSGKZOtwYIk1"; }; home-manager.useUserPackages = true;