diff --git a/.sops.yaml b/.sops.yaml
index 18a8789f..5be25763 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -10,6 +10,7 @@ keys:
   - &host_bakersfield-rpi4 
   - &host_steamdeck
   - &host_nixos-desktop    
+  - &host_nuc-server
 
 creation_rules:
   - path_regex: secrets\/secrets\.yaml$
@@ -93,3 +94,8 @@ creation_rules:
     - pgp:
       - *user_albert
 
+  - path_regex: secrets\/hosts\/nuc-server\.yaml$
+    key_groups:
+    - pgp:
+      - *user_albert
+
diff --git a/flake.nix b/flake.nix
index 1b0a33b5..da087ea8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,27 +61,27 @@
       osaka-linode-01  = libx.mkHost { hostname = "osaka-linode-01"; type = "small";};
       milan-linode-01  = libx.mkHost { hostname = "milan-linode-01"; type = "small";};
       framework-server = libx.mkHost { hostname = "framework-server"; };
-      # TODO nuc-server       = libx.mkHost { hostname = "nuc-server"; };
+      nuc-server       = libx.mkHost { hostname = "nuc-server"; };
       nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "hyprland"; theme = "green"; };
       nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "green"; };
       backups-rpi4     = libx.mkHost { hostname = "backups-rpi4";     system = "aarch64-linux"; type = "small"; };
       piaware-rpi4     = libx.mkHost { hostname = "piaware-rpi4";     system = "aarch64-linux"; type = "small"; };
-      # TODO quitman-rpi4     = libx.mkHost { hostname = "quitman-rpi4";     system = "aarch64-linux"; type = "small"; };
-      # TODO bakersfield-rpi4 = libx.mkHost { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; };
-      # TODO steamdeck        = libx.mkHost { hostname = "steamdeck"; unfree = true; desktop = "plasma6"; repo = "nixpkgs-unstable"; };
+      quitman-rpi4     = libx.mkHost { hostname = "quitman-rpi4";     system = "aarch64-linux"; type = "small"; };
+      bakersfield-rpi4 = libx.mkHost { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; };
+      steamdeck        = libx.mkHost { hostname = "steamdeck"; unfree = true; desktop = "plasma6"; repo = "nixpkgs-unstable"; };
     };
     homeConfigurations = {
       "albert@osaka-linode-01"  = libx.mkHome { hostname = "osaka-linode-01";  type = "small"; };
       "albert@milan-linode-01"  = libx.mkHome { hostname = "milan-linode-01";  type = "small"; };
       "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
-      # TODO "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server";  };
+      "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server";  };
       "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop";   desktop = "hyprland"; theme = "green"; };
       "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; };
       "albert@backups-rpi4"     = libx.mkHome { hostname = "backups-rpi4";     system = "aarch64-linux"; type = "small"; };
       "albert@piaware-rpi4"     = libx.mkHome { hostname = "piaware-rpi4";     system = "aarch64-linux"; type = "small"; };
-      # TODO "albert@quitman-rpi4"     = libx.mkHome { hostname = "quitman-rpi4";     system = "aarch64-linux"; type = "small"; };
-      # TODO "albert@bakersfield-rpi4" = libx.mkHome { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; };
-      # TODO "albert@steamdeck"        = libx.mkHome { hostname = "steamdeck"; desktop = "plasma6"; };
+      "albert@quitman-rpi4"     = libx.mkHome { hostname = "quitman-rpi4";     system = "aarch64-linux"; type = "small"; };
+      "albert@bakersfield-rpi4" = libx.mkHome { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; };
+      "albert@steamdeck"        = libx.mkHome { hostname = "steamdeck"; desktop = "plasma6"; };
       # Containers 
       "albert@rdesktop"   = libx.mkHome { hostname = "rdesktop"; desktop = "xfce"; };
     };
diff --git a/secrets/hosts/nuc-server.yaml b/secrets/hosts/nuc-server.yaml
new file mode 100644
index 00000000..2924e059
--- /dev/null
+++ b/secrets/hosts/nuc-server.yaml
@@ -0,0 +1,32 @@
+tailscale_key: null
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-04-25T10:42:33Z"
+    mac: ENC[AES256_GCM,data:/qK0K/oeUTw4eTc/0C/JJV6i5TjuO+N8k1VQQnGIzy+ObxIx6xe4lDXLWfMuCc23YuEArwzMHccuVzoswidndRn/6WBTvszx/dil0hMABFLZ9sZ9q2UThXXV0kfFpjUN0pkA5zZvqeQ3thBp6c/7mTjDRxxnY7+a9HFAoIIZ+QQ=,iv:buA7Fp6qUsfT79BHFjzKp5AgSUNS7oMTs8Ad8bRLuvI=,tag:pifnaqnP+XxOdRFsR9UaXQ==,type:str]
+    pgp:
+        - created_at: "2024-04-25T10:42:23Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMAx+imH9kwOLOAQ/8DVSMvZC1cuZCjBefBMkNtyWiNwA+9vnjR6MVOdrWccMq
+            xJCLeI1ZFARDhojhi3nRhq5odCY2xoAETx3zvEGeCjZCGzDsFoQTfaEWu6a1o7UB
+            gTItEcztAh+Fle9EZbrm4djMLR2lZNZ93DsTbjM8TRIK1+ybJsn4lKQX6RLcwF/V
+            dYK4wah+hLqN5p2VEYFZ2gFDDeUnQ90H4p2MiV4OtfpOwbiimKEZk+rqzHBzon2K
+            MICxvICjfhE90Zhttpu6WsM9N0qHMVgJGKJ4yFGW0Y1+bfsW0XRzp5bAHNHRs6dC
+            Cku3OQshBNS+fqo8jj+uxRMdvlxz+D5jEEmfukhrSzh/dtsR7RjZOvUSXlgA2Chp
+            WNT6UK07cZDgifBhSp7cBkgQsjtKQOaOpFEqOk9gYHA3FiSUm/+flnbVQ05r62q7
+            LX/8knU8oGaq+Id9kx2DhIYv6W1Mfef0cb16hn5MjD8BtuY5a8Mq/s371wLFgh8+
+            5207bX+zcPMaTeaGwPG7eTV3DCHmaatxp+7dCRi1IVQtf9HDs/bx5wnMizLFr4AR
+            /MxFTQvoley+sCTYjwt4DTpHfMMXJ0mjBoTnV8DMr4kW2Xq+HYu+kAE3UnBkTjFc
+            /bTdCTTwt969Vi6o5ZqN6q2Fs2WVOMi6+/G3Extoga0VK6XQfDWfa3XgDnjuZyHS
+            VgET4YEbhUf3mS8uHEcn7VEk6kxAW/6Ua/hlGWcIxJVCa4Rdj4H5+9WiMFo5jNUv
+            vtbz0+v9BGO1g2czcHeBHnRkDbhnamgN5Mvb7+VneNSYgMu6UZVH
+            =WYVR
+            -----END PGP MESSAGE-----
+          fp: D98BBC6C9A27324654C2D8C464F6C4EB46C4543A
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1