Compare commits

..

4 Commits

Author SHA1 Message Date
Jan-Bulthuis
081084648f Add VM for NAT64 2025-11-03 13:45:59 +01:00
Jan-Bulthuis
9d629c4656 Change home-manager to use global packages 2025-11-03 13:45:34 +01:00
Jan-Bulthuis
4a65f64a20 Update nixpkgs 2025-11-03 13:45:14 +01:00
Jan-Bulthuis
d3b3e9be1c Updated flake 2025-09-26 08:28:14 +02:00
4 changed files with 81 additions and 20 deletions

53
flake.lock generated
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753140376, "lastModified": 1758287904,
"narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753181343, "lastModified": 1759853171,
"narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -172,16 +172,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1753151930, "lastModified": 1759831965,
"narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=", "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "83e677f31c84212343f4cc553bab85c2efcad60a", "rev": "c9b6fb798541223bbb396d287d16f43520250518",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -196,16 +196,17 @@
"nix-modpack": "nix-modpack", "nix-modpack": "nix-modpack",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"secrets": "secrets", "secrets": "secrets",
"sops-nix": "sops-nix" "sops-nix": "sops-nix",
"stable-nixpkgs": "stable-nixpkgs"
} }
}, },
"secrets": { "secrets": {
"locked": { "locked": {
"lastModified": 1750361251, "lastModified": 1753885198,
"narHash": "sha256-yfK2ArCYImg5vIfWP8f2O9+TF18K0dGOVqjheI23zuo=", "narHash": "sha256-UM57wnpaDbG/l4891u0LnYFgyyr9o3w9ot4gmjBL6mA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "498db9fadb1810dd2c3e5d130b655ff7632f9640", "rev": "9d5275538af75b1539faf16c478140aaf2ed6738",
"revCount": 14, "revCount": 15,
"type": "git", "type": "git",
"url": "ssh://gitea@git.bulthuis.dev/Jan/nixos-secrets" "url": "ssh://gitea@git.bulthuis.dev/Jan/nixos-secrets"
}, },
@ -221,11 +222,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752544651, "lastModified": 1759635238,
"narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2c8def626f54708a9c38a5861866660395bb3461", "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,6 +235,22 @@
"type": "github" "type": "github"
} }
}, },
"stable-nixpkgs": {
"locked": {
"lastModified": 1759735786,
"narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "20c4598c84a671783f741e02bf05cbfaf4907cff",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

View File

@ -3,7 +3,8 @@
inputs = { inputs = {
# General inputs # General inputs
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; stable-nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";

View File

@ -143,8 +143,11 @@ let
usersModule = usersModule =
{ ... }: { ... }:
{ {
home-manager.extraSpecialArgs = {
inherit inputs;
};
home-manager.sharedModules = homeModules ++ homeProfiles ++ inputHomeModules; home-manager.sharedModules = homeModules ++ homeProfiles ++ inputHomeModules;
home-manager.useUserPackages = false; # TODO: See if this should be changed to true? home-manager.useUserPackages = true;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users = homesConfiguration; home-manager.users = homesConfiguration;
users.users = usersConfiguration; users.users = usersConfiguration;

View File

@ -0,0 +1,40 @@
{
...
}:
{
# State version
system.stateVersion = "25.05";
# Machine hostname
networking.hostName = "vm-infra";
# Enabled modules
modules = {
profiles.vm.enable = true;
};
# Setup Tayga NAT64
services.tayga = {
enable = true;
ipv4 = {
address = "10.64.0.0";
router = {
address = "10.64.0.1";
};
pool = {
address = "10.64.0.1";
prefixLength = 16;
};
};
ipv6 = {
router = {
address = "fc00:6464::1";
};
pool = {
address = "fc00:6464::";
prefixLength = 96;
};
};
};
}