Update to 23.11

ifd3f · Jan 1, 2024 · 66fe7c8 · 66fe7c8
1 parent ce9f9ef
commit 66fe7c8
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 32 deletions.
diff --git a/.github/workflows/check-targets.yml b/.github/workflows/check-targets.yml
@@ -60,6 +60,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -101,6 +103,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -142,6 +146,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -183,6 +189,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -229,6 +237,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -270,6 +280,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -331,6 +343,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -373,6 +387,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -416,6 +432,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -477,6 +495,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -519,6 +539,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -580,6 +602,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -628,6 +652,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -676,6 +702,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -718,6 +746,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -762,6 +792,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -824,6 +856,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -862,6 +896,50 @@ jobs:
           '
     strategy:
       fail-fast: false
+  nixos-system-xn--vp9h:
+    name: NixOS sys. xn--vp9h
+    needs:
+      - nixos-system-__baseServer
+    runs-on: ubuntu-latest
+    steps:
+      - uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+      - env:
+          KNOWN_HOSTS: ${{ env.KNOWN_HOSTS }}
+        name: Append to known_hosts
+        run: 'echo ''\n'' >> ~/.ssh/known_hosts
+
+          echo "$KNOWN_HOSTS" >> ~/.ssh/known_hosts
+
+          '
+      - uses: cachix/install-nix-action@v22
+        with:
+          extra_nix_config: 'experimental-features = nix-command flakes
+
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+
+            allowUnfree = true
+
+            '
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v12
+        with:
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          name: astralbijection
+      - env:
+          TARGET_FLAKE: ${{ env.TARGET_FLAKE }}
+        name: Build targets
+        run: GC_DONT_GC=1 nix build --show-trace --log-lines 10000 --fallback "$TARGET_FLAKE#"'nixosConfigurations.xn--vp9h.config.system.build.toplevel'
+      - if: ${{ always() }}
+        name: Log remaining space
+        run: 'echo "=== Space left after build ==="
+
+          df -h
+
+          '
+    strategy:
+      fail-fast: false
   nixos-system-yato:
     name: NixOS sys. yato
     needs:
@@ -885,6 +963,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12
@@ -932,6 +1012,8 @@ jobs:
 
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
+            allowUnfree = true
+
             '
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v12

diff --git a/flake.lock b/flake.lock
diff --git a/nix/home-manager/astral/cli/default.nix b/nix/home-manager/astral/cli/default.nix
@@ -85,7 +85,7 @@ in with lib; {
         enable = true;
         initExtra = commonProfile;
         enableCompletion = true;
-        enableSyntaxHighlighting = true;
+        syntaxHighlighting.enable = true;
 
         autocd = true;
         defaultKeymap = "emacs";

diff --git a/nix/lib/github-actions.nix b/nix/lib/github-actions.nix
@@ -133,6 +133,7 @@ with lib; rec {
               extra_nix_config = ''
                 experimental-features = nix-command flakes
                 access-tokens = github.com=${ghexpr "secrets.GITHUB_TOKEN"}
+                allowUnfree = true
               '';
             };
           }

diff --git a/nix/nixos-modules/astral/nix-utils.nix b/nix/nixos-modules/astral/nix-utils.nix
@@ -15,6 +15,9 @@
     };
 
     package = pkgs.nixUnstable;
-    extraOptions = "experimental-features = nix-command flakes";
+    extraOptions = ''
+      experimental-features = nix-command flakes
+      allowUnfree = true
+    '';
   };
 }
diff --git a/nix/outputs.nix b/nix/outputs.nix
@@ -47,37 +47,61 @@ in {
 
   homeConfigurations = {
     default = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs.legacyPackages {
+        system = "x86_64-linux";
+        config.allowUnfree = true;
+      };
       modules = [ self.homeModules.astral-cli ];
     };
 
     m1 = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.aarch64-darwin;
+      pkgs = import nixpkgs.legacyPackages {
+        system = "aarch64-darwin";
+        config.allowUnfree = true;
+      };
       modules = [ self.homeModules.astral-cli-full ];
     };
 
     "astrid@aliaconda" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs.legacyPackages {
+        system = "x86_64-linux";
+        config.allowUnfree = true;
+      };
       modules = [ self.homeModules.astral-scientific vscode-server-home ];
     };
     "astrid@banana" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs.legacyPackages {
+        system = "x86_64-linux";
+        config.allowUnfree = true;
+      };
       modules = [ self.homeModules.astral-gui ];
     };
     "astrid@chungus" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs.legacyPackages {
+        system = "x86_64-linux";
+        config.allowUnfree = true;
+      };
       modules = [ self.homeModules.astral-gui ];
     };
     "astrid@Discovery" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs.legacyPackages {
+        system = "x86_64-linux";
+        config.allowUnfree = true;
+      };
       modules = [ self.homeModules.astral-gui vscode-server-home ];
     };
     "astrid@shai-hulud" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs.legacyPackages {
+        system = "x86_64-linux";
+        config.allowUnfree = true;
+      };
       modules = [ self.homeModules.astral-gui-tablet ];
     };
     "astrid@soulcaster" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-darwin;
+      pkgs = import nixpkgs.legacyPackages {
+        system = "x86_64-darwin";
+        config.allowUnfree = true;
+      };
       modules = [ self.homeModules.astral-macos ];
     };
   };
@@ -98,6 +122,7 @@ in {
     pkgs = import nixpkgs {
       inherit system;
       overlays = [ self.overlays.default ];
+      config.allowUnfree = true;
     };
   in rec {
     gh-ci-matrix = pkgs.callPackage ./pkgs/gh-ci-matrix { inherit self; };