From 51ad3c814144ad7771ec0f242f42d2ba866a3b6f Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Wed, 21 Jun 2023 21:23:51 +0100 Subject: [PATCH] Add more configs to flake.nix --- flake.nix | 42 ++++++++++++++++++---------------------- machines/Monarch/tux.nix | 3 ++- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/flake.nix b/flake.nix index fd24a67e..795c3b85 100644 --- a/flake.nix +++ b/flake.nix @@ -15,30 +15,26 @@ nixpkgs, home-manager, }: { - nixosConfigurations.N0245 = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [./configuration.nix]; + nixosConfigurations = { + N0245 = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./configuration.nix + ./machines/N0245/default.nix + home-manager.nixosModules.home-manager + ./machines/N0245/elitherl.nix + ]; + }; }; - homeConfigurations."tux" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages."aarch64-darwin"; - modules = [ - ./home/personal.nix - ./home/gui/wezterm.nix - ({pkgs, ...}: { - home.username = "tux"; - home.homeDirectory = "/Users/tux"; - home.stateVersion = "23.05"; - home.packages = [pkgs.gcc]; - programs.home-manager.enable = true; - programs.zsh = { - sessionVariables.CC = "${pkgs.gcc}/bin/gcc"; - envExtra = '' - eval "$(/opt/homebrew/bin/brew shellenv)" - ''; - }; - services.syncthing.enable = true; - }) - ]; + homeConfigurations = { + "tux" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages."aarch64-darwin"; + modules = [./machines/Monarch/tux.nix]; + }; + "xenia" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages."aarch64-linux"; + modules = [./machines/Northstar/xenia.nix]; + }; }; }; } diff --git a/machines/Monarch/tux.nix b/machines/Monarch/tux.nix index ca4eaf07..d272abe6 100644 --- a/machines/Monarch/tux.nix +++ b/machines/Monarch/tux.nix @@ -4,8 +4,9 @@ # paths it should manage. home.username = "tux"; home.homeDirectory = "/Users/tux"; - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; home.packages = [pkgs.gcc]; + programs.home-manager.enable = true; programs.zsh = { sessionVariables.CC = "${pkgs.gcc}/bin/gcc"; envExtra = ''