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

Compare commits

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

2 commits
dd4f4efba5 ... 3281b84379

Author SHA1 Message Date
Erwin Boskma
3281b84379
mimir: Remove microvm 2024-10-18 19:41:34 +02:00
Erwin Boskma
b1093efb6c
flake.lock: Update 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/3ff861b0b86704afa226b70312b584bfcdb46bd7?narHash=sha256-U1bIksHGGN/bObrRoiJxov51rVM3A5gNqw5oamo7yEI%3D' (2024-10-17)
  → 'github:nix-community/emacs-overlay/264b4e4a44a67a42bfc161ee48d9139f3abd8ab0?narHash=sha256-/2wBluheB7gOBsZRjJ0mHGb4JHNtdoyFF3OR2xSQ%2Bdc%3D' (2024-10-18)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/c0b1da36f7c34a7146501f684e9ebdf15d2bebf8?narHash=sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg%3D' (2024-10-14)
  → 'github:NixOS/nixpkgs/dc2e0028d274394f73653c7c90cc63edbb696be1?narHash=sha256-GKJjtPY%2BSXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M%3D' (2024-10-16)
• Updated input 'home-manager':
    'github:nix-community/home-manager/2a4fd1cfd8ed5648583dadef86966a8231024221?narHash=sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN%2Bd9lECWdNB4jJ0tE%3D' (2024-10-15)
  → 'github:nix-community/home-manager/e78cbb20276f09c1802e62d2f77fc93ec32da268?narHash=sha256-QxCAdgQdeIOaCiE0Sr23s9lD0%2BT1b/wuz5pSiGwNrCQ%3D' (2024-10-17)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/32d889f9b9fc65cb65aa2d5db282d60ed06f348e?narHash=sha256-Mhl4T7gDGknG4nPbHNSGWynfSjZeoWBdsaIzhUYuIlU%3D' (2024-10-17)
  → 'github:oxalica/rust-overlay/9051466c82b9b3a6ba9e06be99621ad25423ec94?narHash=sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ%3D' (2024-10-18)
 2024-10-18 10:45:57 +02:00
2 changed files with 14 additions and 42 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": 1729130734, "lastModified": 1729217131,
"narHash": "sha256-U1bIksHGGN/bObrRoiJxov51rVM3A5gNqw5oamo7yEI=", "narHash": "sha256-/2wBluheB7gOBsZRjJ0mHGb4JHNtdoyFF3OR2xSQ+dc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "3ff861b0b86704afa226b70312b584bfcdb46bd7", "rev": "264b4e4a44a67a42bfc161ee48d9139f3abd8ab0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,11 +517,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729027341, "lastModified": 1729174520,
"narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,11 +676,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1728909085, "lastModified": 1729044727,
"narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -823,11 +823,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729132166, "lastModified": 1729218602,
"narHash": "sha256-Mhl4T7gDGknG4nPbHNSGWynfSjZeoWBdsaIzhUYuIlU=", "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "32d889f9b9fc65cb65aa2d5db282d60ed06f348e", "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94",
"type": "github" "type": "github"
}, },
"original": { "original": {

32
machines/mimir/configuration.nix
View file

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