diff --git a/home/default.nix b/home/default.nix index d85b298..dc6aa00 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,8 +1,4 @@ -{ config, pkgs, ... }: -let - hyprland = config.wayland.windowManager.hyprland.finalPackage; -in -{ +_: { imports = [ ./programs ./services ./wm ./gtk.nix ./persistence.nix ]; home.stateVersion = "23.11"; @@ -21,21 +17,6 @@ in "x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ]; }; }; - portal = { - enable = true; - xdgOpenUsePortal = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - xdg-desktop-portal-gnome - (xdg-desktop-portal-hyprland.override { inherit hyprland; }) - ]; - config = { - common = { - default = [ "gtk" ]; - }; - }; - configPackages = [ hyprland ]; - }; userDirs.enable = true; desktopEntries."nixos-manual" = { diff --git a/home/wm/default.nix b/home/wm/default.nix index 1699b56..07ae198 100644 --- a/home/wm/default.nix +++ b/home/wm/default.nix @@ -1,6 +1,25 @@ -{ ... }: { +{ config, pkgs, ... }: +let + hyprland = config.wayland.windowManager.hyprland.finalPackage; +in +{ imports = [ ./hyprland ./addon ]; + xdg.portal = { + enable = true; + xdgOpenUsePortal = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-gnome + (xdg-desktop-portal-hyprland.override { inherit hyprland; }) + ]; + config = { + common = { + default = [ "gtk" ]; + }; + }; + configPackages = [ hyprland ]; + }; }