diff --git a/hosts/fallarbor/home.nix b/hosts/fallarbor/home.nix index 36235480..9524bbe1 100644 --- a/hosts/fallarbor/home.nix +++ b/hosts/fallarbor/home.nix @@ -5,12 +5,8 @@ lib, ... }: { - home-manager.users = { - aly = { - imports = [../../aly.nix]; - }; - dustin = { - imports = [../../dustin.nix]; - }; + home-manager = { + users.aly = import ../../aly.nix; + users.dustin = import ../../dustin.nix; }; } diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix index 36db6ee7..a028fa3e 100644 --- a/hosts/lavaridge/home.nix +++ b/hosts/lavaridge/home.nix @@ -5,16 +5,16 @@ lib, ... }: { - home-manager.sharedModules = [ - { - imports = [../../homeManagerModules]; - alyraffauf.services.easyeffects = { - enable = true; - preset = "framework13"; - }; - } - ]; - home-manager.users.aly = { - imports = [../../homeManagerModules ../../aly.nix]; + home-manager = { + sharedModules = [ + { + imports = [../../homeManagerModules]; + alyraffauf.services.easyeffects = { + enable = true; + preset = "framework13"; + }; + } + ]; + users.aly = import ../../aly.nix; }; } diff --git a/hosts/mauville/home.nix b/hosts/mauville/home.nix index 92f80bed..7b44639f 100644 --- a/hosts/mauville/home.nix +++ b/hosts/mauville/home.nix @@ -5,18 +5,16 @@ lib, ... }: { - home-manager.sharedModules = [ - { - imports = [../../homeManagerModules]; - xdg.userDirs.music = "/mnt/Media/Music"; - alyraffauf.desktop.hyprland.autoSuspend = false; - alyraffauf.desktop.sway.autoSuspend = false; - } - ]; - home-manager.users.aly = { - imports = [../../aly.nix]; - }; - home-manager.users.dustin = { - imports = [../../dustin.nix]; + home-manager = { + sharedModules = [ + { + imports = [../../homeManagerModules]; + xdg.userDirs.music = "/mnt/Media/Music"; + alyraffauf.desktop.hyprland.autoSuspend = false; + alyraffauf.desktop.sway.autoSuspend = false; + } + ]; + users.aly = import ../../aly.nix; + users.dustin = import ../../dustin.nix; }; } diff --git a/hosts/mossdeep/home.nix b/hosts/mossdeep/home.nix index bc1fdd80..0118277f 100644 --- a/hosts/mossdeep/home.nix +++ b/hosts/mossdeep/home.nix @@ -5,7 +5,7 @@ lib, ... }: { - home-manager.users.aly = { - imports = [../../aly.nix]; + home-manager = { + users.aly = import ../../aly.nix; }; } diff --git a/hosts/petalburg/home.nix b/hosts/petalburg/home.nix index 80fe21f0..ce187e93 100644 --- a/hosts/petalburg/home.nix +++ b/hosts/petalburg/home.nix @@ -5,10 +5,14 @@ lib, ... }: { - home-manager.users.aly = { - imports = [../../aly.nix]; - alyraffauf.desktop.sway = { - tabletMode.enable = true; - }; + home-manager = { + sharedModules = [ + { + alyraffauf.desktop.sway = { + tabletMode.enable = true; + }; + } + ]; + users.aly = import ../../aly.nix; }; } diff --git a/hosts/rustboro/home.nix b/hosts/rustboro/home.nix index 6841cc11..d7ec56fc 100644 --- a/hosts/rustboro/home.nix +++ b/hosts/rustboro/home.nix @@ -9,11 +9,9 @@ sharedModules = [ { imports = [../../homeManagerModules]; - alyraffauf = { - services.easyeffects = { - enable = true; - preset = "LoudnessEqualizer.json"; - }; + alyraffauf.services.easyeffects = { + enable = true; + preset = "LoudnessEqualizer"; }; } ];