stylix (#3)

Co-authored-by: mjallen18 <matt.l.jallen@gmail.com>
Reviewed-on: #3

modules/nixos/home/default.nix

@@ -65,6 +65,7 @@ in
           sops-nix.homeManagerModules.sops
           nix-plist-manager.homeManagerModules.default
           nix-index-database.homeModules.nix-index
+          stylix.homeModules.stylix
           # Add any other external HM modules here
         ]
         ++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ])

modules/nixos/programs/default.nix

@@ -14,7 +14,7 @@ in
 {
   programs = {
     nix-index-database.comma.enable = true;
-    zsh.enable = lib.mkDefault true;
+    zsh.enable = lib.mkForce true;
     gnupg.agent = {
       enable = lib.mkDefault true;
       enableSSHSupport = lib.mkDefault true;

modules/nixos/services/common/default.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, config, ... }:
 {
   services = {
 
@@ -7,8 +7,8 @@
       hwRender = true;
       fonts = [
         {
-          name = "JetBrainsMono NFM";
-          package = pkgs.nerd-fonts.jetbrains-mono;
+          name = lib.mkDefault config.stylix.fonts.monospace;
+          package = lib.mkDefault config.stylix.fonts.monospace.package;
         }
       ];
     };

modules/nixos/shell/default.nix

@@ -1,7 +1,7 @@
 { lib, ... }:
 {
   programs = {
-    zsh.enable = lib.mkDefault true;
+    zsh.enable = lib.mkForce true;
     gnupg.agent = {
       enable = lib.mkDefault true;
       enableSSHSupport = lib.mkDefault true;

modules/nixos/user/default.nix

@@ -69,51 +69,58 @@ in
     users = {
       mutableUsers = cfg.mutableUsers;
       groups.${cfg.group}.gid = lib.mkForce (if cfg.group != "wheel" then cfg.gid else 1);
-      users.${cfg.name} = {
-        inherit (cfg)
-          name
-          uid
-          linger
-          packages
-          password
-          hashedPassword
-          hashedPasswordFile
-          ;
+      users = {
+        root = {
+          isSystemUser = true;
+          isNormalUser = false;
+          shell = lib.mkForce pkgs.zsh;
+        };
+        ${cfg.name} = {
+          inherit (cfg)
+            name
+            uid
+            linger
+            packages
+            password
+            hashedPassword
+            hashedPasswordFile
+            ;
 
-        extraGroups = [
-          "wheel"
-          "keys"
-          "networkmanager"
-          "ratbagd"
-          "scanner"
-          "systemd-journal"
-          "mpd"
-          "audio"
-          "video"
-          "input"
-          "plugdev"
-          "lp"
-          "tss"
-          "power"
-          "nix"
-          "i2c"
-          "media"
-          "nscd"
-          "avahi"
-          "podman"
-          "libvirtd"
-        ]
-        ++ cfg.extraGroups;
+          extraGroups = [
+            "wheel"
+            "keys"
+            "networkmanager"
+            "ratbagd"
+            "scanner"
+            "systemd-journal"
+            "mpd"
+            "audio"
+            "video"
+            "input"
+            "plugdev"
+            "lp"
+            "tss"
+            "power"
+            "nix"
+            "i2c"
+            "media"
+            "nscd"
+            "avahi"
+            "podman"
+            "libvirtd"
+          ]
+          ++ cfg.extraGroups;
 
-        group = cfg.group;
-        home = "/home/${cfg.name}";
-        isNormalUser = true;
-        shell = lib.mkForce pkgs.zsh;
+          group = cfg.group;
+          home = "/home/${cfg.name}";
+          isNormalUser = true;
+          shell = lib.mkForce pkgs.zsh;
 
-        # SSH keys - combine user-specific and common keys
-        openssh.authorizedKeys.keys = cfg.sshKeys ++ (lib.optionals cfg.enableCommonSshKeys commonSshKeys);
-      }
-      // cfg.extraOptions;
+          # SSH keys - combine user-specific and common keys
+          openssh.authorizedKeys.keys = cfg.sshKeys ++ (lib.optionals cfg.enableCommonSshKeys commonSshKeys);
+        }
+        // cfg.extraOptions;
+      };
     };
     assertions = [
       {