[Automated] Update 'flake.lock' and sources (#64)

* deps(sources): Updated cell sources * deps(flake-lock): Updated flake.lock Flake lock file updates: • Updated input 'darwin': 'github:LnL7/nix-darwin/7c16d31383a90e0e72ace0c35d2d66a18f90fb4f' (2023-06-09) → 'github:LnL7/nix-darwin/6460468e7a3e1290f132fee4170ebeaa127f6f32' (2023-06-23) • Updated input 'home': 'github:nix-community/home-manager/61e5d1c38ef04ba30a9119825b159bce9c6010be' (2023-06-13) → 'github:nix-community/home-manager/ac53777f52929bc82efcd2830bfc5aa60bcb4337' (2023-06-19) • Updated input 'latest': 'github:nixos/nixpkgs/7c67f006ea0e7d0265f16d7df07cc076fdffd91f' (2023-06-15) → 'github:nixos/nixpkgs/3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f' (2023-06-23) • Updated input 'nix-filter': 'github:numtide/nix-filter/f529f42792ade8e32c4be274af6b6d60857fbee7' (2023-04-10) → 'github:numtide/nix-filter/d90c75e8319d0dd9be67d933d8eb9d0894ec9174' (2023-06-19) • Updated input 'nixos': 'github:nixos/nixpkgs/56799517d0537a6f3e91a5171af8c4bfd82c092e' (2023-06-17) → 'github:nixos/nixpkgs/160c072a448febcc98abdd82de9ba153a79bf364' (2023-06-24) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/a54683aa7eff00ee5b33dec225525d0eb6ab02de' (2023-06-16) → 'github:nix-community/nixos-generators/649171f56a45af13ba693c156207eafbbbf7edfe' (2023-06-22) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/961e99baaaa57f5f7042fe7ce089a88786c839f4' (2023-06-04) → 'github:nix-community/nixpkgs.lib/908af6d1fa3643c5818ea45aa92b21d6385fbbe5' (2023-06-18) • Updated input 'nixos-wsl': 'github:nix-community/NixOS-WSL/c630530b6f13892ca44619ac0cf326cfdb04d76d' (2023-06-17) → 'github:nix-community/NixOS-WSL/42232b33f71ddb94dd90b58293c1d4087f887588' (2023-06-20) • Updated input 'std': 'github:divnix/std/8671b6892e45d795d7409940750832d68c929dcf' (2023-06-16) → 'github:divnix/std/1dfd574de0d2e3011d8df7ade3a3f2748b701a6d' (2023-06-23) • Updated input 'std/devshell': 'github:numtide/devshell/fd6223370774dd9c33354e87a007004b5fd36442' (2023-06-13) → follows 'std/blank' • Removed input 'std/devshell/nixpkgs' • Removed input 'std/devshell/systems' • Removed input 'std/flake-utils' • Updated input 'std/n2c': 'github:nlewo/nix2container/95e2220911874064b5d809f8d35f7835184c4ddf' (2023-06-03) → follows 'std/blank' • Removed input 'std/n2c/flake-utils' • Removed input 'std/n2c/nixpkgs' • Updated input 'std/nixago': 'github:nix-community/nixago/1da60ad9412135f9ed7a004669fdcf3d378ec630' (2023-05-04) → follows 'std/blank' • Removed input 'std/nixago/flake-utils' • Removed input 'std/nixago/nixago-exts' • Removed input 'std/nixago/nixpkgs' • Updated input 'std/paisano': 'github:paisano-nix/core/6674b3d3577212c1eeecd30d62d52edbd000e726' (2023-06-15) → 'github:paisano-nix/core/9954e48e1ebc74a698b9d4ac02aee85514fc0237' (2023-06-22) • Added input 'std/paisano/call-flake': 'github:divnix/call-flake/74061f6c241227cd05e79b702db9a300a2e4131a' (2023-06-21) • Removed input 'std/paisano-mdbook-preprocessor' • Removed input 'std/paisano-mdbook-preprocessor/crane' • Removed input 'std/paisano-mdbook-preprocessor/crane/flake-compat' • Removed input 'std/paisano-mdbook-preprocessor/crane/flake-utils' • Removed input 'std/paisano-mdbook-preprocessor/crane/nixpkgs' • Removed input 'std/paisano-mdbook-preprocessor/crane/rust-overlay' • Removed input 'std/paisano-mdbook-preprocessor/crane/rust-overlay/flake-utils' • Removed input 'std/paisano-mdbook-preprocessor/crane/rust-overlay/nixpkgs' • Removed input 'std/paisano-mdbook-preprocessor/fenix' • Removed input 'std/paisano-mdbook-preprocessor/fenix/nixpkgs' • Removed input 'std/paisano-mdbook-preprocessor/fenix/rust-analyzer-src' • Removed input 'std/paisano-mdbook-preprocessor/nixpkgs' • Removed input 'std/paisano-mdbook-preprocessor/paisano-actions' • Removed input 'std/paisano-mdbook-preprocessor/paisano-actions/nixpkgs' • Removed input 'std/paisano-mdbook-preprocessor/std' • Removed input 'std/paisano-tui/nixpkgs' • Removed input 'std/paisano-tui/std' * fix(repo): adapt to std changes, remove manual vscode-exts * fix(repo): return files back (whoops) * fix(ci): disable octorpint builds while not used * fix(repo): remove obsolete code --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Andrii Panasiuk <[email protected]>
truelecter · Jun 25, 2023 · 33934f1 · 33934f1
1 parent 44c99e7
commit 33934f1
Show file tree

Hide file tree

Showing 16 changed files with 390 additions and 2,712 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -89,9 +89,9 @@ linux_aarch64_task:
   - sleep 60
 
   matrix:
-  - name: Build octoprint
-    env:
-      NIXOS_HOST: octoprint
+  # - name: Build octoprint
+  #   env:
+  #     NIXOS_HOST: octoprint
   - name: Build oracle
     env:
       NIXOS_HOST: oracle

diff --git a/cells/common/sources/generated.json b/cells/common/sources/generated.json
@@ -1,7 +1,7 @@
 {
     "s5cmd": {
         "cargoLocks": null,
-        "date": "2023-06-16",
+        "date": "2023-06-20",
         "extract": null,
         "name": "s5cmd",
         "passthru": null,
@@ -13,11 +13,11 @@
             "name": null,
             "owner": "peak",
             "repo": "s5cmd",
-            "rev": "0993c6dca380cbf95e92afcdf02a38a47ca65281",
-            "sha256": "sha256-Cni1tJDwqKi6EBLJxj/NX1Im+jFvy2sNXguKasAk4QY=",
+            "rev": "fa8f356b1087bd925a12926c23a8f6e4d485fad0",
+            "sha256": "sha256-QBQR/0N3GoHURpAyuR/3Lbmv2vqJuqa8c3WR8gGfGj4=",
             "type": "github"
         },
-        "version": "0993c6dca380cbf95e92afcdf02a38a47ca65281"
+        "version": "fa8f356b1087bd925a12926c23a8f6e4d485fad0"
     },
     "tfenv": {
         "cargoLocks": null,

diff --git a/cells/common/sources/generated.nix b/cells/common/sources/generated.nix
@@ -3,15 +3,15 @@
 {
   s5cmd = {
     pname = "s5cmd";
-    version = "0993c6dca380cbf95e92afcdf02a38a47ca65281";
+    version = "fa8f356b1087bd925a12926c23a8f6e4d485fad0";
     src = fetchFromGitHub {
       owner = "peak";
       repo = "s5cmd";
-      rev = "0993c6dca380cbf95e92afcdf02a38a47ca65281";
+      rev = "fa8f356b1087bd925a12926c23a8f6e4d485fad0";
       fetchSubmodules = false;
-      sha256 = "sha256-Cni1tJDwqKi6EBLJxj/NX1Im+jFvy2sNXguKasAk4QY=";
+      sha256 = "sha256-QBQR/0N3GoHURpAyuR/3Lbmv2vqJuqa8c3WR8gGfGj4=";
     };
-    date = "2023-06-16";
+    date = "2023-06-20";
   };
   tfenv = {
     pname = "tfenv";

diff --git a/cells/home/profiles/dev/vscode.nix b/cells/home/profiles/dev/vscode.nix
@@ -22,18 +22,18 @@
       cp -pR * "$out/Applications/${name}.app"
     '';
   };
+  vs-exts = inputs.nix-vscode-extensions.extensions.vscode-marketplace;
 in {
   programs.vscode = {
     enable = true;
     package = inputs.cells.common.overrides.vscodium;
     # TODO split extensions based on active modules
-    extensions = with pkgs.vscode-extensions;
-    with inputs.cells.vscode-extensions.packages; [
+    extensions = with vs-exts; [
       arrterian.nix-env-selector
       bbenoist.nix
       coolbear.systemd-unit-file
       davidanson.vscode-markdownlint
-      inputs.cells.vscode-extensions.packages."4ops".packer
+      vs-exts."4ops".packer
       apollographql.vscode-apollo
       christian-kohler.path-intellisense
       davidnussio.vscode-jq-playground
@@ -74,7 +74,7 @@ in {
       xadillax.viml
       # yzane.markdown-pdf
       roscop.activefileinstatusbar
-      PKief.material-icon-theme
+      pkief.material-icon-theme
       bungcip.better-toml
       mads-hartmann.bash-ide-vscode
       ericadamski.carbon-now-sh

diff --git a/cells/klipper/sources/generated.json b/cells/klipper/sources/generated.json
@@ -1,7 +1,7 @@
 {
     "klipper": {
         "cargoLocks": null,
-        "date": "2023-06-16",
+        "date": "2023-06-23",
         "extract": null,
         "name": "klipper",
         "passthru": null,
@@ -13,11 +13,11 @@
             "name": null,
             "owner": "Klipper3d",
             "repo": "klipper",
-            "rev": "38e79dffb68fd522e6b83f47515691afa12898fb",
-            "sha256": "sha256-AOMyv/JchAvIFL5Pby715pV2ILgoRXndSQyeR5TSzcI=",
+            "rev": "b9247810b90938339e87056a5d0f8a7f207d4ea4",
+            "sha256": "sha256-FJoSQSmlrceG9NVoEx1PvcS3IX/8Eu+Q2tzgx8DJjjc=",
             "type": "github"
         },
-        "version": "38e79dffb68fd522e6b83f47515691afa12898fb"
+        "version": "b9247810b90938339e87056a5d0f8a7f207d4ea4"
     },
     "klipper-led_effect": {
         "cargoLocks": null,
@@ -41,7 +41,7 @@
     },
     "klipper-screen": {
         "cargoLocks": null,
-        "date": "2023-06-16",
+        "date": "2023-06-22",
         "extract": null,
         "name": "klipper-screen",
         "passthru": null,
@@ -53,15 +53,15 @@
             "name": null,
             "owner": "jordanruthe",
             "repo": "KlipperScreen",
-            "rev": "92ed72e48b08ee123901e39dc3058ab6438f23fa",
-            "sha256": "sha256-ymbwg76OYAAF05z3K1IzsI3TliU9RhgMh/BCXXQJVsU=",
+            "rev": "5a0df3a6280a856040941e48210a32d699b309bb",
+            "sha256": "sha256-akL9Cu9y3bSPXcDwS1j6c1ruNIv+zO9cBvPRTgMchr0=",
             "type": "github"
         },
-        "version": "92ed72e48b08ee123901e39dc3058ab6438f23fa"
+        "version": "5a0df3a6280a856040941e48210a32d699b309bb"
     },
     "mainsail": {
         "cargoLocks": null,
-        "date": "2023-06-15",
+        "date": "2023-06-19",
         "extract": null,
         "name": "mainsail",
         "passthru": null,
@@ -73,15 +73,15 @@
             "name": null,
             "owner": "mainsail-crew",
             "repo": "mainsail",
-            "rev": "7468f882c1b0c45051edb64ab8cb90ab82616feb",
-            "sha256": "sha256-FYhRaxM5k72dZh0bGJ6ylezfjV5T8NNz0EU73IALSuA=",
+            "rev": "705065d65e8f36bf5fdc8a6bb30057a1890049e4",
+            "sha256": "sha256-rKmvbjSqmR7ZNpI2ev6zudoKLRyBtjr/ixLL83AavaU=",
             "type": "github"
         },
-        "version": "7468f882c1b0c45051edb64ab8cb90ab82616feb"
+        "version": "705065d65e8f36bf5fdc8a6bb30057a1890049e4"
     },
     "moonraker": {
         "cargoLocks": null,
-        "date": "2023-06-08",
+        "date": "2023-06-20",
         "extract": null,
         "name": "moonraker",
         "passthru": null,
@@ -93,11 +93,11 @@
             "name": null,
             "owner": "Arksine",
             "repo": "moonraker",
-            "rev": "aa0f89c2a47697c9eae615e97e154a091fdf737c",
-            "sha256": "sha256-mZEYsHm/FCkGJnA/jKzp/FM8nHTRnZtE/SkhfzUtcDw=",
+            "rev": "0f4276d9b02f5e40ef3d66d689c56ef3ff381ff2",
+            "sha256": "sha256-cT37j/7RxSgJgBwOJw4FBRMCpVxDot1qw2na3PekZ2c=",
             "type": "github"
         },
-        "version": "aa0f89c2a47697c9eae615e97e154a091fdf737c"
+        "version": "0f4276d9b02f5e40ef3d66d689c56ef3ff381ff2"
     },
     "moonraker-telegram-bot": {
         "cargoLocks": null,

diff --git a/cells/klipper/sources/generated.nix b/cells/klipper/sources/generated.nix
@@ -3,15 +3,15 @@
 {
   klipper = {
     pname = "klipper";
-    version = "38e79dffb68fd522e6b83f47515691afa12898fb";
+    version = "b9247810b90938339e87056a5d0f8a7f207d4ea4";
     src = fetchFromGitHub {
       owner = "Klipper3d";
       repo = "klipper";
-      rev = "38e79dffb68fd522e6b83f47515691afa12898fb";
+      rev = "b9247810b90938339e87056a5d0f8a7f207d4ea4";
       fetchSubmodules = false;
-      sha256 = "sha256-AOMyv/JchAvIFL5Pby715pV2ILgoRXndSQyeR5TSzcI=";
+      sha256 = "sha256-FJoSQSmlrceG9NVoEx1PvcS3IX/8Eu+Q2tzgx8DJjjc=";
     };
-    date = "2023-06-16";
+    date = "2023-06-23";
   };
   klipper-led_effect = {
     pname = "klipper-led_effect";
@@ -27,39 +27,39 @@
   };
   klipper-screen = {
     pname = "klipper-screen";
-    version = "92ed72e48b08ee123901e39dc3058ab6438f23fa";
+    version = "5a0df3a6280a856040941e48210a32d699b309bb";
     src = fetchFromGitHub {
       owner = "jordanruthe";
       repo = "KlipperScreen";
-      rev = "92ed72e48b08ee123901e39dc3058ab6438f23fa";
+      rev = "5a0df3a6280a856040941e48210a32d699b309bb";
       fetchSubmodules = false;
-      sha256 = "sha256-ymbwg76OYAAF05z3K1IzsI3TliU9RhgMh/BCXXQJVsU=";
+      sha256 = "sha256-akL9Cu9y3bSPXcDwS1j6c1ruNIv+zO9cBvPRTgMchr0=";
     };
-    date = "2023-06-16";
+    date = "2023-06-22";
   };
   mainsail = {
     pname = "mainsail";
-    version = "7468f882c1b0c45051edb64ab8cb90ab82616feb";
+    version = "705065d65e8f36bf5fdc8a6bb30057a1890049e4";
     src = fetchFromGitHub {
       owner = "mainsail-crew";
       repo = "mainsail";
-      rev = "7468f882c1b0c45051edb64ab8cb90ab82616feb";
+      rev = "705065d65e8f36bf5fdc8a6bb30057a1890049e4";
       fetchSubmodules = false;
-      sha256 = "sha256-FYhRaxM5k72dZh0bGJ6ylezfjV5T8NNz0EU73IALSuA=";
+      sha256 = "sha256-rKmvbjSqmR7ZNpI2ev6zudoKLRyBtjr/ixLL83AavaU=";
     };
-    date = "2023-06-15";
+    date = "2023-06-19";
   };
   moonraker = {
     pname = "moonraker";
-    version = "aa0f89c2a47697c9eae615e97e154a091fdf737c";
+    version = "0f4276d9b02f5e40ef3d66d689c56ef3ff381ff2";
     src = fetchFromGitHub {
       owner = "Arksine";
       repo = "moonraker";
-      rev = "aa0f89c2a47697c9eae615e97e154a091fdf737c";
+      rev = "0f4276d9b02f5e40ef3d66d689c56ef3ff381ff2";
       fetchSubmodules = false;
-      sha256 = "sha256-mZEYsHm/FCkGJnA/jKzp/FM8nHTRnZtE/SkhfzUtcDw=";
+      sha256 = "sha256-cT37j/7RxSgJgBwOJw4FBRMCpVxDot1qw2na3PekZ2c=";
     };
-    date = "2023-06-08";
+    date = "2023-06-20";
   };
   moonraker-telegram-bot = {
     pname = "moonraker-telegram-bot";

diff --git a/cells/repo/config.nix b/cells/repo/config.nix
@@ -3,8 +3,9 @@
   cell,
 }: let
   inherit (inputs) nixpkgs std;
+  inherit (std.lib.dev) mkNixago;
 in {
-  editorconfig = std.lib.cfg.editorconfig {
+  editorconfig = mkNixago std.lib.cfg.editorconfig {
     data = {
       root = true;
       "*" = {
@@ -29,15 +30,15 @@ in {
   };
 
   # Tool Homepage: https://numtide.github.io/treefmt/
-  treefmt = std.lib.cfg.treefmt {
+  treefmt = mkNixago std.lib.cfg.treefmt {
     packages = [
       inputs.cells.common.overrides.alejandra
       inputs.nixpkgs.nodePackages.prettier
       inputs.nixpkgs.nodePackages.prettier-plugin-toml
       inputs.nixpkgs.shfmt
     ];
     devshell.startup.prettier-plugin-toml = inputs.nixpkgs.lib.stringsWithDeps.noDepEntry ''
-      export NODE_PATH=${inputs.nixpkgs.nodePackages.prettier-plugin-toml}/lib/node_modules:$NODE_PATH
+      export NODE_PATH=${inputs.nixpkgs.nodePackages.prettier-plugin-toml}/lib/node_modules:''${NODE_PATH:-}
     '';
     data = {
       global.excludes = ["cells/*/sources/generated.*" "cells/secrets/*"];
@@ -73,7 +74,7 @@ in {
   };
 
   # Tool Homepage: https://github.com/evilmartians/lefthook
-  lefthook = std.lib.cfg.lefthook {
+  lefthook = mkNixago std.lib.cfg.lefthook {
     data = {
       commit-msg = {
         commands = {
@@ -102,7 +103,7 @@ in {
 
   # Tool Hompeage: https://github.com/apps/settings
   # Install Setting App in your repo to enable it
-  githubsettings = std.lib.cfg.githubsettings {
+  githubsettings = mkNixago std.lib.cfg.githubsettings {
     data = {
       repository = {
         name = "hive";
@@ -123,6 +124,38 @@ in {
     };
   };
 
+  conform = mkNixago std.lib.cfg.conform {
+    data = {
+      inherit (inputs) cells;
+      commit = {
+        header = {
+          length = 89;
+          imperative = true;
+        };
+        body.required = false;
+        gpg.required = true;
+        maximumOfOneCommit = false;
+        conventional = {
+          types = [
+            "fix"
+            "feat"
+            "build"
+            "chore"
+            "ci"
+            "docs"
+            "style"
+            "refactor"
+            "test"
+          ];
+          scopes = [
+            "ci"
+          ];
+          descriptionLength = 72;
+        };
+      };
+    };
+  };
+
   # # Tool Homepage: https://rust-lang.github.io/mdBook/
   # mdbook = std.lib.cfg.mdbook {
   #   # add preprocessor packages here