From 4321a57d7a99987d9a7d42a36f861d3e94156f94 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Mon, 8 Apr 2024 19:39:01 +0200 Subject: [PATCH] fix paths --- profiles/nixos/pi0/configuration.nix | 6 +++--- profiles/nixos/vm/configuration.nix | 14 +++++++------- profiles/nixos/wsl-dev/configuration.nix | 14 ++++++++------ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/profiles/nixos/pi0/configuration.nix b/profiles/nixos/pi0/configuration.nix index ff755c8..5fff86b 100644 --- a/profiles/nixos/pi0/configuration.nix +++ b/profiles/nixos/pi0/configuration.nix @@ -7,7 +7,7 @@ }: { imports = [ ./hardware-configuration.nix - ../../modules/nixos/base + ../../../modules/nixos/base ]; networking = { @@ -17,8 +17,8 @@ home-manager = flakeLib.mkHomeNixosModule { inherit inputs outputs vars flakeLib; modules = [ - ../../modules/home-manager/base.nix - ../../modules/home-manager/shell.nix + ../../../modules/home-manager/base.nix + ../../../modules/home-manager/shell.nix { services.picom.enable = false; } diff --git a/profiles/nixos/vm/configuration.nix b/profiles/nixos/vm/configuration.nix index dc61ca4..495c928 100644 --- a/profiles/nixos/vm/configuration.nix +++ b/profiles/nixos/vm/configuration.nix @@ -8,18 +8,18 @@ imports = [ inputs.home-manager.nixosModules.home-manager ./hardware-configuration.nix - ../../modules/nixos/base - ../../modules/nixos/desktop - ../../modules/nixos/wsl + ../../../modules/nixos/base + ../../../modules/nixos/desktop + ../../../modules/nixos/wsl ]; home-manager = flakeLib.mkHomeNixosModule { inherit inputs outputs vars flakeLib; imports = [ - ../../modules/home-manager/base.nix - ../../modules/home-manager/desktop.nix - ../../modules/home-manager/dev.nix - ../../modules/home-manager/shell.nix + ../../../modules/home-manager/base.nix + ../../../modules/home-manager/desktop.nix + ../../../modules/home-manager/dev.nix + ../../../modules/home-manager/shell.nix { services.picom.enable = false; } diff --git a/profiles/nixos/wsl-dev/configuration.nix b/profiles/nixos/wsl-dev/configuration.nix index 5817133..1b2f975 100644 --- a/profiles/nixos/wsl-dev/configuration.nix +++ b/profiles/nixos/wsl-dev/configuration.nix @@ -6,11 +6,13 @@ ... }: { imports = [ - ../../modules/nixos/base - ../../modules/nixos/wsl + inputs.home-manager.nixosModules.home-manager + ../../../modules/nixos/base + ../../../modules/nixos/wsl ]; wsl.enable = true; + boot.loader.systemd-boot.enable = false; networking = { inherit (vars) hostName domain; @@ -18,10 +20,10 @@ home-manager = flakeLib.mkHomeNixosModule { inherit inputs outputs vars flakeLib; - modules = [ - ../../modules/home-manager/base.nix - ../../modules/home-manager/dev.nix - ../../modules/home-manager/shell.nix + imports = [ + ../../../modules/home-manager/base.nix + ../../../modules/home-manager/dev.nix + ../../../modules/home-manager/shell.nix { services.picom.enable = false; }