diff options
| -rw-r--r-- | home-modules/desktop/hyprland.nix | 2 | ||||
| -rw-r--r-- | home-modules/desktop/wayland/default.nix | 9 | ||||
| -rw-r--r-- | modules/default.nix | 16 | ||||
| -rw-r--r-- | modules/desktop/wayland.nix | 8 | ||||
| -rw-r--r-- | modules/desktop/wms/hyprland.nix | 2 |
5 files changed, 20 insertions, 17 deletions
diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index f714650..1fdc801 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -13,8 +13,6 @@ with lib; wofi hyprshot networkmanagerapplet - xdg-desktop-portal-gnome - xdg-desktop-portal-hyprland wl-clipboard brightnessctl ]; diff --git a/home-modules/desktop/wayland/default.nix b/home-modules/desktop/wayland/default.nix index 30bf34d..87ab13b 100644 --- a/home-modules/desktop/wayland/default.nix +++ b/home-modules/desktop/wayland/default.nix @@ -1,7 +1,14 @@ -{ ... }: +{ pkgs, ... }: { imports = [ ./waybar.nix ./mako.nix ]; + xdg.portal = { + enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + ]; + }; + } diff --git a/modules/default.nix b/modules/default.nix index c2cb665..774b40d 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -53,10 +53,16 @@ }; }; - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; + # Because NH is enabled, this needs to be disabled. + # nix.gc = { + # automatic = true; + # dates = "weekly"; + # options = "--delete-older-than 30d"; + # }; + zramSwap = { + enable = true; + algorithm = "lz4"; + memoryPercent = 50; }; systemd.services.nix-daemon.serviceConfig = { MemoryAccounting = true; @@ -82,7 +88,7 @@ bashInteractive coreutils - utillinux + util-linux iproute2 iputils pciutils diff --git a/modules/desktop/wayland.nix b/modules/desktop/wayland.nix index 9197a4e..457a7f0 100644 --- a/modules/desktop/wayland.nix +++ b/modules/desktop/wayland.nix @@ -8,12 +8,6 @@ options.addons.desktop.wayland.enable = lib.mkEnableOption "Enable wayland"; config = lib.mkIf config.addons.desktop.wayland.enable { services.displayManager.sddm.wayland.enable = true; - - xdg.portal = { - enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - ]; - }; + security.rtkit.enable = true; }; } diff --git a/modules/desktop/wms/hyprland.nix b/modules/desktop/wms/hyprland.nix index b35881c..d339f98 100644 --- a/modules/desktop/wms/hyprland.nix +++ b/modules/desktop/wms/hyprland.nix @@ -42,8 +42,6 @@ in waybar waybar-mpris mako - xdg-desktop-portal-gnome - xdg-desktop-portal-hyprland wl-clipboard hyprland-qt-support ]; |