From 5e3b53744eeaf1a836eb504d5647ab3180419088 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 15 Jan 2024 22:35:23 +0100 Subject: [PATCH] flake.nix: use latest clan --- flake.lock | 287 ++++++++--------------------------------------------- flake.nix | 80 +++++++++------ 2 files changed, 91 insertions(+), 276 deletions(-) diff --git a/flake.lock b/flake.lock index 930c6b9..8eaee9c 100644 --- a/flake.lock +++ b/flake.lock @@ -4,46 +4,17 @@ "inputs": { "disko": "disko", "flake-parts": "flake-parts", - "floco": "floco", "nixos-generators": "nixos-generators", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1696157588, - "narHash": "sha256-ZJ4+dL5c8OFia5St3c5+/PxvUkzXCw0akOWYpytjpwk=", + "lastModified": 1705080849, + "narHash": "sha256-GdBbhCgscYWF2uK0kbU8w30V7GlOQXVm/eXgLye3gR8=", "ref": "refs/heads/main", - "rev": "29efda96087dac2a1512d555c131ecfd7da816db", - "revCount": 919, - "type": "git", - "url": "https://git.clan.lol/clan/clan-core" - }, - "original": { - "type": "git", - "url": "https://git.clan.lol/clan/clan-core" - } - }, - "clan-core-unstable": { - "inputs": { - "disko": "disko_2", - "flake-parts": "flake-parts_2", - "floco": "floco_2", - "nixos-generators": "nixos-generators_2", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "sops-nix": "sops-nix_2", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1696157588, - "narHash": "sha256-ZJ4+dL5c8OFia5St3c5+/PxvUkzXCw0akOWYpytjpwk=", - "ref": "refs/heads/main", - "rev": "29efda96087dac2a1512d555c131ecfd7da816db", - "revCount": 919, + "rev": "07a0e1db0981c0db3ca6f7cbd8a68d86b2245eff", + "revCount": 1779, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -93,43 +64,20 @@ ] }, "locked": { - "lastModified": 1695379860, - "narHash": "sha256-ADsWLw33T/6APAoEfwPVkhuUHbH/BW/Jz5cgTgijsIs=", + "lastModified": 1705017253, + "narHash": "sha256-/ysUOnF/dYJXDTxi/fi4MNN7uYKRji5CKp3EIamXB+0=", "owner": "nix-community", "repo": "disko", - "rev": "26cf7576b85fd0b4070d8bd84475021e01d63814", + "rev": "fa5db12d76f9e8ee11e572cdbe021230e48b6afa", "type": "github" }, "original": { "owner": "nix-community", - "ref": "party", "repo": "disko", "type": "github" } }, "disko_2": { - "inputs": { - "nixpkgs": [ - "clan-core-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1695379860, - "narHash": "sha256-ADsWLw33T/6APAoEfwPVkhuUHbH/BW/Jz5cgTgijsIs=", - "owner": "nix-community", - "repo": "disko", - "rev": "26cf7576b85fd0b4070d8bd84475021e01d63814", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "party", - "repo": "disko", - "type": "github" - } - }, - "disko_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -173,11 +121,11 @@ ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -187,27 +135,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "clan-core-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -227,7 +154,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -371,48 +298,6 @@ "type": "github" } }, - "floco": { - "inputs": { - "nixpkgs": [ - "clan-core", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694873346, - "narHash": "sha256-Uvh03bg0a6ZnNWiX1Gb8g+m343wSJ/wb8ryUASt0loc=", - "owner": "aakropotkin", - "repo": "floco", - "rev": "d16bd444ab9d29a6640f52ee4e43a66528e07515", - "type": "github" - }, - "original": { - "owner": "aakropotkin", - "repo": "floco", - "type": "github" - } - }, - "floco_2": { - "inputs": { - "nixpkgs": [ - "clan-core-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694873346, - "narHash": "sha256-Uvh03bg0a6ZnNWiX1Gb8g+m343wSJ/wb8ryUASt0loc=", - "owner": "aakropotkin", - "repo": "floco", - "rev": "d16bd444ab9d29a6640f52ee4e43a66528e07515", - "type": "github" - }, - "original": { - "owner": "aakropotkin", - "repo": "floco", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -464,11 +349,11 @@ ] }, "locked": { - "lastModified": 1686391840, - "narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=", + "lastModified": 1705347059, + "narHash": "sha256-MSdJZDeyBIjf1SAZ7OvA44b00zUGTrDxkAm9vVR+XRk=", "owner": "nix-community", "repo": "home-manager", - "rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f", + "rev": "8c3b2a0cab64a464de9e41a470eecf1318ccff57", "type": "github" }, "original": { @@ -503,7 +388,7 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" @@ -583,21 +468,6 @@ "type": "github" } }, - "nixlib_2": { - "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixos-generators": { "inputs": { "nixlib": "nixlib", @@ -607,33 +477,11 @@ ] }, "locked": { - "lastModified": 1693791338, - "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=", + "lastModified": 1701689616, + "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8ee78470029e641cddbd8721496da1316b47d3b4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, - "nixos-generators_2": { - "inputs": { - "nixlib": "nixlib_2", - "nixpkgs": [ - "clan-core-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1693791338, - "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "8ee78470029e641cddbd8721496da1316b47d3b4", + "rev": "246219bc21b943c6f6812bb7744218ba0df08600", "type": "github" }, "original": { @@ -644,11 +492,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1686217350, - "narHash": "sha256-Nb9b3m/GEK8jyFsYfUkXGsqj6rH05GgJ2QWcNNbK7dw=", + "lastModified": 1705312285, + "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e4b34b90f27696ec3965fa15dcbacc351293dc67", + "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "type": "github" }, "original": { @@ -659,16 +507,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695825837, - "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", + "lastModified": 1705293701, + "narHash": "sha256-yJs738MxB+RsxGETqESof15lRJ5za6s3NmhjbXt8Kt4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", + "rev": "715fac4e39626ca0d24481f3d1fdd54dbeeaced8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -689,13 +537,13 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs_2": { "locked": { - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -783,9 +631,8 @@ "root": { "inputs": { "clan-core": "clan-core", - "clan-core-unstable": "clan-core-unstable", - "disko": "disko_3", - "flake-parts": "flake-parts_3", + "disko": "disko_2", + "flake-parts": "flake-parts_2", "ha-ara-menu": "ha-ara-menu", "home-manager": "home-manager", "inventory4ce": "inventory4ce", @@ -793,8 +640,7 @@ "nix-ld": "nix-ld", "nix-writers": "nix-writers", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs": "nixpkgs_2", "stockholm": "stockholm", "vscode-server": "vscode-server" } @@ -828,42 +674,18 @@ "inputs": { "nixpkgs": [ "clan-core", - "sops-nix" + "nixpkgs" ], "nixpkgs-stable": [ "clan-core" ] }, "locked": { - "lastModified": 1695284550, - "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=", + "lastModified": 1704908274, + "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, - "sops-nix_2": { - "inputs": { - "nixpkgs": [ - "clan-core-unstable", - "sops-nix" - ], - "nixpkgs-stable": [ - "clan-core-unstable" - ] - }, - "locked": { - "lastModified": 1695284550, - "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78", + "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", "type": "github" }, "original": { @@ -882,11 +704,11 @@ ] }, "locked": { - "lastModified": 1695936179, - "narHash": "sha256-DsgJweSzKKZIZjswVUJRh5rrzIQvH4iwVzBLh0qmEnQ=", + "lastModified": 1705265252, + "narHash": "sha256-MryfYxkr7bjvz0QBu8NfsanWxJzXGV3jcFGwv1o9Q5c=", "ref": "refs/heads/master", - "rev": "2db6777b7caa37477c5ffddd99d69b2f2c6d9d7f", - "revCount": 11895, + "rev": "13d946bebaf531a7ab95bd9d88d7d42b57fa4ad4", + "revCount": 11959, "type": "git", "url": "https://cgit.euer.krebsco.de/stockholm" }, @@ -993,32 +815,11 @@ ] }, "locked": { - "lastModified": 1695290086, - "narHash": "sha256-ol6licpIAzc9oMsEai/9YZhgSMcrnlnD/3ulMLGNKL0=", + "lastModified": 1704649711, + "narHash": "sha256-+qxqJrZwvZGilGiLQj3QbYssPdYCwl7ejwMImgH7VBQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e951529be2e7c669487de78f5aef8597bbae5fca", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "clan-core-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1695290086, - "narHash": "sha256-ol6licpIAzc9oMsEai/9YZhgSMcrnlnD/3ulMLGNKL0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "e951529be2e7c669487de78f5aef8597bbae5fca", + "rev": "04f25d7bec9fb29d2c3bacaa48a3304840000d36", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fd66f8c..badd8c7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,17 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + #nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; clan-core = { url = "git+https://git.clan.lol/clan/clan-core"; # Don't do this if your machines are on nixpkgs stable. - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; - clan-core-unstable = { - url = "git+https://git.clan.lol/clan/clan-core"; - # Don't do this if your machines are on nixpkgs stable. - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - - nixos-hardware.url = "github:NixOS/nixos-hardware"; + #home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -54,42 +48,62 @@ }; description = "Flake of makefu"; - outputs = { self, nixpkgs, lanzaboote, disko, nixos-hardware, nix-ld, clan-core,nixpkgs-unstable, - stockholm, home-manager, nix-writers, vscode-server, ...}@inputs: + outputs = { self, nixpkgs, lanzaboote, disko, nixos-hardware, nix-ld, clan-core, + home-manager, nix-writers, vscode-server, ...}@inputs: let - inherit (nixpkgs) lib; + inherit (nixpkgs) lib pkgs; + pkgsForSystem = system: (import nixpkgs { + inherit system; + #system = "x86_64-linux"; + config.allowUnfree = true; + config.packageOverrides = lib.mkForce (pkgs: { tinc = pkgs.tinc_pre; }); + config.allowUnfreePredicate = pkg: lib.packageName pkg == "unrar"; + overlays = [ + self.overlays.default + inputs.nix-writers.overlays.default + (import (inputs.stockholm.inputs.nix-writers + "/pkgs")) + (this: super: { + inherit (this.writers) writeDash writeDashBin; + stockholm.lib = inputs.stockholm.lib; + ha-ara-menu = inputs.ha-ara-menu.packages.${system}.default; + inventory4ce = inputs.inventory4ce.packages.${system}.default; + }) + inputs.stockholm.overlays.default + ]; + }); + #pkgsForSystem = system: nixpkgs.legacyPackages.${system}; clan = clan-core.lib.buildClan { + clanName = "makefu"; directory = self; specialArgs = { inherit (inputs) nixos-hardware self stockholm nixpkgs; + inherit inputs; }; machines = lib.genAttrs [ "filepimp" "mrdavid" "x" "cake" "tsp" "wbob" "omo" "gum" "savarcast" ] (host: rec { # TODO inject the system somewhere else - nixpkgs.hostPlatform = if host == "cake" then "aarch64-linux" else "x86_64-linux"; + #nixpkgs.hostPlatform = if host == "cake" then "aarch64-linux" else "x86_64-linux"; + nixpkgs.pkgs = if host == "cake" then pkgsForSystem "aarch64-linux" else pkgsForSystem "x86_64-linux"; imports = [ disko.nixosModules.disko nix-ld.nixosModules.nix-ld home-manager.nixosModules.default lanzaboote.nixosModules.lanzaboote - stockholm.nixosModules.brockman - - stockholm.nixosModules.exim-retiolum - stockholm.nixosModules.exim - - stockholm.nixosModules.krebs - stockholm.nixosModules.hosts - stockholm.nixosModules.users - stockholm.nixosModules.build - stockholm.nixosModules.dns - stockholm.nixosModules.kartei - stockholm.nixosModules.sitemap - stockholm.nixosModules.fetchWallpaper - stockholm.nixosModules.git - stockholm.nixosModules.tinc - stockholm.nixosModules.systemd - stockholm.nixosModules.setuid - stockholm.nixosModules.urlwatch + inputs.stockholm.nixosModules.brockman + inputs.stockholm.nixosModules.exim-retiolum + inputs.stockholm.nixosModules.exim + inputs.stockholm.nixosModules.krebs + inputs.stockholm.nixosModules.hosts + inputs.stockholm.nixosModules.users + inputs.stockholm.nixosModules.build + inputs.stockholm.nixosModules.dns + inputs.stockholm.nixosModules.kartei + inputs.stockholm.nixosModules.sitemap + inputs.stockholm.nixosModules.git + inputs.stockholm.nixosModules.tinc + inputs.stockholm.nixosModules.systemd + inputs.stockholm.nixosModules.setuid + inputs.stockholm.nixosModules.urlwatch self.nixosModules.default vscode-server.nixosModules.default @@ -114,7 +128,7 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux; in pkgs.mkShell { packages = [ - inputs.clan-core-unstable.packages.x86_64-linux.clan-cli + inputs.clan-core.packages.x86_64-linux.clan-cli pkgs.age ]; };