bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Zerotier module

Browse source
This commit is contained in:
Filippo Berto 2022-08-15 16:44:46 +02:00
parent c98844c725
commit 3574569f3a
5 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
flake.nix
View file

@ -54,6 +54,12 @@
unstablePkgs = import unstable nixpkgsSettings; unstablePkgs = import unstable nixpkgsSettings;
homeManagerSettings = { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }; homeManagerSettings = { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; };
commonBaseModules = [
./nixos_modules/automatic-garbage-collection.nix
# ./nixos_modules/tailscale.nix
./nixos_modules/zerotier.nix
];
odinBaseModules = [ odinBaseModules = [
{ nixpkgs = nixpkgsSettings; } { nixpkgs = nixpkgsSettings; }
./odin/hardware-configuration.nix ./odin/hardware-configuration.nix
@ -61,20 +67,15 @@
nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-ssd nixos-hardware.nixosModules.common-pc-laptop-ssd
./odin/common_configuration.nix ./odin/common_configuration.nix
./nixos_modules/automatic-garbage-collection.nix ] ++ commonBaseModules;
./nixos_modules/tailscale.nix
];
thorBaseModules = [ thorBaseModules = [
{ nixpkgs = nixpkgsSettings; } { nixpkgs = nixpkgsSettings; }
./nixos_modules/automatic-garbage-collection.nix
./thor/hardware-configuration.nix ./thor/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
./thor/configuration.nix ./thor/configuration.nix
./nixos_modules/automatic-garbage-collection.nix ] ++ commonBaseModules;
./nixos_modules/tailscale.nix
];
lokiBaseModules = [ lokiBaseModules = [
{ nixpkgs = nixpkgsSettings; } { nixpkgs = nixpkgsSettings; }
@ -82,9 +83,7 @@
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
./loki/configuration.nix ./loki/configuration.nix
./nixos_modules/automatic-garbage-collection.nix ] ++ commonBaseModules;
./nixos_modules/tailscale.nix
];
odinStable = extraModules: nixpkgs.lib.nixosSystem { odinStable = extraModules: nixpkgs.lib.nixosSystem {
inherit system; inherit system;

1
loki/configuration.nix
View file

@ -175,7 +175,6 @@ with lib;
# xkbOptions = "eurosign:e;"; # xkbOptions = "eurosign:e;";
# libinput.enable = true; # libinput.enable = true;
}; };
zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
zoneminder = { zoneminder = {
enable = true; enable = true;

6
nixos_modules/zerotier.nix Normal file
View file

@ -0,0 +1,6 @@
{
services.zerotierone = {
enable = true;
joinNetworks = [ "8056c2e21cf9c753" ];
};
}

1
odin/common_configuration.nix
View file

@ -168,7 +168,6 @@ with lib;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
services.zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
services.gvfs = { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; }; services.gvfs = { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; };
# services.tlp.enable = false; # services.tlp.enable = false;
services.avahi = { services.avahi = {

1
thor/configuration.nix
View file

@ -130,7 +130,6 @@ with lib;
xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl"; xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
}; };
# gnome.gnome-remote-desktop.enable = true; # gnome.gnome-remote-desktop.enable = true;
zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
}; };
services.teamviewer.enable = true; services.teamviewer.enable = true;