Browse Source

feat: add ngit-cli flake input for Nostr-based git CLI

Zander Hawke 1 ngày trước cách đây
mục cha
commit
ec9b4c46ac
3 tập tin đã thay đổi với 131 bổ sung54 xóa
  1. 125 52
      flake.lock
  2. 4 1
      flake.nix
  3. 2 1
      home/features/cli/default.nix

+ 125 - 52
flake.lock

@@ -165,28 +165,6 @@
         "type": "github"
       }
     },
-    "firefox-addons": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "pkgs/firefox-addons",
-        "lastModified": 1781409739,
-        "narHash": "sha256-6dadOVlqPpjy0w4WuwvX+Qx0Kkaabm3tahMrCrr72Rg=",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "rev": "ef56de5faccb3ac59d95aa31cce551ff72e35bed",
-        "type": "gitlab"
-      },
-      "original": {
-        "dir": "pkgs/firefox-addons",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "type": "gitlab"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -261,6 +239,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "ghostty": {
       "flake": false,
       "locked": {
@@ -450,6 +446,58 @@
         "type": "github"
       }
     },
+    "ngit-cli": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "ngit-grasp": "ngit-grasp",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1781642208,
+        "narHash": "sha256-2HLVq2EvbVRCudbh2LG8o3ik2/W9513AxJBvNPbSLYY=",
+        "owner": "danconwaydev",
+        "repo": "ngit-cli",
+        "rev": "d442c087faeb5780468fbfce5e9ba658dd6211e1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "danconwaydev",
+        "repo": "ngit-cli",
+        "type": "github"
+      }
+    },
+    "ngit-grasp": {
+      "inputs": {
+        "flake-utils": [
+          "ngit-cli",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ngit-cli",
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "ngit-cli",
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779467914,
+        "narHash": "sha256-qoJBhgsWq3PlTV1cnkVMEQDjpIBE8xaKlxR3EXYVZLM=",
+        "ref": "refs/heads/master",
+        "rev": "70862428b5847ee98e94cc846885f80496cf3533",
+        "revCount": 642,
+        "type": "git",
+        "url": "https://gitnostr.com/npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr/ngit-grasp.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitnostr.com/npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr/ngit-grasp.git"
+      }
+    },
     "nix": {
       "inputs": {
         "flake-compat": [
@@ -580,6 +628,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1781216227,
         "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
@@ -595,7 +659,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1780453794,
         "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=",
@@ -614,8 +678,8 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3",
-        "systems": "systems_2"
+        "nixpkgs": "nixpkgs_4",
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1781531135,
@@ -638,17 +702,16 @@
         "darwin": "darwin_2",
         "devenv": "devenv",
         "disko": "disko",
-        "firefox-addons": "firefox-addons",
         "git-hooks": "git-hooks_2",
         "home-manager": "home-manager_2",
         "impermanence": "impermanence",
+        "ngit-cli": "ngit-cli",
         "nixos-facter-modules": "nixos-facter-modules",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-darwin": "nixpkgs-darwin",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
-        "secrets": "secrets",
-        "zen-browser": "zen-browser"
+        "secrets": "secrets"
       }
     },
     "rust-overlay": {
@@ -672,6 +735,24 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1781234414,
+        "narHash": "sha256-HdA+P4fKRGOomkewnI/Tww5Wz4xK1O7+hDO90YAsPB4=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "1d18bfe3de6244c641ca4e8011186d0981b81d76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "secrets": {
       "locked": {
         "lastModified": 1781953871,
@@ -717,6 +798,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -738,29 +834,6 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
-    },
-    "zen-browser": {
-      "inputs": {
-        "home-manager": [
-          "home-manager"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1781426426,
-        "narHash": "sha256-yzxJMNgv/sLishhCT9G2lm7W9CjHSlXWkfbWC7vfjqc=",
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "rev": "df336067c1a8af3bfce3f0b88b66dc1c57411b4e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "type": "github"
-      }
     }
   },
   "root": "root",

+ 4 - 1
flake.nix

@@ -30,8 +30,11 @@
     disko.url = "github:nix-community/disko?shallow=true";
     disko.inputs.nixpkgs.follows = "nixpkgs";
 
-    git-hooks.url = "github:cachix/git-hooks.nix";
+    git-hooks.url = "github:cachix/git-hooks.nix?shallow=true";
     git-hooks.inputs.nixpkgs.follows = "nixpkgs-unstable";
+
+    ngit-cli.url = "github:danconwaydev/ngit-cli?shallow=true";
+    ngit-cli.inputs.nixpkgs.follows = "nixpkgs-unstable";
   };
 
   outputs =

+ 2 - 1
home/features/cli/default.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   pkgs,
   ...
 }:
@@ -18,7 +19,7 @@
     pkgs.unstable.devenv
     pkgs.unstable.glow
     pkgs.unstable.nak
-    # pkgs.zapstore-cli
+    inputs.ngit-cli.packages.${pkgs.system}.default
   ];
 
   programs.bash.enable = true;