Compare commits
2 commits
2d5364c5de
...
378fd7caa0
| Author | SHA1 | Date | |
|---|---|---|---|
378fd7caa0
|
|||
|
264546666c
|
7 changed files with 61 additions and 71 deletions
|
|
@ -20,7 +20,6 @@
|
|||
# Workaround for https://github.com/NixOS/nix/issues/9574
|
||||
nix-path = config.nix.nixPath;
|
||||
substituters = [
|
||||
# "https://cache-nixos-org.aarn.shelman.io"
|
||||
"https://cache.nixos.org/"
|
||||
];
|
||||
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
|
||||
|
|
|
|||
80
flake.lock
80
flake.lock
|
|
@ -103,11 +103,11 @@
|
|||
"zig": "zig"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733686035,
|
||||
"narHash": "sha256-uhbYV9gdMAPgBFm5CiH3defxuzrVXD1HsxkZPUqMxoQ=",
|
||||
"lastModified": 1733867032,
|
||||
"narHash": "sha256-2ddDF3j8aI70WdWIn+Gsef4XGM2+grIlaEtHlkZmWdY=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "40ad31deea3d236ad762f2c21f2834af3b767bdb",
|
||||
"revCount": 8184,
|
||||
"rev": "59df17a699f6f13700823124cefaf91fb0c37d4f",
|
||||
"revCount": 8196,
|
||||
"type": "git",
|
||||
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
||||
},
|
||||
|
|
@ -145,11 +145,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733318908,
|
||||
"narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
|
||||
"lastModified": 1733665616,
|
||||
"narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
|
||||
"rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -209,11 +209,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733484277,
|
||||
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
|
||||
"lastModified": 1733869277,
|
||||
"narHash": "sha256-qFWxVV48wwiyvrAbGeSbZ5LAOv1Kv/lvDtibOhuc1/o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
|
||||
"rev": "8772bae58c0a1390727aaf13802debfa29757d67",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -229,14 +229,15 @@
|
|||
"git-hooks": "git-hooks",
|
||||
"hercules-ci-effects": "hercules-ci-effects",
|
||||
"neovim-src": "neovim-src",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733618008,
|
||||
"narHash": "sha256-8MM4WF1AapF9QWDJhoXGLcEKrLE3S75QA74YEQt0A18=",
|
||||
"lastModified": 1733846759,
|
||||
"narHash": "sha256-Xp/rWqO4XXJAqh5c2xju4NCBRpi8lQIknLQmCYfrdWY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"rev": "b75d6c354368841ce4291142b79882362e574f61",
|
||||
"rev": "dcd1be4d5f9fa160d0c68c1967f4ecc458b01969",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -248,11 +249,11 @@
|
|||
"neovim-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1733614558,
|
||||
"narHash": "sha256-JcI4DL5fn0KGX5TxoSLIxwTfi6rikRHsG/gI/7SUDIg=",
|
||||
"lastModified": 1733731191,
|
||||
"narHash": "sha256-Xtd0YLx6RKJMDu2GfE9geO48Dw3KnpVkfZjUqA51xDw=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "4fcc5cd34a75df9a3088c83dc1a87aa6e37051e1",
|
||||
"rev": "3bb2d027597107a3d7f84ef61507104fd4dc050a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -263,11 +264,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1733376361,
|
||||
"narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=",
|
||||
"lastModified": 1733656523,
|
||||
"narHash": "sha256-w0FXPfpGhOihoJDiwMsyN1EzpsXi2F8VQ+NVZQSMtys=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "929116e316068c7318c54eb4d827f7d9756d5e9c",
|
||||
"rev": "93dc9803a1ee435e590b02cde9589038d5cc3a4e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -279,11 +280,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1733384649,
|
||||
"narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
|
||||
"lastModified": 1733730953,
|
||||
"narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
|
||||
"rev": "7109b680d161993918b0a126f38bc39763e5a709",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -295,11 +296,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1733376361,
|
||||
"narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=",
|
||||
"lastModified": 1733686850,
|
||||
"narHash": "sha256-NQEO/nZWWGTGlkBWtCs/1iF1yl2lmQ1oY/8YZrumn3I=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "929116e316068c7318c54eb4d827f7d9756d5e9c",
|
||||
"rev": "dd51f52372a20a93c219e8216fe528a648ffcbf4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -311,11 +312,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1733581040,
|
||||
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
|
||||
"lastModified": 1733759999,
|
||||
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
|
||||
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -351,6 +352,27 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"neovim-nightly-overlay",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733761991,
|
||||
"narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"zig": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
|
|
|
|||
|
|
@ -78,10 +78,10 @@
|
|||
|
||||
networking = {
|
||||
hostName = "dinky";
|
||||
domain = "aarn.patagia.dev";
|
||||
domain = "aarn.patagia.net";
|
||||
search = [
|
||||
"patagia.dev"
|
||||
"aarn.patagia.dev"
|
||||
"patagia.net"
|
||||
"aarn.patagia.net"
|
||||
];
|
||||
useDHCP = lib.mkDefault true;
|
||||
};
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
nix.settings.trusted-users = [ "dln" ];
|
||||
nix.buildMachines = [
|
||||
{
|
||||
hostName = "nemo.aarn.patagia.dev";
|
||||
hostName = "nemo.aarn.patagia.net";
|
||||
sshUser = "nixremote";
|
||||
sshKey = "/root/.ssh/id_ed25519";
|
||||
system = "x86_64-linux";
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
nix.distributedBuilds = true;
|
||||
nix.settings.builders-use-substitutes = true;
|
||||
nix.settings.trusted-substituters = [
|
||||
"ssh-ng://nemo.aarn.patagia.dev"
|
||||
"ssh-ng://nemo.aarn.patagia.net"
|
||||
];
|
||||
|
||||
system.stateVersion = "24.05"; # Did you read the comment?
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
|
||||
networking = {
|
||||
hostName = "nemo"; # Define your hostname.
|
||||
domain = "aarn.patagia.dev";
|
||||
domain = "aarn.patagia.net";
|
||||
nameservers = [
|
||||
"10.1.100.11"
|
||||
"10.1.100.12"
|
||||
|
|
@ -143,8 +143,8 @@
|
|||
services.resolved = {
|
||||
enable = true;
|
||||
domains = [
|
||||
"patagia.dev"
|
||||
"aarn.patagia.dev"
|
||||
"patagia.net"
|
||||
"aarn.patagia.net"
|
||||
];
|
||||
llmnr = "false";
|
||||
fallbackDns = [ "9.9.9.9" ];
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@
|
|||
|
||||
networking = {
|
||||
hostName = "pearl";
|
||||
domain = "aarn.patagia.dev";
|
||||
domain = "aarn.patagia.net";
|
||||
search = [
|
||||
"patagia.dev"
|
||||
"aarn.patagia.dev"
|
||||
"aarn.patagia.net"
|
||||
];
|
||||
useDHCP = lib.mkDefault true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
pkgs: {
|
||||
gnome-ssh-askpass4 = pkgs.callPackage ./gnome-ssh-askpass4 { };
|
||||
jujutsu-openssh = pkgs.callPackage ./jujutsu-openssh { };
|
||||
lazyjj = pkgs.callPackage ./lazyjj { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
}:
|
||||
let
|
||||
version = "0.3.1";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "lazyjj";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/Cretezy/lazyjj/releases/download/v0.3.1/lazyjj-v0.3.1-x86_64-unknown-linux-musl.tar.gz";
|
||||
hash = "sha256-6R4W6uyq8sns8WLoJxp06xAYaJ0Zn+pZLtwhVIPobmc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -m755 -D $src/lazyjj $out/bin/lazyjj
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Cretezy/lazyjj";
|
||||
description = "TUI for jj";
|
||||
mainProgram = "lazyjj";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
Loading…
Reference in a new issue