4 Commits

8 changed files with 11 additions and 14 deletions

12
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750650909, "lastModified": 1749178927,
"narHash": "sha256-HRNJuqo15PRKezyBjhNf2Tjj05EcSJ8q6xJyDDbmDXE=", "narHash": "sha256-bXcEx1aZUNm5hMLVJeuofcOrZyOiapzvQ7K36HYK3YQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "520fc4b50af1b365014c3748c126d3f52edb2f3b", "rev": "91287a0e9d42570754487b7e38c6697e15a9aab2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -58,11 +58,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750506804, "lastModified": 1748929857,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa", "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -43,7 +43,6 @@
modules = [ modules = [
secrix.nixosModules.default secrix.nixosModules.default
./modules ./modules
./modules/router
./hosts/common.nix ./hosts/common.nix
hostFile hostFile
./users/cazzzer ./users/cazzzer

View File

@@ -18,11 +18,6 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/nix" =
{ device = "zroot/data/nix";
fsType = "zfs";
};
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/970C-6A15"; { device = "/dev/disk/by-uuid/970C-6A15";
fsType = "vfat"; fsType = "vfat";

View File

@@ -1,5 +1,6 @@
{ {
imports = [ imports = [
../../modules/router
../hw-vm.nix ../hw-vm.nix
]; ];

View File

@@ -1,5 +1,6 @@
{ {
imports = [ imports = [
../../modules/router
../hw-vm.nix ../hw-vm.nix
]; ];

View File

@@ -1,5 +1,6 @@
{ {
imports = [ imports = [
../../modules/router
./hardware-configuration.nix ./hardware-configuration.nix
./private.nix ./private.nix
]; ];

View File

@@ -58,7 +58,7 @@ in
enable = true; enable = true;
package = pkgs.caddy.withPlugins { package = pkgs.caddy.withPlugins {
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A="; hash = "sha256-Gsuo+ripJSgKSYOM9/yl6Kt/6BFCA6BuTDvPdteinAI=";
}; };
virtualHosts."grouter.${domain}".extraConfig = '' virtualHosts."grouter.${domain}".extraConfig = ''
encode encode

View File

@@ -5,7 +5,7 @@
isNormalUser = true; isNormalUser = true;
description = "Yura"; description = "Yura";
group = "cazzzer"; group = "cazzzer";
extraGroups = [ "wheel" "dialout" ] extraGroups = [ "wheel" ]
++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ] ++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ]
++ lib.optionals config.virtualisation.docker.enable [ "docker" ] ++ lib.optionals config.virtualisation.docker.enable [ "docker" ]
++ lib.optionals config.programs.wireshark.enable [ "wireshark" ] ++ lib.optionals config.programs.wireshark.enable [ "wireshark" ]