Fix: consolidate user configuration and enable zsh system-wide in common settings

This commit is contained in:
2025-10-28 01:50:59 +00:00
parent 5a0fb5bf82
commit 5f6c542879
3 changed files with 41 additions and 95 deletions

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ config, pkgs, inputs, ... }:
{
imports = [
@@ -7,6 +7,46 @@
# Common system configuration shared across all machines
# User configuration (shared across all machines)
users.users.zeph = {
isNormalUser = true;
description = "Zephrynis";
extraGroups = [ "networkmanager" "wheel" "video" "audio" ];
shell = pkgs.zsh;
};
# Enable zsh system-wide
programs.zsh.enable = true;
# Hyprland - Tiling Wayland compositor (shared configuration)
programs.hyprland = {
enable = true;
xwayland.enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
};
# Enable X11 for XWayland support
services.xserver.enable = true;
# Display manager - SDDM with Wayland support
services.displayManager.sddm = {
enable = true;
wayland.enable = true;
};
# Fonts (shared across all machines)
fonts.packages = with pkgs; [
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
liberation_ttf
fira-code
fira-code-symbols
nerd-fonts.fira-code
nerd-fonts.jetbrains-mono
nerd-fonts.iosevka
];
# Bootloader
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;