Remove duplicated username

Sigmanificient · Sep 23, 2023 · 0695e7b · 0695e7b
1 parent 2a2a524
commit 0695e7b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/config/default.nix b/config/default.nix
@@ -1,4 +1,4 @@
-{ hostname, pkgs, ... }:
+{ username, hostname, pkgs, ... }:
 {
   imports =
     [
@@ -47,7 +47,7 @@
   };
 
   networking = {
-    hostName = "${hostname}";
+    hostName = hostname;
     networkmanager.enable = true;
     firewall.enable = false;
   };
@@ -144,7 +144,7 @@
     upower.enable = true;
   };
 
-  users.users.sigmanificient = {
+  users.users."${username}" = {
     isNormalUser = true;
     shell = pkgs.zsh;
     extraGroups = [ "docker" "networkmanager" "libvirtd" "wheel" ];

diff --git a/flake.nix b/flake.nix
@@ -37,6 +37,8 @@
       pkgs = nixpkgs.legacyPackages.${system};
 
       default_modules = [
+        ./config
+
         nix-index-database.nixosModules.nix-index
 
         home-manager.nixosModules.home-manager
@@ -65,9 +67,12 @@
         Bacon = nixpkgs.lib.nixosSystem {
           inherit system;
 
-          specialArgs = { hostname = "Bacon"; };
+          specialArgs = {
+            inherit username;
+            hostname = "Bacon";
+          };
+
           modules = default_modules ++ [
-            ./config
             ./hardware/bacon.nix
 
             nixos-hardware.nixosModules.asus-battery
@@ -79,10 +84,13 @@
 
         Sigmachine = nixpkgs.lib.nixosSystem {
           inherit system;
-          specialArgs = { hostname = "Sigmachine"; };
+
+          specialArgs = {
+            inherit username;
+            hostname = "Sigmachine";
+          };
 
           modules = default_modules ++ [
-            ./config
             ./hardware/sigmachine.nix
             ./config/sigmachine.nix
           ];