From ae4bfdfe7be5eab4b36033828bff2a033c7f5714 Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Tue, 21 Feb 2023 21:43:47 +0100 Subject: remove inputs already in registry --- flake.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 118d32a..6ad632a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,6 @@ { inputs = { my-nixpkgs.url = "git+file:///home/qaristote/code/nix/my-nixpkgs"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - home-manager.url = "github:nix-community/home-manager"; }; outputs = { self, nixpkgs, my-nixpkgs, nixos-hardware, home-manager }: -- cgit v1.2.3 From e761ac4b2c69f8ac267e53fa437c6978b207d743 Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Tue, 21 Feb 2023 21:43:37 +0100 Subject: factorize passing of modules --- flake.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 6ad632a..4bc26a3 100644 --- a/flake.nix +++ b/flake.nix @@ -9,18 +9,19 @@ overlays-module = { ... }: { nixpkgs.overlays = [ my-nixpkgs.overlays.personal ]; }; + homeModules = [ overlays-module my-nixpkgs.homeModules.personal ./home ]; + nixosModules = + [ overlays-module my-nixpkgs.nixosModules.personal ./nixos ]; in { nixosConfigurations.latitude-7490 = nixpkgs.lib.nixosSystem { inherit system; - specialArgs = { - inherit nixos-hardware home-manager; - home.qaristote = import ./home; - }; - modules = [ overlays-module my-nixpkgs.nixosModules.personal ./nixos ]; + specialArgs = { inherit nixos-hardware home-manager homeModules; }; + modules = nixosModules; }; + homeConfigurations.qaristote = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages."${system}"; - modules = [ overlays-module ./home ]; + modules = homeModules; }; }; } -- cgit v1.2.3 From b0214d50e9a728d77d98d791e92dfe3747f27e23 Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Tue, 21 Feb 2023 22:34:46 +0100 Subject: factor out common home-manager configuration --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 4bc26a3..9b97a1a 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ overlays-module = { ... }: { nixpkgs.overlays = [ my-nixpkgs.overlays.personal ]; }; - homeModules = [ overlays-module my-nixpkgs.homeModules.personal ./home ]; + homeModules = [ my-nixpkgs.homeModules.personal ./home ]; nixosModules = [ overlays-module my-nixpkgs.nixosModules.personal ./nixos ]; in { -- cgit v1.2.3