diff --git a/dotfiles/biscuit/home.nix b/dotfiles/biscuit/home.nix
index ad70bc4..9deff1f 100644
--- a/dotfiles/biscuit/home.nix
+++ b/dotfiles/biscuit/home.nix
@@ -4,6 +4,7 @@
   lib,
   config,
   pkgs,
+  username,
   ...
 }: {
   imports = [
@@ -14,8 +15,8 @@
   programs.home-manager.enable = true;
 
   home = {
-    username = "biscuit";
-    homeDirectory = "/home/biscuit";
+    username = "${username}";
+    homeDirectory = "/home/${username}";
     packages = [];
     sessionVariables = {};
   };
diff --git a/flake.nix b/flake.nix
index 88f5980..6c6cb61 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
     args = {
-      inherit inputs;
+      inherit inputs system;
     } // info;
   in {
     nixosConfigurations = {
diff --git a/pkgs/ags/biscuit.nix b/pkgs/ags/biscuit.nix
index f39454e..24738f4 100644
--- a/pkgs/ags/biscuit.nix
+++ b/pkgs/ags/biscuit.nix
@@ -1,22 +1,21 @@
-{
-  inputs,
-  pkgs,
-  system,
-  ...
-}: {
-  imports = [inputs.ags.homeManagerModules.default];
+{ inputs, pkgs, system, ... }: {
+  imports = [ inputs.ags.homeManagerModules.default ];
+
   programs.ags = {
     enable = true;
     configDir = ./biscuit;
-    extraPackages = with pkgs; [
-      inputs.ags.packages.${pkgs.system}.battery
-      inputs.ags.packages.${pkgs.system}.hyprland
-      inputs.ags.packages.${pkgs.system}.mpris
-      inputs.ags.packages.${pkgs.system}.wireplumber
-      inputs.ags.packages.${pkgs.system}.notifd
-      inputs.ags.packages.${pkgs.system}.apps
-      inputs.ags.packages.${pkgs.system}.network
-      inputs.ags.packages.${pkgs.system}.tray
+
+    extraPackages = let
+      agsPkgs = inputs.ags.packages.${system};
+    in with pkgs; [
+      agsPkgs.battery
+      agsPkgs.hyprland
+      agsPkgs.mpris
+      agsPkgs.wireplumber
+      agsPkgs.notifd
+      agsPkgs.apps
+      agsPkgs.network
+      agsPkgs.tray
       fzf
     ];
   };
diff --git a/system/networking.nix b/system/networking.nix
index 396088d..4dbbbe5 100644
--- a/system/networking.nix
+++ b/system/networking.nix
@@ -1,5 +1,5 @@
-{pkgs, ...}: {
-  networking.hostName = "nixos";
+{pkgs, hostname, ...}: {
+  networking.hostName = "${hostname}";
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
diff --git a/system/users.nix b/system/users.nix
index 3c22ff1..f601629 100644
--- a/system/users.nix
+++ b/system/users.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }: {
-  users.users.biscuit = {
+{ pkgs, username, ... }: {
+  users.users.${username} = {
     isNormalUser = true;
     extraGroups = [ "wheel" "networkmanager" ];
     initialHashedPassword = "$6$Qab6SSvEJM2YRtVA$7Oyl7E3pp/FKtCC.2Tb2tyzp3yp7BFHFAKngUYJssQJ.v1Q2mqsgW9m7njpaKNcka2vyCwrnmw1R.YPlFqR0p1";