diff --git a/flake.nix b/flake.nix index dfa7c79..bc274a2 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,10 @@ nixosConfigurations = { #Personal laptop, thinkpad t490 athame = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs outputs; + hostname = "athame"; + }; modules = [ ./nixos/configuration.nix ./nixos/kde-desktop.nix @@ -71,6 +75,10 @@ }; #Work laptop, dell g15. metatron = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs outputs; + hostname = "metatron"; + }; modules = [ ./nixos/configuration.nix ./nixos/kde-desktop.nix @@ -80,6 +88,10 @@ ]; }; hearth = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs outputs; + hostname = "hearth"; + }; modules = [ ./nixos/configuration.nix ./nixos/home-assistant.nix diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix index f2ef9ab..9339ffc 100644 --- a/nixos/kde-desktop.nix +++ b/nixos/kde-desktop.nix @@ -13,7 +13,7 @@ services.fwupd.enable = true; boot.plymouth = { - enable = false; + enable = true; themePackages = with pkgs; [ (adi1090x-plymouth-themes.override {selected_themes = [ "rings" ]; }) ]; theme = "rings"; }; diff --git a/nixos/work.nix b/nixos/work.nix index 829a42b..a4898eb 100644 --- a/nixos/work.nix +++ b/nixos/work.nix @@ -3,9 +3,10 @@ { virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = [ "traverseda" ]; + environment.systemPackages = with pkgs; [ pkgs.qgroundcontrol - + pkgs.distrobox ]; } diff --git a/nixos/zerotier.nix b/nixos/zerotier.nix index 8bf9a34..b9ea09b 100644 --- a/nixos/zerotier.nix +++ b/nixos/zerotier.nix @@ -1,5 +1,5 @@ let - privateZeroTierInterfaces = [ "ztmwri5sbj" ]; # ZT NET INTERFACE + privateZeroTierInterfaces = [ "zt_aura" ]; # ZT NET INTERFACE in { networking.firewall.trustedInterfaces = privateZeroTierInterfaces; # TRUST VPN ONLY @@ -13,6 +13,20 @@ in { services.avahi.publish.domain = true; services.avahi.nssmdns4 = true; services.avahi.publish.workstation = true; # ADDED TO DESKTOP MACHINES + + systemd.services.createDevicemap = { + description = "Create ZeroTier devicemap file"; + before = [ "zerotierone.service" ]; # Ensure ZeroTier service has started + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + mkdir -p /var/lib/zerotier-one + echo "e04fa485ed2a4dc4=zt_aura" > /var/lib/zerotier-one/devicemap + ''; + }; services.zerotierone.enable = true;