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

Compare commits

base: erwin:3281b84379c432b2325175c2d5cdf788303d33c7
Branches Tags
erwin:main
..
compare: erwin:dd4f4efba50dbcbc59514a0efd8ea798c2d1a33a
Branches Tags
erwin:main

No commits in common. "3281b84379c432b2325175c2d5cdf788303d33c7" and "dd4f4efba50dbcbc59514a0efd8ea798c2d1a33a" have entirely different histories.
3281b84379 ... dd4f4efba5

2 changed files with 42 additions and 14 deletions
Show stats Expand all files Collapse all files

24
flake.lock
View file

@ -217,11 +217,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1729217131, "lastModified": 1729130734,
"narHash": "sha256-/2wBluheB7gOBsZRjJ0mHGb4JHNtdoyFF3OR2xSQ+dc=", "narHash": "sha256-U1bIksHGGN/bObrRoiJxov51rVM3A5gNqw5oamo7yEI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "264b4e4a44a67a42bfc161ee48d9139f3abd8ab0", "rev": "3ff861b0b86704afa226b70312b584bfcdb46bd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,11 +517,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729174520, "lastModified": 1729027341,
"narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=", "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268", "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,11 +676,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1729044727, "lastModified": 1728909085,
"narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -823,11 +823,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729218602, "lastModified": 1729132166,
"narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", "narHash": "sha256-Mhl4T7gDGknG4nPbHNSGWynfSjZeoWBdsaIzhUYuIlU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", "rev": "32d889f9b9fc65cb65aa2d5db282d60ed06f348e",
"type": "github" "type": "github"
}, },
"original": { "original": {

32
machines/mimir/configuration.nix
View file

@ -1,5 +1,6 @@
{ {
nixos-hardware, nixos-hardware,
microvm,
attic, attic,
... ...
}: }:
@ -11,6 +12,7 @@
nixos-hardware.nixosModules.common-cpu-amd-pstate nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
microvm.nixosModules.host
attic.nixosModules.atticd attic.nixosModules.atticd
../../users/erwin ../../users/erwin
@ -211,7 +213,6 @@
trustedInterfaces = [ trustedInterfaces = [
"lo" "lo"
"tailscale0" "tailscale0"
"enp5s0f1"
]; ];
allowedTCPPorts = [ allowedTCPPorts = [
@ -230,6 +231,7 @@
nat = { nat = {
enable = true; enable = true;
internalInterfaces = [ "microvm" ];
externalInterface = "enp4s0"; externalInterface = "enp4s0";
}; };
@ -243,6 +245,8 @@
}; };
}; };
microvm.autostart = [ "miniflux" ];
powerManagement = { powerManagement = {
cpuFreqGovernor = "ondemand"; cpuFreqGovernor = "ondemand";
}; };
@ -282,6 +286,15 @@
}; };
}; };
netdevs = {
"10-microvm" = {
netdevConfig = {
Kind = "bridge";
Name = "microvm";
};
};
};
networks = { networks = {
"40-enp4s0" = { "40-enp4s0" = {
enable = true; enable = true;
@ -309,8 +322,23 @@
matchConfig = { matchConfig = {
Name = "enp5s0f1"; Name = "enp5s0f1";
}; };
};
addresses = [ { Address = "10.42.0.1/24"; } ]; "10-microvm" = {
matchConfig = {
Name = "microvm";
};
addresses = [ { Address = "172.16.0.1/24"; } ];
};
"11-microvm" = {
matchConfig = {
Name = "vm-*";
};
networkConfig = {
Bridge = "microvm";
};
}; };
}; };
}; };