diff --git a/modules/hosts/nixberry/default.nix b/modules/hosts/nixberry/default.nix index 8f62583..47ff3e5 100644 --- a/modules/hosts/nixberry/default.nix +++ b/modules/hosts/nixberry/default.nix @@ -26,7 +26,7 @@ in }; # hack, homemanager needs it - programs.dconf.enable = true; + environment.systemPackages = [ pkgs.dconf ]; # build failure programs.nix-ld.enable = false; diff --git a/modules/hosts/wsl/default.nix b/modules/hosts/wsl/default.nix index e036348..1a2f54d 100644 --- a/modules/hosts/wsl/default.nix +++ b/modules/hosts/wsl/default.nix @@ -1,50 +1,11 @@ -topLevel: { - flake.modules.nixos."hosts/wsl" = - { - inputs, - lib, - ... - }: - { - nixpkgs = { - config.allowUnfree = true; - hostPlatform = lib.systems.elaborate "x86_64-linux"; - }; - programs.dconf.enable = true; +{ + config, + ... +}: +let +in +{ + flake.modules.nixos."hosts/wsl" = { - imports = - with topLevel.config.flake.modules.nixos; - [ - inputs.nixos-wsl.nixosModules.default - - base - cholli - ] - - ++ [ - { - home-manager.users.cholli = { - imports = with topLevel.config.flake.modules.homeManager; [ - inputs.catppuccin.homeModules.catppuccin - - # components - base - - # Activate all user based config - cholli - ]; - }; - } - ]; - wsl = { - enable = true; - defaultUser = topLevel.config.flake.meta.users.cholli.username; - - usbip = { - enable = true; - autoAttach = [ "3-1" ]; - }; - }; - - }; + }; }