erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:8f60b4ad42e8179c97b1c051fa1a1954296879e1
Branches Tags
erwin:main
..
compare: erwin:794022de7c7fdcbd8bd99bd9b47b577185fb3f74
Branches Tags
erwin:main

No commits in common. "8f60b4ad42e8179c97b1c051fa1a1954296879e1" and "794022de7c7fdcbd8bd99bd9b47b577185fb3f74" have entirely different histories.
8f60b4ad42 ... 794022de7c

6 changed files with 35 additions and 78 deletions
Show stats Expand all files Collapse all files

64
flake.lock
View file

@ -196,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733943836, "lastModified": 1732092125,
"narHash": "sha256-6yPd+8FHEhYR5i4hYeE6IoqLC5IYt6qvuUjQRw6u6xU=", "narHash": "sha256-1bdyeeReta5ethFghMJIE5ptQ4MBLXuBdCh6mhZ8mZo=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "a8dd2f251fdb05f20a4275f2ef53057e13177ac8", "rev": "86dc4a4636dad3999db29975d8a720831a076695",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,18 +354,14 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1733990439, "lastModified": 1733921208,
"narHash": "sha256-2ddDF3j8aI70WdWIn+Gsef4XGM2+grIlaEtHlkZmWdY=", "narHash": "sha256-ywBbTxe+hf46qQbPviMmZ0yMsZNFnvwuupnK+Yz3JnQ=",
"ref": "main", "path": "/home/erwin/ghostty-main",
"rev": "e2eacabbf849fcae9509840e8225b7ee423daacc", "type": "path"
"revCount": 1,
"type": "git",
"url": "https://git.datarift.nl/erwin/ghostty.git"
}, },
"original": { "original": {
"ref": "main", "path": "/home/erwin/ghostty-main",
"type": "git", "type": "path"
"url": "https://git.datarift.nl/erwin/ghostty.git"
} }
}, },
"gitignore": { "gitignore": {
@ -430,11 +426,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733951607, "lastModified": 1733484277,
"narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,11 +450,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1733868086, "lastModified": 1733608368,
"narHash": "sha256-CeYsC8J2dNiV2FCQOxK1oZ/jNpOF2io7aCEFHmfi95U=", "narHash": "sha256-rpCgbvch1VaZBlySMHHDDjRd8n7EyUB25naBhD64za8=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "870cb181719aa12baf478d7cde6068ec7ed144ae", "rev": "c9fe9b953fd19ff5e3eb8bdc0ec3a040eead87a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -551,11 +547,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1733861262, "lastModified": 1733481457,
"narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -566,11 +562,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733759999, "lastModified": 1733581040,
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -742,11 +738,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733970833, "lastModified": 1733711706,
"narHash": "sha256-sPEKtSaZk2CtfF9cdhtbY93S6qGq+d2PKI1fcoDfDaI=", "narHash": "sha256-uDfJ/TrLLqrtoNzfPODDOVyZ+JWsJfd5T1r7xuE6h6g=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f7f4c59ccdf1bec3f1547d27398e9589aa94e3e8", "rev": "4eb3f096e14431bd0ab4cca039f9c9d77331cbfc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +758,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733965552, "lastModified": 1733128155,
"narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -859,11 +855,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733761991, "lastModified": 1733662930,
"narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "narHash": "sha256-9qOp6jNdezzLMxwwXaXZWPXosHbNqno+f7Ii/xftqZ8=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "rev": "357cda84af1d74626afb7fb3bc12d6957167cda9",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -103,7 +103,7 @@
}; };
ghostty = { ghostty = {
url = "git+https://git.datarift.nl/erwin/ghostty.git?ref=main"; url = "/home/erwin/ghostty-main";
}; };
caddy-with-plugins = { caddy-with-plugins = {

41
home-manager/modules/starship/default.nix
View file

@ -136,47 +136,6 @@ in
time.disabled = false; time.disabled = false;
zig.symbol = " "; 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 = { palettes = {
catppuccin_macchiato = { catppuccin_macchiato = {
rosewater = "#f5e0dc"; rosewater = "#f5e0dc";

4
machines/loki/configuration.nix
View file

@ -206,6 +206,9 @@
# SteamLink # SteamLink
27031 27031
27036 27036
# WireGuard
51820
]; ];
allowedTCPPortRanges = [ allowedTCPPortRanges = [
@ -283,6 +286,7 @@
wireguardConfig = { wireguardConfig = {
PrivateKeyFile = config.sops.secrets.wireguard-horus0-privkey.path; PrivateKeyFile = config.sops.secrets.wireguard-horus0-privkey.path;
ListenPort = 51820;
}; };
wireguardPeers = [ wireguardPeers = [

1
users/erwin/default.nix
View file

@ -40,7 +40,6 @@ in
"video" "video"
"dialout" "dialout"
"input" "input"
"kvm"
] ++ (optional config.hardware.i2c.enable config.hardware.i2c.group); ] ++ (optional config.hardware.i2c.enable config.hardware.i2c.group);
shell = config.home-manager.users.erwin.programs.fish.package; shell = config.home-manager.users.erwin.programs.fish.package;
openssh.authorizedKeys.keyFiles = [ openssh.authorizedKeys.keyFiles = [

1
users/erwin/home.nix
View file

@ -231,7 +231,6 @@ in
fd fd
ffmpeg-full ffmpeg-full
geekbench geekbench
inputs.ghostty.packages.${pkgs.system}.ghostty
godot_4 godot_4
hashcat hashcat
helvum helvum