diff --git a/configuration.nix b/configuration.nix index 3f263dc..7d21735 100644 --- a/configuration.nix +++ b/configuration.nix @@ -181,7 +181,10 @@ nix = { package = pkgs.nixFlakes; - extraOptions = "experimental-features = nix-command flakes"; + extraOptions = '' + experimental-features = nix-command flakes + warn-dirty = false + ''; settings.auto-optimise-store = true; gc = { automatic = true; diff --git a/flake.nix b/flake.nix index 2699dce..9a1db10 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ hyprland = { url = "github:hyprwm/Hyprland"; - # build with your own instance of nixpkgs + inputs.nixpkgs.follows = "nixpkgs"; }; @@ -20,20 +20,15 @@ }; - # hardware.url = "github:nixos/nixos-hardware"; - # Shameless plug: looking for a way to nixify your themes and make - # everything match nicely? Try nix-colors! - # nix-colors.url = "github:misterio77/nix-colors"; }; outputs = { nixpkgs, home-manager, self, hyprland, ... }@inputs: { - # NixOS configuration entrypoint - # Available through 'nixos-rebuild --flake .#your-hostname' + nixosConfigurations = { nixos = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; flake-self = self; }; # Pass flake inputs to our config - # > Our main nixos configuration file < + specialArgs = { inherit inputs; flake-self = self; }; + modules = [ ./configuration.nix hyprland.nixosModules.default @@ -43,13 +38,12 @@ }; - # Standalone home-manager configuration entrypoint - # Available through 'home-manager --flake .#your-username@your-hostname' + homeConfigurations = { "notoh@nixos" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config - # > Our main home-manager configuration file < + pkgs = nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = { inherit inputs; }; + modules = [./home-manager/home.nix ]; }; };