more reorganizing

This commit is contained in:
Kopatz
2023-12-11 21:46:42 +01:00
parent 5d29130cf9
commit 05ea1b46c7
11 changed files with 42 additions and 17 deletions

View File

@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, vars, ... }:
{ config, pkgs, lib, inputs, ... }:
let
patchedWaybar = pkgs.waybar.overrideAttrs (oldAttrs: {
@@ -11,14 +11,14 @@ let
in
{
imports = [
(import ../../home-manager/hyprland-settings.nix ({ user="${vars.user}"; pkgs = pkgs; inherit vars; }))
(import ../../home-manager/hyprland-settings.nix ({ user="${config.mainUser.name}"; pkgs = pkgs; layout = config.mainUser.layout; variant = config.mainUser.variant; }))
];
services.xserver = {
layout = vars.layout;
xkbVariant = vars.variant;
layout = config.mainUser.layout;
xkbVariant = config.mainUser.variant;
enable = true;
displayManager = lib.mkIf (!config.services.xserver.displayManager.gdm.enable) {
displayManager = lib.mkIf (!config.services.xserver.displayManager.gdm.enable) {
sddm.enable = true;
};
};