Merge branch 'master' of pi1.odie.intranet:odie/nixos-combined-flake into develop

This commit is contained in:
Patrick Neff 2024-04-13 23:02:12 +02:00
commit 6227d2f202
3 changed files with 18 additions and 16 deletions

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}