This commit is contained in:
2025-11-13 20:05:06 +00:00
parent 49c4cbb245
commit 44abfe8103
6 changed files with 99 additions and 23 deletions

97
flake.lock generated
View File

@@ -1,5 +1,24 @@
{
"nodes": {
"beads": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1763064087,
"narHash": "sha256-5CI213dDDSI0gyPSxu5eAvtlbzY4aPPC+Rsozm0BoYU=",
"owner": "steveyegge",
"repo": "beads",
"rev": "57b6ea606b366f63b35d543c66db5a48e5d15b7a",
"type": "github"
},
"original": {
"owner": "steveyegge",
"repo": "beads",
"type": "github"
}
},
"brew-src": {
"flake": false,
"locked": {
@@ -112,7 +131,25 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
"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"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
@@ -228,16 +265,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1763023624,
"narHash": "sha256-WsIF0ckfGFUR3OkkXuXO00rbizM+xNSVcFNzTJAQpo0=",
"owner": "nixos",
"lastModified": 1760284886,
"narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "06f05ea26ec1a3fe3146415886a989288c09c08f",
"rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -258,6 +295,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1763023624,
"narHash": "sha256-WsIF0ckfGFUR3OkkXuXO00rbizM+xNSVcFNzTJAQpo0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "06f05ea26ec1a3fe3146415886a989288c09c08f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1762482733,
"narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=",
@@ -273,7 +326,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1754800730,
"narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=",
@@ -292,9 +345,9 @@
"nixvim": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nuschtosSearch": "nuschtosSearch",
"systems": "systems_2"
"systems": "systems_3"
},
"locked": {
"lastModified": 1762904125,
@@ -312,7 +365,7 @@
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
@@ -335,13 +388,14 @@
},
"root": {
"inputs": {
"beads": "beads",
"darwin": "darwin",
"flake-parts": "flake-parts",
"home-manager": "home-manager",
"homebrew-cask": "homebrew-cask",
"homebrew-core": "homebrew-core",
"nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim",
"sops-nix": "sops-nix",
"zjstatus": "zjstatus"
@@ -433,11 +487,26 @@
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"zjstatus": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay"
},
"locked": {

View File

@@ -27,7 +27,8 @@
};
nixvim.url = "github:nix-community/nixvim";
zjstatus.url = "github:dj95/zjstatus";
};
beads.url = "github:steveyegge/beads";
};
outputs = inputs @ {flake-parts, ...}:
flake-parts.lib.mkFlake {inherit inputs;} (
@@ -51,7 +52,7 @@
specialArgs =
inputs
// {
inherit user hostname constants;
inherit inputs user hostname constants;
};
modules = [
inputs.home-manager.darwinModules.home-manager
@@ -82,7 +83,7 @@
specialArgs =
inputs
// {
inherit user hostname constants;
inherit inputs user hostname constants;
};
modules = [
inputs.home-manager.nixosModules.home-manager

View File

@@ -1,6 +1,7 @@
{
config,
constants,
inputs,
nixvim,
pkgs,
user,
@@ -47,7 +48,7 @@
lib,
...
}: {
_module.args = {inherit user constants;};
_module.args = {inherit user constants inputs;};
imports = [
nixvim.homeModules.nixvim
../home/default.nix

View File

@@ -1,6 +1,7 @@
{
pkgs,
constants,
inputs,
...
}: {
imports = [
@@ -29,7 +30,7 @@
programs.home-manager.enable = true;
home = {
packages = pkgs.callPackage ../packages.nix {};
packages = pkgs.callPackage ../packages.nix {inherit inputs;};
stateVersion = constants.stateVersions.homeManager;
};
}

View File

@@ -1,5 +1,6 @@
{
pkgs,
inputs,
nixvim,
user,
constants,
@@ -71,7 +72,7 @@
lib,
...
}: {
_module.args = {inherit user constants;};
_module.args = {inherit user constants inputs;};
imports = [
nixvim.homeModules.nixvim
../home/default.nix

View File

@@ -1,5 +1,8 @@
{pkgs, ...}:
{pkgs, inputs, ...}:
with pkgs; [
(inputs.beads.packages.${pkgs.system}.default.overrideAttrs (old: {
vendorHash = "sha256-jpaeKw5dbZuhV9Z18aQ9tDMS/Eo7HaXiZefm26UlPyI=";
}))
(callPackage ./bin/open-project.nix {})
age
alejandra