fix: refactor flake.nix, home-manager/home.nix, nixos/configuration.nix to avoid home-manager.useGlobalPkgs conflict error

This commit is contained in:
autumn-the-kitty-cat
2025-11-28 18:06:06 -05:00
parent 629929b657
commit c7ba15d42a
3 changed files with 29 additions and 32 deletions
+13 -1
View File
@@ -1,20 +1,25 @@
{ pkgs, hostName, ... }:
{ inputs, hostName, pkgs, ... }:
{
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.home-manager
];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.cleanOnBoot = true;
nix.package = pkgs.lixPackageSets.latest.lix;
networking.hostName = "${hostName}";
hardware.graphics.enable = true;
networking.networkmanager.enable = true;
nixpkgs.config.allowUnfree = true;
time.timeZone = "America/Toronto";
i18n.defaultLocale = "en_CA.UTF-8";
@@ -24,6 +29,13 @@
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
'';
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
autumn = import ../home-manager/home.nix;
};
};
services.gnome.glib-networking.enable = true;
programs.hyprland = {