Compare commits
7 commits
794022de7c
...
8f60b4ad42
| Author | SHA1 | Date | |
|---|---|---|---|
8f60b4ad42
|
|||
|
b5f62d67fb
|
|||
|
ccd07519f9
|
|||
|
e239c091cf
|
|||
|
befb23f33e
|
|||
|
ff1d5b0530
|
|||
|
fa5e3005c4
|
6 changed files with 78 additions and 35 deletions
64
flake.lock
64
flake.lock
|
|
@ -196,11 +196,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732092125,
|
||||
"narHash": "sha256-1bdyeeReta5ethFghMJIE5ptQ4MBLXuBdCh6mhZ8mZo=",
|
||||
"lastModified": 1733943836,
|
||||
"narHash": "sha256-6yPd+8FHEhYR5i4hYeE6IoqLC5IYt6qvuUjQRw6u6xU=",
|
||||
"owner": "elkowar",
|
||||
"repo": "eww",
|
||||
"rev": "86dc4a4636dad3999db29975d8a720831a076695",
|
||||
"rev": "a8dd2f251fdb05f20a4275f2ef53057e13177ac8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -354,14 +354,18 @@
|
|||
"zig": "zig"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733921208,
|
||||
"narHash": "sha256-ywBbTxe+hf46qQbPviMmZ0yMsZNFnvwuupnK+Yz3JnQ=",
|
||||
"path": "/home/erwin/ghostty-main",
|
||||
"type": "path"
|
||||
"lastModified": 1733990439,
|
||||
"narHash": "sha256-2ddDF3j8aI70WdWIn+Gsef4XGM2+grIlaEtHlkZmWdY=",
|
||||
"ref": "main",
|
||||
"rev": "e2eacabbf849fcae9509840e8225b7ee423daacc",
|
||||
"revCount": 1,
|
||||
"type": "git",
|
||||
"url": "https://git.datarift.nl/erwin/ghostty.git"
|
||||
},
|
||||
"original": {
|
||||
"path": "/home/erwin/ghostty-main",
|
||||
"type": "path"
|
||||
"ref": "main",
|
||||
"type": "git",
|
||||
"url": "https://git.datarift.nl/erwin/ghostty.git"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
|
|
@ -426,11 +430,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733484277,
|
||||
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
|
||||
"lastModified": 1733951607,
|
||||
"narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
|
||||
"rev": "6e5b2d9e8014b5572e3367937a329e7053458d34",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -450,11 +454,11 @@
|
|||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733608368,
|
||||
"narHash": "sha256-rpCgbvch1VaZBlySMHHDDjRd8n7EyUB25naBhD64za8=",
|
||||
"lastModified": 1733868086,
|
||||
"narHash": "sha256-CeYsC8J2dNiV2FCQOxK1oZ/jNpOF2io7aCEFHmfi95U=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "c9fe9b953fd19ff5e3eb8bdc0ec3a040eead87a4",
|
||||
"rev": "870cb181719aa12baf478d7cde6068ec7ed144ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -547,11 +551,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1733481457,
|
||||
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
|
||||
"lastModified": 1733861262,
|
||||
"narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
|
||||
"rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -562,11 +566,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1733581040,
|
||||
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
|
||||
"lastModified": 1733759999,
|
||||
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
|
||||
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -738,11 +742,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733711706,
|
||||
"narHash": "sha256-uDfJ/TrLLqrtoNzfPODDOVyZ+JWsJfd5T1r7xuE6h6g=",
|
||||
"lastModified": 1733970833,
|
||||
"narHash": "sha256-sPEKtSaZk2CtfF9cdhtbY93S6qGq+d2PKI1fcoDfDaI=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "4eb3f096e14431bd0ab4cca039f9c9d77331cbfc",
|
||||
"rev": "f7f4c59ccdf1bec3f1547d27398e9589aa94e3e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -758,11 +762,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733128155,
|
||||
"narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
|
||||
"lastModified": 1733965552,
|
||||
"narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
|
||||
"rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -855,11 +859,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733662930,
|
||||
"narHash": "sha256-9qOp6jNdezzLMxwwXaXZWPXosHbNqno+f7Ii/xftqZ8=",
|
||||
"lastModified": 1733761991,
|
||||
"narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "357cda84af1d74626afb7fb3bc12d6957167cda9",
|
||||
"rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@
|
|||
};
|
||||
|
||||
ghostty = {
|
||||
url = "/home/erwin/ghostty-main";
|
||||
url = "git+https://git.datarift.nl/erwin/ghostty.git?ref=main";
|
||||
};
|
||||
|
||||
caddy-with-plugins = {
|
||||
|
|
|
|||
|
|
@ -136,6 +136,47 @@ in
|
|||
time.disabled = false;
|
||||
zig.symbol = " ";
|
||||
|
||||
custom = {
|
||||
jj = {
|
||||
command = ''
|
||||
jj log -r@ -n1 --ignore-working-copy --no-graph --color always -T '
|
||||
separate(" ",
|
||||
bookmarks.map(|x| if(
|
||||
x.name().substr(0, 10).starts_with(x.name()),
|
||||
x.name().substr(0, 10),
|
||||
x.name().substr(0, 9) ++ "…")
|
||||
).join(" "),
|
||||
tags.map(|x| if(
|
||||
x.name().substr(0, 10).starts_with(x.name()),
|
||||
x.name().substr(0, 10),
|
||||
x.name().substr(0, 9) ++ "…")
|
||||
).join(" "),
|
||||
surround("\"","\"",
|
||||
if(
|
||||
description.first_line().substr(0, 24).starts_with(description.first_line()),
|
||||
description.first_line().substr(0, 24),
|
||||
description.first_line().substr(0, 23) ++ "…"
|
||||
)
|
||||
),
|
||||
if(conflict, "conflict"),
|
||||
if(divergent, "divergent"),
|
||||
if(hidden, "hidden"),
|
||||
)
|
||||
'
|
||||
'';
|
||||
when = "jj root";
|
||||
symbol = "jj";
|
||||
};
|
||||
|
||||
jjstate = {
|
||||
when = "jj root";
|
||||
command = ''
|
||||
jj log -r@ -n1 --no-graph -T "" --stat | tail -n1 | sd "(\d+) files? changed, (\d+) insertions?\(\+\), (\d+) deletions?\(-\)" ' ''${1}m ''${2}+ ''${3}-' | sd " 0." ""
|
||||
'';
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
palettes = {
|
||||
catppuccin_macchiato = {
|
||||
rosewater = "#f5e0dc";
|
||||
|
|
|
|||
|
|
@ -206,9 +206,6 @@
|
|||
# SteamLink
|
||||
27031
|
||||
27036
|
||||
|
||||
# WireGuard
|
||||
51820
|
||||
];
|
||||
|
||||
allowedTCPPortRanges = [
|
||||
|
|
@ -286,7 +283,6 @@
|
|||
|
||||
wireguardConfig = {
|
||||
PrivateKeyFile = config.sops.secrets.wireguard-horus0-privkey.path;
|
||||
ListenPort = 51820;
|
||||
};
|
||||
|
||||
wireguardPeers = [
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ in
|
|||
"video"
|
||||
"dialout"
|
||||
"input"
|
||||
"kvm"
|
||||
] ++ (optional config.hardware.i2c.enable config.hardware.i2c.group);
|
||||
shell = config.home-manager.users.erwin.programs.fish.package;
|
||||
openssh.authorizedKeys.keyFiles = [
|
||||
|
|
|
|||
|
|
@ -231,6 +231,7 @@ in
|
|||
fd
|
||||
ffmpeg-full
|
||||
geekbench
|
||||
inputs.ghostty.packages.${pkgs.system}.ghostty
|
||||
godot_4
|
||||
hashcat
|
||||
helvum
|
||||
|
|
|
|||
Loading…
Reference in a new issue