lass.pds.lassul.us / superconfig
This repository has no description
0
Fork 1

Configure Feed

Select the types of activity you want to include in your feed.

flake: drop extra-container and containerConfigurations

author
lassulus date (Oct 13, 2026, 4:31 PM CEST) commit 2125f002 parent 52d11736
+4 -176
+3 -58
flake.lock
··· 115 115 "type": "github" 116 116 } 117 117 }, 118 - "extra-container": { 119 - "inputs": { 120 - "flake-utils": "flake-utils", 121 - "nixpkgs": [ 122 - "nixpkgs" 123 - ] 124 - }, 125 - "locked": { 126 - "lastModified": 1766155727, 127 - "narHash": "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo=", 128 - "owner": "erikarvstedt", 129 - "repo": "extra-container", 130 - "rev": "b450bdb24fca1076973c852d87bcb49b8eb5fd49", 131 - "type": "github" 132 - }, 133 - "original": { 134 - "owner": "erikarvstedt", 135 - "repo": "extra-container", 136 - "type": "github" 137 - } 138 - }, 139 118 "fenix": { 140 119 "inputs": { 141 120 "nixpkgs": [ ··· 279 258 "type": "github" 280 259 } 281 260 }, 282 - "flake-utils": { 283 - "inputs": { 284 - "systems": "systems_2" 285 - }, 286 - "locked": { 287 - "lastModified": 1731533236, 288 - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", 289 - "owner": "numtide", 290 - "repo": "flake-utils", 291 - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", 292 - "type": "github" 293 - }, 294 - "original": { 295 - "owner": "numtide", 296 - "repo": "flake-utils", 297 - "type": "github" 298 - } 299 - }, 300 261 "git-hooks": { 301 262 "inputs": { 302 263 "flake-compat": [ ··· 430 391 "nixpkgs": [ 431 392 "nixpkgs" 432 393 ], 433 - "systems": "systems_3", 394 + "systems": "systems_2", 434 395 "treefmt-nix": "treefmt-nix_4" 435 396 }, 436 397 "locked": { ··· 665 626 "nixpkgs": [ 666 627 "nixpkgs" 667 628 ], 668 - "systems": "systems_4" 629 + "systems": "systems_3" 669 630 }, 670 631 "locked": { 671 632 "lastModified": 1791769517, ··· 756 717 "inputs": { 757 718 "clan-core": "clan-core", 758 719 "disko": "disko", 759 - "extra-container": "extra-container", 760 720 "hermes-agent": "hermes-agent", 761 721 "kartei": "kartei", 762 722 "le_menu": "le_menu", ··· 873 833 }, 874 834 "systems_2": { 875 835 "locked": { 876 - "lastModified": 1681028828, 877 - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 878 - "owner": "nix-systems", 879 - "repo": "default", 880 - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", 881 - "type": "github" 882 - }, 883 - "original": { 884 - "owner": "nix-systems", 885 - "repo": "default", 886 - "type": "github" 887 - } 888 - }, 889 - "systems_3": { 890 - "locked": { 891 836 "lastModified": 1791244623, 892 837 "narHash": "sha256-uuanbkFk8a313Zfrxdcz8Us/yQtaxNnKJtX8v0ZPpd8=", 893 838 "owner": "nix-systems", ··· 901 846 "type": "github" 902 847 } 903 848 }, 904 - "systems_4": { 849 + "systems_3": { 905 850 "flake": false, 906 851 "locked": { 907 852 "lastModified": 1791244623,
+1 -84
flake.nix
··· 63 63 # le_menu.url = "git+file:/home/lass/src/le_menu"; 64 64 le_menu.inputs.nixpkgs.follows = "nixpkgs"; 65 65 66 - extra-container.url = "github:erikarvstedt/extra-container"; 67 - extra-container.inputs.nixpkgs.follows = "nixpkgs"; 68 - 69 66 llm-agents.url = "github:numtide/llm-agents.nix"; 70 67 llm-agents.inputs.nixpkgs.follows = "nixpkgs"; 71 68 ··· 249 246 # data-mesher or dm-dns, so an empty module stands in for it. 250 247 flake.nixosModules.data-mesher = { }; 251 248 252 - # Container configurations for use with extra-container 253 - # Auto-discovers machines with container.nix 254 - flake.containerConfigurations = 255 - nixpkgs.lib.mapAttrs 256 - (machineName: _: import ./machines/${machineName}/container.nix { inherit self; }) 257 - ( 258 - nixpkgs.lib.filterAttrs ( 259 - machineName: _: builtins.pathExists ./machines/${machineName}/container.nix 260 - ) (builtins.readDir ./machines) 261 - ); 262 - 263 249 perSystem = 264 250 { 265 251 lib, ··· 286 272 }; 287 273 }; 288 274 clan-cli = clan-core.packages.${system}.clan-cli; 289 - } 290 - // lib.mapAttrs' ( 291 - name: containerConfig: 292 - lib.nameValuePair "container-${name}" ( 293 - inputs.extra-container.lib.buildContainers { 294 - inherit system; 295 - nixpkgs = inputs.nixpkgs; 296 - config = { 297 - # Workaround: extra-container's minimal module set doesn't 298 - # include nixos-init.nix, but systemd.nix now references 299 - # config.system.nixos-init.package for env-generator. 300 - # Provide a dummy option until extra-container is updated. 301 - 302 - imports = [ 303 - ( 304 - { pkgs, lib, ... }: 305 - { 306 - options.system.nixos-init.package = lib.mkPackageOption pkgs "nixos-init" { }; 307 - options.time.timeZone = lib.mkOption { 308 - type = lib.types.nullOr lib.types.str; 309 - default = null; 310 - description = "Dummy option for extra-container compatibility"; 311 - }; 312 - options.services.openssh = { 313 - enable = lib.mkOption { 314 - type = lib.types.bool; 315 - default = false; 316 - description = "Dummy option for extra-container compatibility"; 317 - }; 318 - package = lib.mkPackageOption pkgs "openssh" { }; 319 - }; 320 - # systemd.nix sets environment.variables.SYSTEMD_XKB_DIRECTORY, 321 - # but the minimal module set omits config/system-environment.nix 322 - # which declares the option. 323 - options.environment.variables = lib.mkOption { 324 - type = lib.types.attrsOf lib.types.anything; 325 - default = { }; 326 - description = "Dummy option for extra-container compatibility"; 327 - }; 328 - # systemd.nix reads config.i18n.imperativeLocale, but the 329 - # minimal module set omits config/i18n.nix which declares it. 330 - options.i18n.imperativeLocale = lib.mkOption { 331 - type = lib.types.bool; 332 - default = true; 333 - description = "Dummy option for extra-container compatibility"; 334 - }; 335 - # nixos-containers.nix reads config.nix.enable and 336 - # config.nix.daemon.enable for the /nix/var/nix bind 337 - # mounts, but the minimal module set omits 338 - # config/nix.nix which declares them. 339 - options.nix = { 340 - enable = lib.mkOption { 341 - type = lib.types.bool; 342 - default = true; 343 - description = "Dummy option for extra-container compatibility"; 344 - }; 345 - daemon.enable = lib.mkOption { 346 - type = lib.types.bool; 347 - default = true; 348 - description = "Dummy option for extra-container compatibility"; 349 - }; 350 - }; 351 - } 352 - ) 353 - ]; 354 - containers.${name} = containerConfig; 355 - }; 356 - } 357 - ) 358 - ) self.containerConfigurations; 275 + }; 359 276 devShells.default = pkgs.mkShell { 360 277 packages = [ 361 278 self.packages.${pkgs.system}.pass
-34
machines/virtulus/container.nix
··· 1 - { self }: 2 - let 3 - machineName = "virtulus"; 4 - in 5 - { 6 - privateNetwork = true; 7 - hostBridge = "ctr0"; 8 - 9 - specialArgs = { inherit self; }; 10 - 11 - config = { 12 - imports = [ 13 - self.inputs.clan-core.nixosModules.clanCore 14 - ./config.nix 15 - ]; 16 - clan.core.settings.directory = self; 17 - clan.core.settings.machine.name = machineName; 18 - 19 - # Accept Router Advertisements for SLAAC (IPv6 auto-configuration) 20 - # Address will be generated from prefix + interface ID (stable privacy) 21 - systemd.network.networks."10-container" = { 22 - matchConfig.Name = "eth0"; 23 - networkConfig = { 24 - IPv6AcceptRA = true; 25 - # Use stable privacy addresses (RFC 7217) - deterministic per interface 26 - IPv6PrivacyExtensions = "prefer-public"; 27 - }; 28 - }; 29 - 30 - # DNS will be configured via RDNSS from Router Advertisements 31 - # But keep a fallback in case RDNSS isn't received 32 - networking.nameservers = [ "fd00:c700::1" ]; 33 - }; 34 - }