Update from update-inputs-2024-08-19-04-20

.gitignore

@@ -1 +1,2 @@
 testing/**
+result

config/common/default.nix

@@ -9,7 +9,6 @@ with lib; {
     ../../modules
   ];
   environment.systemPackages = with pkgs; [
-    kitty.terminfo
     bat
     dig
     htop
@@ -23,6 +22,8 @@ with lib; {
     unzip
     zip
     figlet
+  ] ++ lib.optionals (!config.kyouma.machine-type.container) [
+    kitty.terminfo
   ];
   programs = {
     mtr.enable = true;
@@ -53,15 +54,16 @@ with lib; {
   '';
   users.motdFile = "/var/lib/deployment/motd";
 
+  nix.package = pkgs.nixVersions.latest;
   nix.gc.automatic = true;
   nix.gc.options = "--delete-older-than 7d";
   nix.optimise.automatic = true;
-  nix.registry.nixpkgs.to = {
+  nix.registry.nixpkgs.to = lib.mkIf (!config.kyouma.machine-type.container) {
     type = "path";
     path = pkgs.path;
   };
   nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
+    experimental-features = [ "nix-command" "flakes" "pipe-operators" ];
     trusted-users = [ "root" "@wheel" ];
     substituters = [ "https://cache.kyouma.net" ];
     trusted-public-keys = [ "cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=" ];

config/hosts/build-worker-oci/configuration.nix

@@ -0,0 +1,15 @@
+{ lib, modulesPath, ... }: { 
+  imports = [
+    "${modulesPath}/virtualisation/docker-image.nix"
+    ../../common
+    ../../profiles/builder.nix
+    ../../profiles/headless.nix
+  ];
+
+  networking.hostName = "build-worker-oci";
+  services.resolved.enable = lib.mkForce false;
+  kyouma = {
+    machine-type.container = true;
+    deployment.auto-upgrade.enable = lib.mkForce false;
+  };
+}

config/profiles/graphical/nixvim.nix

@@ -212,7 +212,8 @@
     plugins.luasnip.enable = true;
     plugins.nvim-autopairs.enable = true;
     plugins.rainbow-delimiters.enable = true;
-    plugins.rustaceanvim.enable = true;
+    # Broken
+    plugins.rustaceanvim.enable = false;
     plugins.treesitter-context.enable = true;
   };
 }

flake.lock

@@ -205,11 +205,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723685519,
-        "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=",
+        "lastModified": 1724031427,
+        "narHash": "sha256-o1HdAf+7IGv9M13R3c+zc/sJ0QgeEnhsvHBcodI4UpM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "276a0d055a720691912c6a34abb724e395c8e38a",
+        "rev": "4e719b38fa7c85f4f65d0308ca7084c91e7bdd6d",
         "type": "github"
       },
       "original": {
@@ -458,11 +458,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723399884,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "lastModified": 1723986931,
+        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
         "type": "github"
       },
       "original": {
@@ -651,11 +651,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1723923888,
-        "narHash": "sha256-w+/PG6KqB8en0x1JH5aMuf0QC78Nfei208EaaaRuYG4=",
+        "lastModified": 1724017104,
+        "narHash": "sha256-1pMyOYqBx7L/w1I/HEa8L01Wx7mZH3QrhDk/8XvDSSw=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "78fc4be6a830e8dc01f3e66ddbe3243b4bfe8560",
+        "rev": "7a11b66f11d292b59571dad85fd1501dbd9bd0c1",
         "type": "github"
       },
       "original": {

flake.nix

@@ -107,7 +107,10 @@
         ];
       };
     };
-    images.lain = self.nixosConfigurations.lain-minimal.config.system.build.sdImage;
+    images = {
+      lain = self.nixosConfigurations.lain-minimal.config.system.build.sdImage;
+      build-worker-oci = self.nixosConfigurations.build-worker-oci.config.system.build.tarball;
+    };
 
     overlays = {
       kyouma = import ./pkgs/overlay.nix;

modules/machine-type/default.nix

@@ -38,6 +38,11 @@ in {
       default = false;
       description = mdDoc "Mark machine as portable.";
     };
+    container = mkOption {
+      type = types.bool;
+      default = false;
+      description = mdDoc "Mark machine as container image.";
+    };
   };
   config = {
     assertions = [

pkgs/overlay.nix

@@ -1,5 +1,5 @@
 final: prev: {
-  nyastodon = final.callPackage ./nyastodon/default.nix {  };
-  upgrade-system = final.callPackage ./upgrade-system/default.nix {  };
-  update-nixfiles = final.callPackage ./update-nixfiles/default.nix {  };
+  nyastodon = final.callPackage ./nyastodon/default.nix {};
+  upgrade-system = final.callPackage ./upgrade-system/default.nix {};
+  update-nixfiles = final.callPackage ./update-nixfiles/default.nix {};
 }