diff --git a/nixos/flake.nix b/nixos/flake.nix index 8eb5abe..1c4e895 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -19,22 +19,31 @@ nixosConfigurations = { wsl = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; modules = [ nixos-wsl.nixosModules.default vscode-server.nixosModules.default - ./configuration.nix + ./hosts/wsl.nix # previously configuration.nix + ./tmux.nix + ./neovim.nix + ./fish.nix # home-manager.nixosModules.default ]; }; macbookair = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; modules = [ nixos-wsl.nixosModules.default vscode-server.nixosModules.default - ./configuration.nix + # ./hosts/macbookair.nix # previously configuration.nix + ./tmux.nix + ./neovim.nix + ./fish.nix # home-manager.nixosModules.default ]; }; + }; }; } diff --git a/nixos/configuration.nix b/nixos/hosts/wsl.nix similarity index 96% rename from nixos/configuration.nix rename to nixos/hosts/wsl.nix index effed48..4a76710 100644 --- a/nixos/configuration.nix +++ b/nixos/hosts/wsl.nix @@ -8,12 +8,6 @@ { config, lib, pkgs, ... }: { - imports = [ - ./tmux.nix - ./neovim.nix - ./fish.nix - ]; - wsl = { enable = true; defaultUser = "nixos"; @@ -54,7 +48,6 @@ initialPassword = "test"; }; - nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.config.allowUnfree = true; environment.variables = { DBT_USER = "DNTH";