Compare commits

...

5 Commits

8 changed files with 82 additions and 52 deletions

65
flake.lock generated
View File

@@ -114,11 +114,11 @@
}, },
"den": { "den": {
"locked": { "locked": {
"lastModified": 1772756594, "lastModified": 1772822029,
"narHash": "sha256-T0xYjpbcbyr1a9+2oG3mWBdRsCzXKwec29inS0bgMZE=", "narHash": "sha256-1ItKxTAk3dfzAj9vd2KuxSGSBjX4rDK3cCmAkeAgbkw=",
"owner": "vic", "owner": "vic",
"repo": "den", "repo": "den",
"rev": "2a654815e310c3a9bd6a64f4fe1afec82444deba", "rev": "8acd14aeb4ab836fdc2abd431d2cd710905084c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -154,11 +154,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772699110, "lastModified": 1772867152,
"narHash": "sha256-jkyo/9fZVB3F/PHk3fVK1ImxJBZ71DCOYZvAz4R4v4E=", "narHash": "sha256-RIFgZ4O6Eg+5ysZ8Tqb3YvcqiRaNy440GEY22ltjRrs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "42affa9d33750ac0a0a89761644af20d8d03e6ee", "rev": "eaafb89b56e948661d618eefd4757d9ea8d77514",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -268,11 +268,11 @@
}, },
"flake-file": { "flake-file": {
"locked": { "locked": {
"lastModified": 1772677111, "lastModified": 1772863627,
"narHash": "sha256-tFVzJ+A39OrBPK1lYlM5giUu6yl9pwjUGf6VR3b8Yho=", "narHash": "sha256-Jx4FIAwp3E1cUKQ+a9DfVhRU+ry/IyjYNJbtyz+ld5U=",
"owner": "vic", "owner": "vic",
"repo": "flake-file", "repo": "flake-file",
"rev": "f18f9bad86481621b9c378842987b172e91ca82c", "rev": "51181d48fcc08f5cc97b64859b91699d70c59d11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -406,11 +406,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772807318, "lastModified": 1772845525,
"narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=", "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "daa2c221320809f5514edde74d0ad0193ad54ed8", "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -422,11 +422,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772812788, "lastModified": 1772882323,
"narHash": "sha256-AqTBv6YLPUldVdf7usHsjgY3W91OAndrcZvR8vKP3OU=", "narHash": "sha256-GmBvG5hVGCPepqThEVbUhheTuTinH0S2wBTMvYUobAI=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "c8878bafa20ea06ca091984c8af3ce406237128f", "rev": "541d99fddf3c8daaeeea752b77e11031a43ee716",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -438,11 +438,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772812393, "lastModified": 1772878721,
"narHash": "sha256-vG+ObimLUX05FUP9QHTA7iqqN8+B5dZ3hJqnW/zsltY=", "narHash": "sha256-aTqB+dkS4ePx+6EH/NKmosbe39govZFPMMvSPB3YkrM=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "a6ed40c4b549f68cf3b73e0b69a29feb4518c469", "rev": "4167793df1269360b98b806e3f517d40d85ab47b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -526,11 +526,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1772806698, "lastModified": 1772864581,
"narHash": "sha256-hc6NZ0UlY5V1hHlrsCG+fJClReMJQCqW4SJ3Kq1SVK8=", "narHash": "sha256-+AiWgqbKkjU1W/S/U7ktSoScMa4+z9APtJx+3gEDcCQ=",
"owner": "numtide", "owner": "numtide",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"rev": "a90b7a43af62a0732c7aba479fd493c777956aa0", "rev": "856b24f862d0a19b7764f35ee9a7546309e605a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -668,11 +668,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1772812527, "lastModified": 1772882493,
"narHash": "sha256-4cMuFbgkCqHtgTidV5ofO740P2uhuDis9C9poQRffH0=", "narHash": "sha256-2DxnNHsuCdQGFSLiNAPPYUOtQSXjj348vwYNpuE+xqY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e46964a06c0794b601df608420e36ac3f3289aca", "rev": "ef28c22cb5db01450ee72b8529d336a0c093882e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -750,6 +750,22 @@
"type": "github" "type": "github"
} }
}, },
"nono": {
"flake": false,
"locked": {
"lastModified": 1772823672,
"narHash": "sha256-0esDV3lxKiwI1miHeYZm3A2MdUShg1KsyFtBIjbCkUo=",
"owner": "always-further",
"repo": "nono",
"rev": "b4d9b49b6e49f01cd8988c1e945e1f3a1fd13de8",
"type": "github"
},
"original": {
"owner": "always-further",
"repo": "nono",
"type": "github"
}
},
"pimalaya": { "pimalaya": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -790,6 +806,7 @@
"nixpkgs" "nixpkgs"
], ],
"nixvim": "nixvim", "nixvim": "nixvim",
"nono": "nono",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"tuicr": "tuicr", "tuicr": "tuicr",
"zjstatus": "zjstatus" "zjstatus": "zjstatus"

View File

@@ -48,6 +48,10 @@
nixpkgs.url = "github:nixos/nixpkgs/master"; nixpkgs.url = "github:nixos/nixpkgs/master";
nixpkgs-lib.follows = "nixpkgs"; nixpkgs-lib.follows = "nixpkgs";
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
nono = {
flake = false;
url = "github:always-further/nono";
};
sops-nix = { sops-nix = {
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";

View File

@@ -1,20 +0,0 @@
{
inputs,
input,
prev,
}: let
naersk-lib = prev.callPackage inputs.naersk {};
manifest = (prev.lib.importTOML "${input}/Cargo.toml").package;
in
naersk-lib.buildPackage {
pname = manifest.name;
version = manifest.version;
src = input;
nativeBuildInputs = [prev.pkg-config];
buildInputs = [prev.openssl];
OPENSSL_NO_VENDOR = 1;
doCheck = false;
}

View File

@@ -52,6 +52,7 @@
home.packages = [ home.packages = [
inputs'.llm-agents.packages.claude-code inputs'.llm-agents.packages.claude-code
pkgs.nono
]; ];
xdg.configFile = { xdg.configFile = {

View File

@@ -26,6 +26,6 @@
den.provides.inputs' den.provides.inputs'
]; ];
den.base.user.classes = lib.mkDefault ["homeManager"]; den.schema.user.classes = lib.mkDefault ["homeManager"];
}; };
} }

View File

@@ -63,6 +63,10 @@
url = "github:nix-community/naersk/master"; url = "github:nix-community/naersk/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nono = {
url = "github:always-further/nono";
flake = false;
};
# Secrets inputs # Secrets inputs
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";

View File

@@ -4,12 +4,36 @@
(final: prev: { (final: prev: {
himalaya = inputs.himalaya.packages.${prev.stdenv.hostPlatform.system}.default; himalaya = inputs.himalaya.packages.${prev.stdenv.hostPlatform.system}.default;
}) })
# jj-ryu (uses build-rust-package helper) # jj-ryu
(final: prev: { (final: prev: let
naersk-lib = prev.callPackage inputs.naersk {};
manifest = (prev.lib.importTOML "${inputs.jj-ryu}/Cargo.toml").package;
in {
jj-ryu = jj-ryu =
import ./_lib/build-rust-package.nix { naersk-lib.buildPackage {
inherit inputs prev; pname = manifest.name;
input = inputs.jj-ryu; version = manifest.version;
src = inputs.jj-ryu;
nativeBuildInputs = [prev.pkg-config];
buildInputs = [prev.openssl];
OPENSSL_NO_VENDOR = 1;
doCheck = false;
};
})
# nono (AI agent sandbox CLI — Cargo workspace)
(final: prev: let
naersk-lib = prev.callPackage inputs.naersk {};
manifest = (prev.lib.importTOML "${inputs.nono}/crates/nono-cli/Cargo.toml").package;
in {
nono =
naersk-lib.buildPackage {
pname = manifest.name;
version = manifest.version;
src = inputs.nono;
nativeBuildInputs = [prev.pkg-config prev.cmake prev.perl];
buildInputs = [prev.openssl] ++ prev.lib.optionals prev.stdenv.isLinux [prev.dbus];
OPENSSL_NO_VENDOR = 1;
doCheck = false;
}; };
}) })
# jj-starship (passes through upstream overlay) # jj-starship (passes through upstream overlay)

View File

@@ -56,8 +56,8 @@
# Auto-start zellij in nushell on tahani (headless server) # Auto-start zellij in nushell on tahani (headless server)
programs.nushell.extraConfig = '' programs.nushell.extraConfig = ''
if 'ZELLIJ' not-in ($env | columns) { if $nu.is-interactive and ('SSH_CONNECTION' in ($env | columns)) and ('ZELLIJ' not-in ($env | columns)) {
zellij exec zellij attach -c
} }
''; '';