netbird unstable

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "machines/homebox"]
-	path = machines/homebox
-	url = ssh://gitea@gitea.esotericbytes.com:2222/Blunkall-Technologies/homebox
-[submodule "machines/laptop"]
-	path = machines/laptop
-	url = ssh://gitea@gitea.esotericbytes.com:2222/Blunkall-Technologies/laptop

flake.lock

@@ -47,11 +47,11 @@
         "rev": "b2ec3d9cd0a6e52c4922b26d8b8e25823afd89d1",
         "revCount": 52,
         "type": "git",
-        "url": "file:///home/nathan/Projects/Aurora"
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
       },
       "original": {
         "type": "git",
-        "url": "file:///home/nathan/Projects/Aurora"
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
       }
     },
     "disko": {
@@ -663,11 +663,11 @@
     },
     "nixpkgs-us": {
       "locked": {
-        "lastModified": 1775710090,
+        "lastModified": 1776548001,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
+        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
+        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
         "type": "github"
       },
       "original": {
@@ -770,11 +770,11 @@
         "rev": "a62d8ce7f86424a297adead378be5f5a441add3c",
         "revCount": 39,
         "type": "git",
-        "url": "file:///home/nathan/Projects/Moirai"
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
       },
       "original": {
         "type": "git",
-        "url": "file:///home/nathan/Projects/Moirai"
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
       }
     },
     "nixvim_2": {

flake.nix

@@ -32,11 +32,11 @@
 
         hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
 
-        #nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
+        nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
-        nixvim.url = "git+file:///home/nathan/Projects/Moirai";
+        #nixvim.url = "git+file:///home/nathan/Projects/Moirai";
 
-        #aurora.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora";
+        aurora.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora";
-        aurora.url = "git+file:///home/nathan/Projects/Aurora";
+        #aurora.url = "git+file:///home/nathan/Projects/Aurora";
     };
 
     outputs = { ... } @ inputs: 

homes/nathan/home-manager/programs/hypridle/default.nix

@@ -15,7 +15,7 @@
                 settings = {
 
                     general = {
-                        lock_cmd = "aurora ipc call lockscreen lock";       # avoid starting multiple hyprlock instances.
+                        lock_cmd = "aurora ipc call lockscreen lock"; 
                             before_sleep_cmd = "loginctl lock-session";    # lock before suspend.
                             after_sleep_cmd = "hyprctl --instance 0 dispatch dpms on";  # to avoid having to press a key twice to turn on the display.
                     };

profiles/container/default.nix

@@ -126,7 +126,6 @@
                                 minimal = false;
                                 hyprland.enable = false;
                                 wal.enable = false;
-                                hyprlock.enable = false;
                                 mpd.enable = true;
                                 calcurse.enable = true;
                                 rofi.enable = true;

profiles/homebox/config.nix

@@ -3,8 +3,9 @@
     flake.nixosConfigurations."homebox" = inputs.nixpkgs.lib.nixosSystem {
 
         modules = [
-            self.nixosModules.homebox
             self.nixosModules.default
+            self.nixosModules.homebox
+            self.diskoConfigurations.homebox
         ];
     };
 
@@ -12,11 +13,6 @@
 
     {
 
-        imports = [ # Include the results of the hardware scan.
-
-            (import ./disko.nix { device1 = "/dev/nvme0n1"; device2 = "/dev/nvme1n1"; device3 = "/dev/sda"; })
-        ];
-
         config = {
 
             services = {
@@ -62,6 +58,10 @@
                     "nathan/pass" = {
                         neededForUsers = true;
                     };
+
+                    "remoteBuildClientKeys/laptop".sopsFile = ./../../system/secrets.yaml;
+                    "remoteBuildClientKeys/pi4".sopsFile = ./../../system/secrets.yaml;
+                    "remoteBuildClientKeys/android".sopsFile = ./../../system/secrets.yaml;
                 };
             };
 

profiles/homebox/default.nix

@@ -49,6 +49,10 @@
                 };
             };
 
+            services.netbird.clients.default.environment = {
+                NB_EXTRA_DNS_LABELS = "server";
+            };
+
             sysconfig = {
                 remoteBuildHost = true;
                 graphical = false;

profiles/homebox/disko.nix

@@ -1,15 +1,10 @@
 { ... }: {
 
     flake.diskoConfigurations.homebox = {
-        device1 ? throw "Set this to your disk device, e.g. /dev/sda",
-        device2,
-        device3,
-        ...
-    }: {
         disko.devices = {
             disk = {
                 main = {
-                    device = device1;
+                    device = "/dev/nvme0n1";
                     type = "disk";
                     content = {
                         type = "gpt";
@@ -48,7 +43,7 @@
                     };
                 };
                 ssd1 = {
-                    device = device2;
+                    device = "/dev/nvme1n1";
                     type = "disk";
                     content = {
                         type = "gpt";
@@ -65,7 +60,7 @@
                     };
                 };
                 hdd1 = {
-                    device = device3;
+                    device = "/dev/sda";
                     type = "disk";
                     content = {
                         type = "gpt";

profiles/iso/default.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }: {
+{ self, inputs, ... }: {
 
     flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: {
 
@@ -6,6 +6,9 @@
 
             (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
 
+            self.nixosModules.default
+            self.nixosModules.aurora-greeter
+
             home-manager.nixosModules.default
 
         ];
@@ -17,7 +20,7 @@
             fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
             environment.systemPackages = with pkgs; [ nerd-fonts.fira-code ];
 
-            system.stateVersion = "25.05";
+            system.stateVersion = "25.11";
 
             nixpkgs.hostPlatform = "x86_64-linux";
 
@@ -31,8 +34,6 @@
 
             users.users.nixos.enable = lib.mkForce false;
 
-            services.getty.autologinUser = lib.mkForce null;
-
             networking = {
                 nameservers = [ "1.1.1.1" "1.0.0.1" ];
                 networkmanager.enable = true;
@@ -60,7 +61,6 @@
                                 homeconfig = {
                                     minimal = false;
                                     hyprland.enable = true;
-                                    hyprlock.enable = true;
                                     wal.enable = true;
                                     mpd.enable = true;
                                     rofi.enable = true;
@@ -77,7 +77,6 @@
                 };
 
                 services = {
-                    sddm.enable = true;
                     openssh.enable = true;
                     pipewire.enable = true;
 #kdePlasma6.enable = true;
@@ -87,24 +86,9 @@
 
                 programs = {
 #steam.enable = true;
-                    hyprpanel.enable = true;
                     hyprland.enable = true;
                 };
-
-
-                virtualization = {
-
-                    wyoming = {
-                        enable = false;
             };
-
-                    homeassistant = {
-                        enable = false;
-                    };
-                };
-            };
-
-
         };
     };
 }

profiles/live/default.nix

@@ -72,7 +72,6 @@
                                 homeconfig = {
                                     minimal = false;
                                     hyprland.enable = true;
-                                    hyprlock.enable = true;
                                     wal.enable = true;
                                     mpd.enable = true;
                                     calcurse.enable = true;

system/default.nix

@@ -60,18 +60,6 @@
                 createHome = false;
             };
 
-            sops.secrets = let 
-                dir = builtins.readDir ../machines;
-            in lib.mkIf config.sysconfig.remoteBuildHost (builtins.listToAttrs 
-                    (builtins.map 
-                     (y: { name = "remoteBuildClientKeys/${y}"; value = { sopsFile = ./secrets.yaml; }; }) 
-                     (builtins.filter 
-                      (x: dir.${x} == "directory" && (import ../machines/${x} { config = {}; inputs = {}; inherit lib pkgs; }).config.sysconfig.remoteBuildClient) 
-                      (builtins.attrNames dir)
-                     )
-                    )
-                    );
-
             sops.templates."remote-builder" = lib.mkIf config.sysconfig.remoteBuildHost {
                 content = builtins.concatStringsSep ''''\n'' (builtins.map 
                         (y: config.sops.placeholder.${y}) 

system/services/netbird/default.nix

@@ -17,14 +17,23 @@
         in lib.mkIf config.sysconfig.services.netbird.enable {
 
             services.netbird = {
-                enable = config.sysconfig.services.netbird.enable;
+                enable = lib.mkDefault config.sysconfig.services.netbird.enable;
+
+                clients.default = {
+                    port = 51820;
+                    name = "netbird";
+                    interface = "wt0";
+                    hardened = false;
+                    
                     ui = {
-                    enable = true;
+                        enable = lib.mkDefault config.sysconfig.graphical;
                         #package = pkgs-us.netbird-ui;
-                    package = pkgs.netbird-ui;
+                        #package = pkgs.netbird-ui;
                     };
-                #package =   pkgs-us.netbird;
+                };
-                package =   pkgs.netbird;
+
+                package = pkgs-us.netbird;
+                #package =   pkgs.netbird;
             };
         };
     };

system/virtualization/docker/authentik/default.nix

@@ -121,6 +121,7 @@
                     "--network-alias=server"
                         "--network-alias=authentik-server"
                         "--network-alias=${name}"
+                        "--ip=192.168.101.6"
                 ];
                 networks = [
                     "docker-main"

templates/nixos/configuration.nix

@@ -51,7 +51,6 @@
                             homeconfig = {
                                 minimal = false;
                                 hyprland.enable = true;
-                                hyprlock.enable = true;
                                 wal.enable = true;
                                 mpd.enable = true;
                                 hyprpanel.enable = true;