chore: update lix

flake.lock

@@ -298,18 +298,17 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1727301466,
+        "lastModified": 1728506278,
-        "narHash": "sha256-357IEOtI+QZy9NzmKhU0vAS7aY528Uvh2n/gXQFgRpY=",
+        "narHash": "sha256-ZAPqzjR86En31Yfau0auQmkDuyzr2QfD8yW+7205e8A=",
-        "ref": "refs/changes/46/1946/1",
+        "ref": "refs/heads/main",
-        "rev": "2c74949780830b5cfcd913ef24514dc8e7db5f14",
+        "rev": "9865ebaaa618d82a7b7fdccc636cbaa7dfa42427",
-        "revCount": 16269,
+        "revCount": 16335,
         "type": "git",
-        "url": "https://gerrit.lix.systems/lix"
+        "url": "https://git.lix.systems/lix-project/lix.git"
       },
       "original": {
-        "ref": "refs/changes/46/1946/1",
         "type": "git",
-        "url": "https://gerrit.lix.systems/lix"
+        "url": "https://git.lix.systems/lix-project/lix.git"
       }
     },
     "nix2container": {

flake.nix

@@ -4,7 +4,7 @@
   # To update all inputs:
   # $ nix flake update --recreate-lock-file
   inputs = {
-    lix.url = "git+https://gerrit.lix.systems/lix?ref=refs/changes/46/1946/1";
+    lix.url = "git+https://git.lix.systems/lix-project/lix.git";
     lix.inputs.nixpkgs.follows = "nixpkgs";
 
     disko.url = "github:nix-community/disko";
@@ -43,68 +43,80 @@
   };
 
   outputs =
-    { flake-parts
+    {
-    , ...
+      flake-parts,
-    } @ inputs:
+      ...
-    (flake-parts.lib.evalFlakeModule
+    }@inputs:
-      { inherit inputs; }
+    (flake-parts.lib.evalFlakeModule { inherit inputs; } (
-      ({ self, inputs, ... }: {
+      { self, inputs, ... }:
-        systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
+      {
+        systems = [
+          "x86_64-linux"
+          "aarch64-linux"
+          "aarch64-darwin"
+        ];
         imports = [
           ./configurations.nix
           # ./modules/monitoring/flake-module.nix
           # ./pkgs/flake-module.nix
           # ./templates
         ];
-        perSystem = { self', pkgs, ... }: {
+        perSystem =
-          devShells.default = pkgs.mkShellNoCC {
+          { self', pkgs, ... }:
-            buildInputs = [
+          {
-              pkgs.ipmitool
+            devShells.default = pkgs.mkShellNoCC {
-              pkgs.colmena
+              buildInputs = [
+                pkgs.ipmitool
+                pkgs.colmena
 
-              pkgs.python3.pkgs.invoke
+                pkgs.python3.pkgs.invoke
-              #Until nixos-anywhere is packaged
+                #Until nixos-anywhere is packaged
-              pkgs.python3.pkgs.deploykit
+                pkgs.python3.pkgs.deploykit
-              pkgs.mypy
+                pkgs.mypy
-              pkgs.pixiecore
+                pkgs.pixiecore
-              pkgs.dnsmasq
+                pkgs.dnsmasq
-              pkgs.python3.pkgs.netaddr
+                pkgs.python3.pkgs.netaddr
-              pkgs.qemu_kvm
+                pkgs.qemu_kvm
-              pkgs.openssh
+                pkgs.openssh
-              pkgs.gitMinimal # for git flakes
+                pkgs.gitMinimal # for git flakes
-              pkgs.rsync
+                pkgs.rsync
-              pkgs.nix
+                pkgs.nix
-              pkgs.coreutils
+                pkgs.coreutils
-              pkgs.curl # when uploading tarballs
+                pkgs.curl # when uploading tarballs
-              pkgs.gnugrep
+                pkgs.gnugrep
-              pkgs.findutils
+                pkgs.findutils
-              pkgs.gnused # needed by ssh-copy-id
+                pkgs.gnused # needed by ssh-copy-id
-              # sops dependencies
+                # sops dependencies
-              pkgs.age
+                pkgs.age
-              pkgs.yq-go
+                pkgs.yq-go
-            ] ++ pkgs.lib.optional (pkgs.stdenv.isLinux) pkgs.mkpasswd;
+              ] ++ pkgs.lib.optional (pkgs.stdenv.isLinux) pkgs.mkpasswd;
-          };
+            };
-          packages = {
+            packages = {
-            #  netboot = pkgs.callPackage ./modules/netboot/netboot.nix {
+              #  netboot = pkgs.callPackage ./modules/netboot/netboot.nix {
-            #    # this nixosSystem is built for x86_64 machines regardless of the host machine
+              #    # this nixosSystem is built for x86_64 machines regardless of the host machine
-            #    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+              #    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
-            #    inherit (inputs.nixpkgs.lib) nixosSystem;
+              #    inherit (inputs.nixpkgs.lib) nixosSystem;
-            #    extraModules = [
+              #    extraModules = [
-            #      self.inputs.nur.nixosModules.nur
+              #      self.inputs.nur.nixosModules.nur
-            #      { _module.args.inputs = self.inputs; }
+              #      { _module.args.inputs = self.inputs; }
-            #    ];
+              #    ];
-            #  };
+              #  };
 
-            #  netboot-pixie-core = pkgs.callPackage ./modules/netboot/netboot-pixie-core.nix {
+              #  netboot-pixie-core = pkgs.callPackage ./modules/netboot/netboot-pixie-core.nix {
-            #    inherit (self'.packages) netboot;
+              #    inherit (self'.packages) netboot;
-            #  };
+              #  };
+            };
           };
-        };
         flake = {
-          hydraJobs = inputs.nixpkgs.lib.mapAttrs' (name: config: inputs.nixpkgs.lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) self.nixosConfigurations // {
+          hydraJobs =
-            devShells = self.devShells.x86_64-linux.default;
+            inputs.nixpkgs.lib.mapAttrs' (
-          };
+              name: config: inputs.nixpkgs.lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel
+            ) self.nixosConfigurations
+            // {
+              devShells = self.devShells.x86_64-linux.default;
+            };
         };
-      })).config.flake;
+      }
+    )).config.flake;
 
 }

modules/users/keys/luj.keys

@@ -1,15 +1,3 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM9Uzb7szWlux7HuxLZej9cBR5MhLz/vaAPPfSoozt2k
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGa+7n7kNzb86pTqaMn554KiPrkHRGeTJ0asY1NjSbpr julien@tower
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHoYi9YFzovZfwrY3BUA3QqcyBE8gfNTncbs3qqkLbyY
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIADCpuBL/kSZShtXD6p/Nq9ok4w1DnlSoxToYgdOvUqo julien@fischer
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCKfPoMNrnyNWH6J1OvQ+n1rvSS9Sc2iZf6E1JQC+L4
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMAa0wll9ildhgPiV0DhgJXXtw3TQr5VkNxxxPspHSbX julien@gallifrey
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIESMWr29i3rhj32oLV3DKe57YI+jvNaKjZhhpq6dEjsn
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJOCKgHRHAJDSgKqYNfWboL04mnEOM0m0K3TGxBhBNDR
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpGHx430EpJmbtJc8+lF1CpQ1gXeHT9OeZ08O8yzohF
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEaCGndojnmS5IoqHVMEPRfKuBZotMyqo7wNkAZJWigp
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILxfFq8wx5Bet5Q0gI28/lc9ryYYFQelpZdPPdzxGBbA
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGa+7n7kNzb86pTqaMn554KiPrkHRGeTJ0asY1NjSbpr
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILKIDLmQQ+P+jE4zVRpdVp8fmYEe4nzPDqYZt6A4eyIi
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAkj2xsN7Qt/Ew2QO+HiF2yOjXPRucZ3SbIdPDLJoh22
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDMBW7rTtfZL9wtrpCVgariKdpN60/VeAzXkh9w3MwbO
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCUt5I3IgONzYsMOFnRXtvR/uLXlIs6oWsCmh6YGgnpGD4M9lFdoYAOeC1faQUnP66sNs6AoacrGlPZ1UkVUqYEoIr2hiNCDRzzLCQ2J/sSaw7Hv0PKT7MWMo8R076M3TrdunCchBJI1noez3waM9aL4b/iYVhxym28ET55QrWjyMQfZL9PXzOKZatNVcK8AmdtSbI+pFrm/tTZPa321drm9PHOo9CL+lG4YmVZcXa0bVfVtk1GXlWwNpCj2ExLmbF1rRpAa05khfnbg3sBSklwf5NRXj11KneodKRF81ji7MtBhIIfoEXSYht7yspdkkS9e9mv16VGV+2ziM8zG3MK/iUq7fg5ksN54D3DNrd9iI5WjQZsLUrK0ypxO2NtvupWGYt3rCyKA/QvynbxOWFp6cy3Evej142hsfbiOcPIgCtGdHIBevp+KmPxkHBqsJPBqb3Y7nOMT1/ggDMtvHZEZJjEI2D2RjZNEXGbq63OPAqEkgmecW0cXlrjLEGhF2E=
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIADCpuBL/kSZShtXD6p/Nq9ok4w1DnlSoxToYgdOvUqo
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0yxKgDt5IsroNxjqRYpbt7F3m8kewrnFql9PRSQgUMoAmLjIdtaNolfTGwPnb+mkhfh1wac7+SdoFilVAWfxdcBpkt6smou0EG4ek6nRQDV+MceZb/Yaroj6qDZ0XdSnirCIXvVSLAs+z+rwRNVP/vPr+PZc7eRCjeTWZftjIAF0XPL09raDIpdZZKrWKOk7ieWV1NedEf72HvD720mmyEpR2z8iFKcVbZlVmC1KAnfozpX22nk+i9LLuwpFWdb8cDpObuu7OoGVPvX5h0TxI+6vH+9+u657G0AyHyJrBdbMzJDFdRolWYCzUo5G+2deBlY1VMJ36oNx17xkd4vBh