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

Compare commits

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

7 commits
794022de7c ... 8f60b4ad42

Author SHA1 Message Date
Erwin Boskma
8f60b4ad42
starship: Add config for jujutsu 2024-12-13 09:33:52 +01:00
Erwin Boskma
b5f62d67fb
Add erwin to 'kvm' group 2024-12-13 09:33:30 +01:00
Erwin Boskma
ccd07519f9
home: Add ghostty 2024-12-13 09:32:52 +01:00
Erwin Boskma
e239c091cf
loki: use dynamic wireguard port 2024-12-13 09:32:18 +01:00
Erwin Boskma
befb23f33e
Update inputs 2024-12-13 09:03:03 +01:00
Erwin Boskma
ff1d5b0530
Update: flake.lock 
Flake lock file updates:

• Updated input 'eww':
    'github:elkowar/eww/86dc4a4636dad3999db29975d8a720831a076695?narHash=sha256-1bdyeeReta5ethFghMJIE5ptQ4MBLXuBdCh6mhZ8mZo%3D' (2024-11-20)
  → 'github:elkowar/eww/a8dd2f251fdb05f20a4275f2ef53057e13177ac8?narHash=sha256-6yPd%2B8FHEhYR5i4hYeE6IoqLC5IYt6qvuUjQRw6u6xU%3D' (2024-12-11)
• Updated input 'home-manager':
    'github:nix-community/home-manager/e952e94955dcc6fa2120c1430789fc41363f5237?narHash=sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0%3D' (2024-12-09)
  → 'github:nix-community/home-manager/6e5b2d9e8014b5572e3367937a329e7053458d34?narHash=sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n%2BaJkRzWj8PXwQ%3D' (2024-12-11)
• Updated input 'microvm':
    'github:astro/microvm.nix/e08aed6e3a32e47e21e57bd2791326ea3f7647be?narHash=sha256-scaQMTs4NnGkd9SZWROr5m0vOZIIhRkk5N7Q%2BS9zhXQ%3D' (2024-12-10)
  → 'github:astro/microvm.nix/870cb181719aa12baf478d7cde6068ec7ed144ae?narHash=sha256-CeYsC8J2dNiV2FCQOxK1oZ/jNpOF2io7aCEFHmfi95U%3D' (2024-12-10)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/e563803af3526852b6b1d77107a81908c66a9fcf?narHash=sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is%3D' (2024-12-06)
  → 'github:NixOS/nixos-hardware/cf737e2eba82b603f54f71b10cb8fd09d22ce3f5?narHash=sha256-%2BjjPup/ByS0LEVIrBbt7FnGugJgLeG9oc%2BivFASYn2U%3D' (2024-12-10)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/8a19e07800d64462913f3dbf5c9a20ea7b50e6cd?narHash=sha256-XHIh0h84xDnjkqampyNI/r2FAkKmwbL719ZsygiJHKE%3D' (2024-12-10)
  → 'github:oxalica/rust-overlay/f7f4c59ccdf1bec3f1547d27398e9589aa94e3e8?narHash=sha256-sPEKtSaZk2CtfF9cdhtbY93S6qGq%2Bd2PKI1fcoDfDaI%3D' (2024-12-12)
• Updated input 'sops':
    'github:Mic92/sops-nix/a80af8929781b5fe92ddb8ae52e9027fae780d2a?narHash=sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee%2BHzNk%2BSQE%3D' (2024-12-09)
  → 'github:Mic92/sops-nix/2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004?narHash=sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs%3D' (2024-12-12)
 2024-12-12 09:14:36 +01:00
Erwin Boskma
fa5e3005c4
Update: flake.lock 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a?narHash=sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc%3D' (2024-12-06)
  → 'github:nix-community/home-manager/e952e94955dcc6fa2120c1430789fc41363f5237?narHash=sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0%3D' (2024-12-09)
• Updated input 'microvm':
    'github:astro/microvm.nix/c9fe9b953fd19ff5e3eb8bdc0ec3a040eead87a4?narHash=sha256-rpCgbvch1VaZBlySMHHDDjRd8n7EyUB25naBhD64za8%3D' (2024-12-07)
  → 'github:astro/microvm.nix/e08aed6e3a32e47e21e57bd2791326ea3f7647be?narHash=sha256-scaQMTs4NnGkd9SZWROr5m0vOZIIhRkk5N7Q%2BS9zhXQ%3D' (2024-12-10)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/22c3f2cf41a0e70184334a958e6b124fb0ce3e01?narHash=sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY%3D' (2024-12-07)
  → 'github:nixos/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56?narHash=sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU%3D' (2024-12-09)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/4eb3f096e14431bd0ab4cca039f9c9d77331cbfc?narHash=sha256-uDfJ/TrLLqrtoNzfPODDOVyZ%2BJWsJfd5T1r7xuE6h6g%3D' (2024-12-09)
  → 'github:oxalica/rust-overlay/8a19e07800d64462913f3dbf5c9a20ea7b50e6cd?narHash=sha256-XHIh0h84xDnjkqampyNI/r2FAkKmwbL719ZsygiJHKE%3D' (2024-12-10)
• Updated input 'sops':
    'github:Mic92/sops-nix/c6134b6fff6bda95a1ac872a2a9d5f32e3c37856?narHash=sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc%3D' (2024-12-02)
  → 'github:Mic92/sops-nix/a80af8929781b5fe92ddb8ae52e9027fae780d2a?narHash=sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee%2BHzNk%2BSQE%3D' (2024-12-09)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/357cda84af1d74626afb7fb3bc12d6957167cda9?narHash=sha256-9qOp6jNdezzLMxwwXaXZWPXosHbNqno%2Bf7Ii/xftqZ8%3D' (2024-12-08)
  → 'github:numtide/treefmt-nix/0ce9d149d99bc383d1f2d85f31f6ebd146e46085?narHash=sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ%3D' (2024-12-09)
 2024-12-12 08:49:29 +01:00
6 changed files with 78 additions and 35 deletions
Show stats Expand all files Collapse all files

64
flake.lock
View file

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

2
flake.nix
View file

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

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

@ -136,6 +136,47 @@ 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,9 +206,6 @@
# SteamLink # SteamLink
27031 27031
27036 27036
# WireGuard
51820
]; ];
allowedTCPPortRanges = [ allowedTCPPortRanges = [
@ -286,7 +283,6 @@
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,6 +40,7 @@ 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,6 +231,7 @@ in
fd fd
ffmpeg-full ffmpeg-full
geekbench geekbench
inputs.ghostty.packages.${pkgs.system}.ghostty
godot_4 godot_4
hashcat hashcat
helvum helvum