flake.lock

@@ -192,22 +192,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1751741127,
-        "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "29e290002bfff26af1db6f64d070698019460302",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -242,8 +226,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "secrets": "secrets",
-        "sops-nix": "sops-nix",
-        "webone": "webone"
+        "sops-nix": "sops-nix"
       }
     },
     "rust-overlay": {
@@ -301,25 +284,6 @@
         "repo": "sops-nix",
         "type": "github"
       }
-    },
-    "webone": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1752022159,
-        "narHash": "sha256-WFkQ1WA+BRLuwfmh6uMym3IoUSXOu2sSM5XzalsLeUQ=",
-        "owner": "firewalkwithm3",
-        "repo": "webone",
-        "rev": "256f5e115ceffb71fd2d61e0c7cb9b6b55c7571a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "firewalkwithm3",
-        "repo": "webone",
-        "rev": "256f5e115ceffb71fd2d61e0c7cb9b6b55c7571a",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -12,10 +12,9 @@
       flake = false;
     };
     
-    # Packages.
+    # Updated packages.
     fluffychat2.url = "github:NixOS/nixpkgs?ref=pull/419632/head"; # FluffyChat 2.0.0
     feishin0_17.url = "github:NixOS/nixpkgs?ref=pull/414929/head"; # Feishin 0.17.0
-    webone.url = "github:firewalkwithm3/webone?rev=256f5e115ceffb71fd2d61e0c7cb9b6b55c7571a"; # WebOne HTTP proxy.
   };
 
   outputs =
@@ -35,7 +34,7 @@
         {
           hostname,
           suite,
-          platform ? "x86_64-linux",
+          platform,
           user ? "fern",
           extraModules ? [ ],
         }:
@@ -43,20 +42,17 @@
           system = platform;
 
           specialArgs = {
-            inherit hostname suite platform user; # Inherit variables.
-            secrets = builtins.toString inputs.secrets; # Secrets directory.
-            # Packages
-            userPkgs = {
-              fluffychat = fluffychat2.legacyPackages.${system}.fluffychat;
-              feishin = feishin0_17.legacyPackages.${system}.feishin;
-              webone = webone.packages.${system}.default;
-            };
+            inherit user;
+            secrets = builtins.toString inputs.secrets;
+            fluffychat2 = import fluffychat2 { inherit system; };
+            feishin0_17 = import feishin0_17 { inherit system; };
           };
 
           modules = [
             ./suites/common.nix
             ./suites/${suite}.nix
             ./hosts/${suite}/${hostname}.nix
+            { networking.hostName = hostname; }
           ] ++ extraModules;
         };
     in
@@ -66,6 +62,7 @@
         muskduck = mkHost {
           hostname = "muskduck";
           suite = "laptop";
+          platform = "x86_64-linux";
           extraModules = [
             lanzaboote.nixosModules.lanzaboote
             nixos-hardware.nixosModules.lenovo-thinkpad-t480
@@ -88,23 +85,27 @@
           hostname = "docker";
           suite = "vm";
           user = "docker";
+          platform = "x86_64-linux";
         };
 
         vm-minecraft = mkHost {
           hostname = "minecraft";
           suite = "vm";
           user = "docker";
+          platform = "x86_64-linux";
         };
 
         # LXC containers.
         lxc-technitium = mkHost {
           hostname = "technitium";
           suite = "lxc";
+          platform = "x86_64-linux";
         };
 
         lxc-firefox-syncserver = mkHost {
           hostname = "firefox-syncserver";
           suite = "lxc";
+          platform = "x86_64-linux";
           extraModules = [
             sops-nix.nixosModules.sops
           ];

suites/common.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   lib,
-  hostname,
   user,
   ...
 }:
@@ -49,9 +48,6 @@ with lib;
   # Enable networking.
   networking.networkmanager.enable = true;
 
-  # Set hostname
-  networking.hostName = hostname;
-
   # Define a user account.
   users.users.${user} = {
     isNormalUser = true;

suites/laptop.nix

@@ -1,7 +1,8 @@
 {
   pkgs,
-  userPkgs,
   lib,
+  feishin0_17,
+  fluffychat2,
   ...
 }:
 with lib;
@@ -109,7 +110,7 @@ with lib;
     caligula
     celluloid
     discord
-    userPkgs.feishin
+    feishin0_17.feishin
     ghostty
     gimp3
     glabels-qt
@@ -137,7 +138,7 @@ with lib;
     })
 
     # FluffyChat 2.0.0 with fixed desktop item.
-    (userPkgs.fluffychat.overrideAttrs (
+    (fluffychat2.fluffychat.overrideAttrs (
       finalAttrs: previousAttrs: {
         desktopItems = [
           ((builtins.elemAt previousAttrs.desktopItems 0).override { startupWMClass = "fluffychat"; })