flake.lock

@@ -574,22 +574,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-kernel2": {
-      "locked": {
-        "lastModified": 1723362943,
-        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1717284937,
@@ -789,7 +773,6 @@
         "nixos-router": "nixos-router",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-kernel": "nixpkgs-kernel",
-        "nixpkgs-kernel2": "nixpkgs-kernel2",
         "notlua": "notlua",
         "notnft": "notnft",
         "nur": "nur",
@@ -954,17 +937,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1723583256,
+        "lastModified": 1723550937,
-        "narHash": "sha256-EhgdkSGgEFZJsPhlq3tG9LvWBaix/ZoLUeqcAUPDWlk=",
+        "narHash": "sha256-5gEXPy9qIrNi0nPk3D1ctVxh5Ndfrhyu+02R6BIcnHQ=",
-        "owner": "chayleaf",
+        "ref": "refs/heads/master",
-        "repo": "unbound-rust-mod",
+        "rev": "e0f642180056f351fd712f2b4f3149fd9f02367f",
-        "rev": "8a99f2ed1290addee2eabeb5963e6bfc4f825295",
+        "revCount": 24,
-        "type": "github"
+        "type": "git",
+        "url": "https://git.pavluk.org/chayleaf/unbound-rust-mod.git"
       },
       "original": {
-        "owner": "chayleaf",
+        "type": "git",
-        "repo": "unbound-rust-mod",
+        "url": "https://git.pavluk.org/chayleaf/unbound-rust-mod.git"
-        "type": "github"
       }
     },
     "utils": {

flake.nix

@@ -4,7 +4,6 @@
   inputs = {
     nix-community-infra.url = "github:nix-community/infra";
     nixpkgs-kernel.url = "github:NixOS/nixpkgs/c7b821ba2e1e635ba5a76d299af62821cbcb09f3";
-    nixpkgs-kernel2.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs.url = "github:chayleaf/nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nix-index-database = {
@@ -54,7 +53,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     unbound-rust-mod = {
-      url = "github:chayleaf/unbound-rust-mod";
+      url = "git+https://git.pavluk.org/chayleaf/unbound-rust-mod.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-compat = {
@@ -206,7 +205,6 @@
           ({ config, ... }: {
             _module.args = {
               pkgs-kernel = import inputs.nixpkgs-kernel { inherit (args) system; overlays = all-overlays ++ config.nixpkgs.overlays; };
-              pkgs-kernel2 = import inputs.nixpkgs-kernel2 { inherit (args) system; overlays = all-overlays ++ config.nixpkgs.overlays; };
             };
           })
           (getPrivSys hostname)

system/devices/radxa-rock5a-server.nix

@@ -37,6 +37,7 @@ in
     "net.ipv4.tcp_congestion_control" = "bbr";
   };
 
+  # as expected, systemd initrd didn't work well, and i really cba to debug it
   networking.useDHCP = false;
   networking.useNetworkd = true;
   systemd.network = {

system/hardware/oneplus-enchilada/default.nix

@@ -13,7 +13,7 @@ let
 in
 {
   imports = [
-    # "${inputs.mobile-nixos}/modules/quirks/qualcomm/sdm845-modem.nix"
+    "${inputs.mobile-nixos}/modules/quirks/qualcomm/sdm845-modem.nix"
     "${inputs.mobile-nixos}/modules/quirks/audio.nix"
   ];
 
@@ -36,7 +36,7 @@ in
         })
       ];
       hardware.enableRedistributableFirmware = true;
-      # mobile.quirks.qualcomm.sdm845-modem.enable = true;
+      mobile.quirks.qualcomm.sdm845-modem.enable = true;
       mobile.quirks.audio.alsa-ucm-meld = true;
       environment.systemPackages = [ hw.alsa-ucm-conf ];
       systemd.services.q6voiced = {

system/hardware/radxa-rock5a/default.nix

@@ -1,4 +1,4 @@
-{ pkgs-kernel2
+{ pkgs
 , config
 , ... }:
 
@@ -8,7 +8,7 @@
     "phy-rockchip-naneng-combphy"
   ];
 
-  boot.kernelPackages = pkgs-kernel2.linuxPackagesFor pkgs-kernel2.linux_latest;
+  boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest;
 
   boot.kernelParams = [ "dtb=/${config.hardware.deviceTree.name}" ];
   hardware.deviceTree.enable = true;

system/hosts/nixmsi.nix

@@ -149,13 +149,20 @@
     isNormalUser = true;
   };
   nix.settings = {
+    netrc-file = "/secrets/netrc";
     trusted-users = [ "hydra-builder" ];
+    substituters = [
+      "https://binarycache.pavluk.org"
+      "https://cache.nixos.org/"
+    ];
     trusted-substituters = [
       "https://nix-community.cachix.org"
       "https://nix-gaming.cachix.org"
       "https://nixpkgs-wayland.cachix.org"
     ];
     trusted-public-keys = [
+      "binarycache.pavluk.org:Vk0ms/vSqoOV2JXeNVOroc8EfilgVxCCUtpCShGIKsQ="
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
       "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="

system/hosts/server/home.nix

@@ -112,7 +112,6 @@ in {
     "https://git.sr.ht/"
     "https://api.github.com/repos/"
     "https://github.com/"
-    "https://git.pavluk.org/"
     # for nginx CF-Connecting-IP config generation
     "https://www.cloudflare.com/ips-v4"
     "https://www.cloudflare.com/ips-v6"

system/modules/common.nix

@@ -205,18 +205,6 @@ in {
     security.rtkit.enable = true;
     services.dbus.enable = true;
     programs.dconf.enable = true;
-
-    nix.settings = {
-      netrc-file = "/secrets/netrc";
-      substituters = [
-        "https://binarycache.pavluk.org"
-        "https://cache.nixos.org/"
-      ];
-      trusted-public-keys = [
-        "binarycache.pavluk.org:Vk0ms/vSqoOV2JXeNVOroc8EfilgVxCCUtpCShGIKsQ="
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      ];
-    };
   })
 
   ];