From 2d7d419cdd019d52ed8950d60ab728e5eb0fb6bd Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 20:27:22 -0600 Subject: added desktop config to flake.nix --- flake.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 50a89d7..8c468c3 100644 --- a/flake.nix +++ b/flake.nix @@ -57,6 +57,32 @@ # nix.registry.nixpkgs.flake = nixpkgs; ]; }; + + khad = nixpkgs.lib.nixosSystem { + modules [ + ./machines/khad/configuration.nix + + ./machines/zenbook/hardware-configuration.nix + + ./modules/user-profiles/defin.nix + + home-manager.nixosModules.home-manager { + home-manager.useGlobalpkgs = true; + home-manager.useUserPackages = true; + home-manager.users.defin = import ./home-manager/home.nix; + } + .modules/hyprland.nix + + .modules/bluetooth.nix + .modules/environment.nix + .modules/kde-connect.nix + .modules/nix-common.nix + .modules/services.nix + .modules/steam.nix + .modules/sway.nix + .modules/system-packages.nix + ]; + }; }; }; } -- cgit v1.2.3 From bd8b7075dbc8e0c562d981cfdc47c016b2b6c87f Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 20:34:32 -0600 Subject: fixed typo --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 8c468c3..7716746 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ }; khad = nixpkgs.lib.nixosSystem { - modules [ + modules = [ ./machines/khad/configuration.nix ./machines/zenbook/hardware-configuration.nix -- cgit v1.2.3 From a3381e46f54ab0af5e2648354e03556c134818d8 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 20:36:59 -0600 Subject: fixed flake typo --- flake.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 7716746..a9571bb 100644 --- a/flake.nix +++ b/flake.nix @@ -71,16 +71,16 @@ home-manager.useUserPackages = true; home-manager.users.defin = import ./home-manager/home.nix; } - .modules/hyprland.nix - - .modules/bluetooth.nix - .modules/environment.nix - .modules/kde-connect.nix - .modules/nix-common.nix - .modules/services.nix - .modules/steam.nix - .modules/sway.nix - .modules/system-packages.nix + ./modules/hyprland.nix + + ./modules/bluetooth.nix + ./modules/environment.nix + ./modules/kde-connect.nix + ./modules/nix-common.nix + ./modules/services.nix + ./modules/steam.nix + ./modules/sway.nix + ./modules/system-packages.nix ]; }; }; -- cgit v1.2.3 From 2bbe5418e42ea40df2e0bfb90d5a1a69bd9f4d86 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 20:38:12 -0600 Subject: yet another typo --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index a9571bb..1514b6c 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ ./modules/user-profiles/defin.nix home-manager.nixosModules.home-manager { - home-manager.useGlobalpkgs = true; + home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.defin = import ./home-manager/home.nix; } -- cgit v1.2.3 From 8cafe6370120870f9b5965d42ff4ae29550ad759 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 20:41:44 -0600 Subject: fixed wrong hardware-config --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 1514b6c..7ea682f 100644 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ modules = [ ./machines/khad/configuration.nix - ./machines/zenbook/hardware-configuration.nix + ./machines/khad/hardware-configuration.nix ./modules/user-profiles/defin.nix -- cgit v1.2.3 From 29eb8d377940bd5ad78e77a1106b0d0e1a021391 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 21:47:50 -0600 Subject: added root user config to flake --- flake.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 7ea682f..4a10d14 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,7 @@ # Default users ./modules/user-profiles/defin.nix + ./modules/user-profiles/root.nix home-manager.nixosModules.home-manager { -- cgit v1.2.3