steveej-x13s: bump kernel

router0-dmz0: bump to 24.11
vscode: keep only nixfmt-rfc-style
2024-11-23 14:47:29 +01:00 · 2024-11-23 14:47:29 +01:00 · 2024-11-23 14:47:29 +01:00 · 2024-11-23 14:47:29 +01:00 · 2024-11-23 14:47:26 +01:00
10 changed files with 76 additions and 94 deletions
--- a/flake.nix
+++ b/flake.nix
@ -161,7 +161,7 @@
                    inherit nodeName;
                    repoFlake = self;
                    repoFlakeWithSystem = withSystem;
-                    nodeFlake = self.inputs.get-flake ./nix/os/devices/${nodeName};
+                    nodeFlake = self.inputs.get-flake (self + "/nix/os/devices/${nodeName}");
                  }
                )
                [
@ -190,7 +190,7 @@
        flake.nixosConfigurations =
          let
            colmenaHive = (inputs.colmena.lib.makeHive self.outputs.colmena).nodes;
-            router0-dmz0 = (inputs.get-flake ./nix/os/devices/router0-dmz0).nixosConfigurations;
+            router0-dmz0 = (inputs.get-flake (self + "/nix/os/devices/router0-dmz0")).nixosConfigurations;
          in
          colmenaHive
          // {
@ -200,7 +200,7 @@
            # nixos-rebuild switch --flake .\#router0-dmz0_cross --build-host localhost --target-host root@192.168.10.1
            router0-dmz0_cross = router0-dmz0.cross;

-            steveej-x13s_cross = (inputs.get-flake ./nix/os/devices/steveej-x13s).nixosConfigurations.cross;
+            steveej-x13s_cross = (inputs.get-flake (self + "./nix/os/devices/steveej-x13s")).nixosConfigurations.cross;
            steveej-x13s-rmvbl_cross =
              (inputs.get-flake ./nix/os/devices/steveej-x13s-rmvbl).nixosConfigurations.cross;
          };
@ -234,47 +234,10 @@

                inherit (inputs'.colmena.packages) colmena;

-                prs = pkgs.callPackage (
-                  {
-                    dbus,
-                    glib,
-                    gpgme,
-                    gtk3,
-                    libxcb,
-                    libxkbcommon,
-                    installShellFiles,
-                    pkg-config,
-                    python3,
-                  }:
-                  craneLib.buildPackage {
-                    pname = "prs";
-                    version = inputs.prs.shortRev;
+                prs = pkgs.prs.overrideAttrs(_: {
                  src = inputs.prs;
-                    nativeBuildInputs = [
-                      gpgme
-                      installShellFiles
-                      pkg-config
-                      python3
-                    ];
-
-                    buildInputs = [
-                      dbus
-                      glib
-                      gpgme
-                      gtk3
-                      libxcb
-                      libxkbcommon
-                    ];
-
-                    cargoExtraArgs = "--features backend-gpgme";
-
-                    postInstall = ''
-                      for shell in bash fish zsh; do
-                        installShellCompletion --cmd prs --$shell <($out/bin/prs internal completions $shell --stdout)
-                      done
-                    '';
-                  }
-                ) { };
+                  version = inputs.prs.shortRev;
+                });

                nomad = inputs'.nixpkgs-unstable.legacyPackages.nomad_1_6;

--- a/nix/devShells.nix
+++ b/nix/devShells.nix
@ -91,12 +91,12 @@
    KANIDM_URL =
      self.nixosConfigurations.sj-srv1.config.containers.webserver.config.services.kanidm.serverSettings.origin;

-    shellHook =
+    shellHook = builtins.concatStringsSep "\n" [
      (self.inputs.nixago.lib.${pkgs.system}.make {
        data = self'.formatter.settings;
        output = "treefmt.toml";
        format = "toml";
      }).shellHook
-      + '''';
+    ];
  };
 }
--- a/nix/home-manager/programs/openvscode-server.nix
+++ b/nix/home-manager/programs/openvscode-server.nix
@ -6,9 +6,7 @@ in
  home.packages = [
    pkgs.nil
    pkgs.nixd
-    pkgs.nixpkgs-fmt
-    pkgs.alejandra
-    pkgs.nixfmt
+    pkgs.nixfmt-rfc-style

    # TODO: automate linking this
    # 1. get the commit with: `codium --version`
--- a/nix/home-manager/programs/vscode/default.nix
+++ b/nix/home-manager/programs/vscode/default.nix
@ -59,7 +59,7 @@ in
      )
      ++ (
        let
-          nix4vscodeConfig = pkgs.writeText "nix4vscode.toml" ''
+          nix4vscodeToml = pkgs.writeText "nix4vscode.toml" ''
            vscode_version = "${config.programs.vscode.package.version}"

            [[extensions]]
@ -70,18 +70,31 @@ in
            publisher_name = "ibecker"
            extension_name = "treefmt-vscode"
          '';
-          nix4vscode =
+          nix4vscodeNix =
            pkgs.runCommand "nix4vscode.nix"
              {
+                # nix4vscode needs internet access
                __noChroot = true;
-                nativeBuildInputs = [ repoFlake.inputs.nix4vscode.packages.${pkgs.stdenv.system}.default ];
+                requiredSystemFeatures = [ "recursive-nix" ];
+                buildInputs = [
+                  pkgs.nix
+                  pkgs.cacert
+                  repoFlake.inputs.nix4vscode.packages.${pkgs.stdenv.system}.default
+                  # pkgs.strace
+                ];
+                # outputHashAlgo = "sha256";
+                # outputHashMode = "recursive";
+                # outputHash = lib.fakeSha256;
              }
              ''
-                export RUST_BACKTRACE=full
+                # set -x
+                # export RUST_BACKTRACE=full
+                # export RUST_LOG=trace
                export HOME=$(mktemp -d)
-                nix4vscode ${nix4vscodeConfig} > $out
+                # strace -ffZyyY
+                nix4vscode ${nix4vscodeToml} > $out
              '';
-          nix4vscodeExtensions = builtins.removeAttrs (pkgs.callPackage nix4vscode { }) [
+          nix4vscodeExtensions = builtins.removeAttrs (pkgs.callPackage nix4vscodeNix { }) [
            "override"
            "overrideDerivation"
          ];
@ -95,8 +108,8 @@ in
  };

  home.packages = [
-    pkgs.nixpkgs-fmt
    pkgs.nil
+    pkgs.nixfmt-rfc-style
  ];
 }
 # TODO: automate
--- a/nix/os/devices/router0-dmz0/configuration.nix
+++ b/nix/os/devices/router0-dmz0/configuration.nix
@ -384,6 +384,10 @@ in

  systemd.network = {
    wait-online.anyInterface = true;
+    config.networkConfig = {
+      IPv4Forwarding = true;
+      IPv6Forwarding = true;
+    };
    netdevs =
      let
        router0-ifog_wg0Endpoint = "${repoFlake.colmena.router0-ifog.deployment.targetHost}:${builtins.toString repoFlake.nixosConfigurations.router0-ifog.config.systemd.network.netdevs.wg0.wireguardConfig.ListenPort}";
@ -537,7 +541,6 @@ in
            DHCP = true;
            DNSOverTLS = true;
            DNSSEC = true;
-            IPForward = true;

            # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
            IPv6AcceptRA = true;
--- a/nix/os/devices/router0-dmz0/flake.lock
+++ b/nix/os/devices/router0-dmz0/flake.lock
@ -28,11 +28,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728109432,
-        "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=",
+        "lastModified": 1732221404,
+        "narHash": "sha256-fWTyjgGt+BHmkeJ5IxOR4zGF4/uc+ceWmhBjOBSVkgQ=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "48ebb577855fb2398653f033b3b2208a9249203d",
+        "rev": "97c0c4d7072f19b598ed332e9f7f8ad562c6885b",
        "type": "github"
      },
      "original": {
@ -63,16 +63,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1731880681,
+        "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
        "repo": "home-manager",
        "type": "github"
      }
@ -80,11 +80,11 @@
    "hostapd": {
      "flake": false,
      "locked": {
-        "lastModified": 1727905939,
-        "narHash": "sha256-LZHwXN8lBcDpKQVB3GcYI0SVzj6WXd2E0GDqhQh503w=",
+        "lastModified": 1732101105,
+        "narHash": "sha256-u/n1vkmRBpcq669kXpCdgfF5I+gL7DkV/0wWhyc2sSA=",
        "ref": "refs/heads/main",
-        "rev": "d84323d05ef30cdcf343884ac34420caf72145bd",
-        "revCount": 19910,
+        "rev": "25d29d65aa6df173eb9f6b44d4dc0536df66b4ba",
+        "revCount": 20028,
        "type": "git",
        "url": "git://w1.fi/hostap.git?branch=main"
      },
@ -121,43 +121,43 @@
        ]
      },
      "locked": {
-        "lastModified": 1723893138,
-        "narHash": "sha256-TCGUFSBIaItvaFa+ydPII+Ayrn3OHfV1220RLgtWh5s=",
+        "lastModified": 1732269090,
+        "narHash": "sha256-tISFHFFb96UbgFZ3a36q2lfaKcXzxAyVt50GykfSqUM=",
        "owner": "steveej-forks",
        "repo": "nakato_nixos-sbc",
-        "rev": "5fb94671a47229e269383e736cb1764c94803ebb",
+        "rev": "e67d80bf50a725ff3b0003d92f9280a33dbf8967",
        "type": "github"
      },
      "original": {
        "owner": "steveej-forks",
-        "ref": "kernel-6.10_and_cross-compile_mtkbump",
+        "ref": "wifi-workaround",
        "repo": "nakato_nixos-sbc",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1728067476,
-        "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
+        "lastModified": 1731755305,
+        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
+        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1728018373,
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
        "type": "github"
      },
      "original": {
@ -206,11 +206,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728127082,
-        "narHash": "sha256-MDU/aVPcR5Fk+x1B+SAsyYG47k5cvFvGTrqZIev2Jck=",
+        "lastModified": 1732050592,
+        "narHash": "sha256-WuGCnlt1xhHJfsHpPXdV3gH9Khe4gJ1+abWCHFcddvM=",
        "owner": "numtide",
        "repo": "srvos",
-        "rev": "7aaa72eb804248436ea20c084a7891a383e23b02",
+        "rev": "be4533b50ac69cd871ab73d4101c47b397b8c143",
        "type": "github"
      },
      "original": {
--- a/nix/os/devices/router0-dmz0/flake.nix
+++ b/nix/os/devices/router0-dmz0/flake.nix
@ -1,11 +1,11 @@
 {
  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

    get-flake.url = "github:ursi/get-flake";

-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
    home-manager.inputs.nixpkgs.follows = "nixpkgs";

    disko.url = "github:nix-community/disko";
@ -17,7 +17,7 @@
      # "github:nakato/nixos-sbc"
      # "github:steveej-forks/nakato_nixos-sbc/kernel-6.9_and_cross-compile"
      # "github:steveej-forks/nakato_nixos-sbc/kernel-6.10_and_cross-compile"
-      "github:steveej-forks/nakato_nixos-sbc/kernel-6.10_and_cross-compile_mtkbump"
+      "github:steveej-forks/nakato_nixos-sbc/wifi-workaround"
    # "git+file:///home/steveej/src/others/nakato_nixos-sbc/"
    ;
    nixos-sbc.inputs.nixpkgs.follows = "nixpkgs";
@ -37,6 +37,8 @@
    #   url = "file+https://raw.githubusercontent.com/openwrt/openwrt/847984c773d819d5579d5abae4b80a4983103ed9/package/network/services/hostapd/patches/710-vlan_no_bridge.patch";
    #   flake = false;
    # };
+
+    # repoFlake.url = "path:../../../..";
  };

  outputs =
@ -63,6 +65,8 @@
                inherit nodeName;

                repoFlake = get-flake ../../../..;
+                # repoFlake = get-flake ./.;
+                # repoFlake = self.inputs.repoFlake;
                nodeFlake = self;
              }).meta.nodeSpecialArgs.${nodeName};

--- a/nix/os/devices/steveej-x13s/configuration.nix
+++ b/nix/os/devices/steveej-x13s/configuration.nix
@ -127,7 +127,7 @@
            "kvm"
            "nixos-test"
          ];
-          maxJobs = 4;
+          maxJobs = 8;
        }

        {
--- a/nix/os/devices/steveej-x13s/flake.lock
+++ b/nix/os/devices/steveej-x13s/flake.lock
@ -165,16 +165,16 @@
    "linux-jhovold": {
      "flake": false,
      "locked": {
-        "lastModified": 1730883079,
-        "narHash": "sha256-+ZU70M+mqo9SZNLkVtCM0+TdXEh7X39Kxmk6z58GMaM=",
+        "lastModified": 1731424601,
+        "narHash": "sha256-+ErrKhGSyiBJGwO1XrfxzsLoGWoJmVD2ldi5Ag5uJqE=",
        "owner": "jhovold",
        "repo": "linux",
-        "rev": "9e9890798b6b4e81db66c572ee6acd291cf8cb77",
+        "rev": "15326bf5cbf6526eefb10cb5bc112a6a95990ec2",
        "type": "github"
      },
      "original": {
        "owner": "jhovold",
-        "ref": "wip/sc8280xp-6.12-rc6",
+        "ref": "wip/sc8280xp-6.12-rc7",
        "repo": "linux",
        "type": "github"
      }
@ -247,11 +247,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1731101150,
-        "narHash": "sha256-M9xa6UX6eidLFEfwHWkHkFJ+OgjuFqCIvuqsDSReyy4=",
+        "lastModified": 1731793780,
+        "narHash": "sha256-gOpR24dG7PUktUmlF2nDg0nqvlli7ZC179ngYMpGlfw=",
        "ref": "bump",
-        "rev": "b74e8bfe82f059a5854cfc40f7206191edff365d",
-        "revCount": 117,
+        "rev": "b957608c2a0b7808f17588be2f38d8ddb6321b2f",
+        "revCount": 118,
        "type": "git",
        "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
      },
--- a/nix/os/snippets/nix-settings.nix
+++ b/nix/os/snippets/nix-settings.nix
@ -19,6 +19,7 @@ in
    "nix-command"
    "flakes"
    "ca-derivations"
+    "recursive-nix"
  ];

  nix.settings.system-features = [
Author	SHA1	Message	Date
Stefan Junker	229b3cb0d3	steveej-x13s: bump kernel	2024-11-23 14:47:29 +01:00
Stefan Junker	2a1043932d	router0-dmz0: bump to 24.11	2024-11-23 14:47:29 +01:00
Stefan Junker	b228938d63	vscode: keep only nixfmt-rfc-style	2024-11-23 14:47:29 +01:00
Stefan Junker	720892ea59	flake: copy all of self in get-flake args	2024-11-23 14:47:29 +01:00
Stefan Junker	61492aefc6	feat(vscode): inline nix4vscode call	2024-11-23 14:47:26 +01:00