Merge pull request 'Various cleanups' (#1670) from Mic92-main into main

flake.lock

@@ -40,24 +40,11 @@
         "type": "github"
       }
     },
-    "nixlib": {
-      "locked": {
-        "lastModified": 1712450863,
-        "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixos-generators": {
       "inputs": {
-        "nixlib": "nixlib",
+        "nixlib": [
+          "nixpkgs"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]

flake.nix

@@ -15,6 +15,7 @@
     sops-nix.inputs.nixpkgs-stable.follows = "";
     nixos-generators.url = "github:nix-community/nixos-generators";
     nixos-generators.inputs.nixpkgs.follows = "nixpkgs";
+    nixos-generators.inputs.nixlib.follows = "nixpkgs";
     nixos-images.url = "github:nix-community/nixos-images";
     nixos-images.inputs.nixos-unstable.follows = "nixpkgs";
     # unused input

formatter.nix

@@ -45,53 +45,53 @@
         ];
         includes = [ "*.py" ];
       };
-      treefmt.settings.formatter.vale =
+      # FIXME: currently broken in CI
-        with pkgs;
+      #treefmt.settings.formatter.vale =
-        let
+      #  let
-          vocab = "cLAN";
+      #    vocab = "cLAN";
-          style = "Docs";
+      #    style = "Docs";
-          config = writeText "vale.ini" ''
+      #    config = pkgs.writeText "vale.ini" ''
-            StylesPath = ${styles}
+      #      StylesPath = ${styles}
-            Vocab = ${vocab}
+      #      Vocab = ${vocab}
 
-            [*.md]
+      #      [*.md]
-            BasedOnStyles = Vale, ${style}
+      #      BasedOnStyles = Vale, ${style}
-            Vale.Terms = No
+      #      Vale.Terms = No
-          '';
+      #    '';
-          styles = symlinkJoin {
+      #    styles = pkgs.symlinkJoin {
-            name = "vale-style";
+      #      name = "vale-style";
-            paths = [
+      #      paths = [
-              accept
+      #        accept
-              headings
+      #        headings
-            ];
+      #      ];
-          };
+      #    };
-          accept = writeTextDir "config/vocabularies/${vocab}/accept.txt" ''
+      #    accept = pkgs.writeTextDir "config/vocabularies/${vocab}/accept.txt" ''
-            Nix
+      #      Nix
-            NixOS
+      #      NixOS
-            Nixpkgs
+      #      Nixpkgs
-            clan.lol
+      #      clan.lol
-            Clan
+      #      Clan
-            monorepo
+      #      monorepo
-          '';
+      #    '';
-          headings = writeTextDir "${style}/headings.yml" ''
+      #    headings = pkgs.writeTextDir "${style}/headings.yml" ''
-            extends: capitalization
+      #      extends: capitalization
-            message: "'%s' should be in sentence case"
+      #      message: "'%s' should be in sentence case"
-            level: error
+      #      level: error
-            scope: heading
+      #      scope: heading
-            # $title, $sentence, $lower, $upper, or a pattern.
+      #      # $title, $sentence, $lower, $upper, or a pattern.
-            match: $sentence
+      #      match: $sentence
-          '';
+      #    '';
-        in
+      #  in
-        {
+      #  {
-          command = "${vale}/bin/vale";
+      #    command = "${pkgs.vale}/bin/vale";
-          options = [ "--config=${config}" ];
+      #    options = [ "--config=${config}" ];
-          includes = [ "*.md" ];
+      #    includes = [ "*.md" ];
-          # TODO: too much at once, fix piecemeal
+      #    # TODO: too much at once, fix piecemeal
-          excludes = [
+      #    excludes = [
-            "docs/*"
+      #      "docs/*"
-            "clanModules/*"
+      #      "clanModules/*"
-            "pkgs/*"
+      #      "pkgs/*"
-          ];
+      #    ];
-        };
+      #  };
     };
 }

lib/build-clan/default.nix

@@ -107,7 +107,7 @@ let
   deprecationWarnings = [
     (lib.warnIf (
       clanName != null
-    ) "clanName is deprecated, please use meta.name instead. ${clanName}" null)
+    ) "clanName in buildClan is deprecated, please use meta.name instead." null)
     (lib.warnIf (clanIcon != null) "clanIcon is deprecated, please use meta.icon instead" null)
   ];