feat(firefox): only set all profiles for steveej; nix fmt

nix/os/profiles/common/user.nix

@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   lib,
   ...
 }:
@@ -8,8 +7,7 @@ let
   keys = import ../../../variables/keys.nix;
   inherit
     (import ../../lib/default.nix {
-      inherit (pkgs) lib;
-      inherit config;
+      inherit lib config;
     })
     mkUser
     ;
@@ -37,13 +35,13 @@ in
 
     # TODO: test if this works
     installPassword = lib.mkOption {
-      default = "";
-      type = types.str;
+      default = null;
+      type = types.nullOr types.str;
     };
   };
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
-      (lib.mkIf (cfg.installPassword == "") {
+      (lib.mkIf (cfg.installPassword == null) {
         sops.secrets.sharedUsers-root = {
           sopsFile = ../../../../secrets/shared-users.yaml;
           neededForUsers = true;
@@ -64,7 +62,7 @@ in
       })
 
       {
-        users.mutableUsers = cfg.installPassword != "";
+        users.mutableUsers = cfg.installPassword != null;
 
         users.users.root = lib.mkMerge [
           { openssh.authorizedKeys.keys = keys.users.steveej.openssh; }
@@ -74,20 +72,18 @@ in
           (lib.mkIf (cfg.installPassword == "") { hashedPasswordFile = cfg.rootPasswordFile; })
         ];
 
-        users.users.steveej = lib.mkIf cfg.enableNonRoot (
-          mkUser (
-            lib.mkMerge [
-              { uid = 1000; }
-
-              (lib.mkIf (cfg.installPassword != "") { password = cfg.installPassword; })
-
-              (lib.mkIf (cfg.installPassword == "") {
-                hashedPasswordFile = config.sops.secrets.sharedUsers-steveej.path;
-              })
-            ]
-          )
-        );
       }
+
+      (lib.mkIf cfg.enableNonRoot (mkUser {
+        username = "steveej";
+
+        uid = 1000;
+
+        password = cfg.installPassword;
+        hashedPasswordFile = lib.mkIf (
+          cfg.installPassword == null
+        ) config.sops.secrets.sharedUsers-steveej.path;
+      }))
     ]
   );
 }

nix/os/profiles/graphical-gnome-xorg.nix

@@ -66,8 +66,8 @@
   programs.seahorse.enable = true;
   programs.dconf.enable = true;
 
-  environment.gnome.excludePackages =
-    (with pkgs; [
+  environment.gnome.excludePackages = with pkgs;
+    [
       orca
       gnome-photos
       gnome-tour
@@ -81,7 +81,7 @@
       evince # document viewer
       gnome-characters
       totem # video player
-    ]);
+    ];
 
   services.pipewire = {
     audio.enable = true;