diff --git a/configurations/host/default.nix b/configurations/host/default.nix index fc0c1b9..cacef03 100644 --- a/configurations/host/default.nix +++ b/configurations/host/default.nix @@ -34,6 +34,10 @@ let home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; + home-manager.sharedModules = [ + materusCfg.configInputs.plasma-manager.homeManagerModules.plasma-manager + materusCfg.configInputs.sops-nix.homeManagerModules.sops + ]; home-manager.users = (builtins.foldl' (a: b: a // b) { } (builtins.map (user: { ${user} = ({ ... }: diff --git a/configurations/host/materusPC/home/materus/default.nix b/configurations/host/materusPC/home/materus/default.nix index 323cdfa..2804a53 100644 --- a/configurations/host/materusPC/home/materus/default.nix +++ b/configurations/host/materusPC/home/materus/default.nix @@ -1,5 +1,8 @@ { pkgs, materusArg, lib, ... }: { + imports = [ + ./plasma.nix + ]; home.stateVersion = "23.05"; home.homeDirectory = "/home/materus"; @@ -81,7 +84,6 @@ }; home.packages = [ - pkgs.papirus-icon-theme materusArg.pkgs.ffmpeg_7-amf-full (materusArg.pkgs.polymc-qt5.wrap { extraJDKs = [ pkgs.graalvm-ce ]; extraLibs = [ ]; }) pkgs.git-crypt @@ -106,8 +108,8 @@ }; home.file.".gradle/gradle.properties".text = '' - org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_17_HOME,JAVA_21_HOME - org.gradle.home=${pkgs.jdk21} + org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_17_HOME,JAVA_21_HOME + org.gradle.home=${pkgs.jdk21} ''; xdg.desktopEntries.brave-browser = diff --git a/configurations/shared/home/genHomes.nix b/configurations/shared/home/genHomes.nix index e7f6cb1..f20f5dc 100644 --- a/configurations/shared/home/genHomes.nix +++ b/configurations/shared/home/genHomes.nix @@ -19,9 +19,6 @@ let (materusFlake.selfPath + "/configurations/shared/home/${username}") (materusFlake.selfPath + "/configurations/host/${host}/home/${username}") profiles.homeProfile - materusFlake.nixosConfigurations.${host}.materusCfg.configInputs.sops-nix.homeManagerModules.sops - materusFlake.nixosConfigurations.${host}.materusCfg.configInputs.plasma-manager.homeManagerModules.plasma-manager - ]; }; }]