diff --git a/flake.nix b/flake.nix index 46a66a7..8e38b73 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,7 @@ outputs = { self, nixpkgs, stablepkgs, home-manager, ... } @ inputs: let + inherit (self) outputs; system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; stable = stablepkgs.legacyPacakges.${system}; @@ -37,12 +38,14 @@ ./hosts/gabbielaptop/configuration.nix ./modules/nh.nix ./modules/waydroid.nix - inputs.home-manager.nixosModules.default +# inputs.home-manager.nixosModules.default ]; }; + +# Standalone home-manager config homeConfigurations.blue = home-manager.lib.homeManagerConfiguration { inherit pkgs; - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { inherit inputs outputs; }; # Import home-manager modules here modules = [ ./home-manager/home.nix diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix index cbdc63e..9c7c410 100644 --- a/home-manager/flatpak.nix +++ b/home-manager/flatpak.nix @@ -6,6 +6,6 @@ remotes = { "flathub" = "https://flathub.org/repo/flathub.flatpakrepo"; "flathub-beta" = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo"; - } + }; }; } diff --git a/home-manager/home.nix b/home-manager/home.nix index 53be1f9..6c76a86 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -19,6 +19,7 @@ home.packages = [ # Add grimblast screenshot tool pkgs.grimblast + pkgs.hello ]; home.sessionVariables = { diff --git a/home-manager/sober.nix b/home-manager/sober.nix index 680570b..9baf483 100644 --- a/home-manager/sober.nix +++ b/home-manager/sober.nix @@ -5,8 +5,8 @@ "sober:/root/sober.flatpakref" # https://sober.vinegarhq.org/sober.flatpakref ]; - remotes = [ - "sober" = "https://sober.vinegarhq.org/" - ] + remotes = { + "sober" = "https://sober.vinegarhq.org/sober.flatpakref"; + }; }; } diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index d5a7312..d39985a 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -162,7 +162,7 @@ tree tenacity mediawriter - anyrun + home-manager ]; hardware.keyboard.qmk.enable = true;