diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/apps.nix | 18 | ||||
| -rw-r--r-- | modules/display.nix | 55 |
2 files changed, 16 insertions, 57 deletions
diff --git a/modules/apps.nix b/modules/apps.nix index 4dbf343..6856e35 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -20,10 +20,6 @@ libnotify wl-clipboard jdk - waybar - swaynotificationcenter # For notifications - wl-clip-persist # Persist clipboard history after app closes - cliphist # Clipboard history nerd-fonts.jetbrains-mono @@ -54,20 +50,13 @@ gparted gnome-clocks inputs.zen-browser.packages."${system}".twilight - chromium # for firefox/zen issue not rendering emojis properly krita - pipeline + pipeline # Youtube desktop app (flameshot.override { enableWlrSupport = true; }) - qdirstat - wofi + qdirstat # WizTree for linux + kdePackages.ark kdePackages.dolphin eog - kdePackages.ark - kdePackages.xwaylandvideobridge - rose-pine-kvantum - kdePackages.qt5compat - kdePackages.qt6ct - kdePackages.breeze-icons kopia-ui rclone-ui @@ -78,7 +67,6 @@ # Terminal ghostty - kitty # Temp for hyprland oh-my-posh tmux neovim diff --git a/modules/display.nix b/modules/display.nix index 89e62d1..87b183a 100644 --- a/modules/display.nix +++ b/modules/display.nix @@ -1,45 +1,4 @@ -{ pkgs, lib, inputs, ... }: -with lib; let - hyprPluginPkgs = inputs.hyprland-plugins.packages.${pkgs.system}; - hypr-plugin-dir = pkgs.symlinkJoin { - name = "hyrpland-plugins"; - paths = with hyprPluginPkgs; [ - hyprbars - ]; - }; -in { - - programs.hyprland = { - enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - }; - environment.sessionVariables = { - HYPR_PLUGIN_DIR = hypr-plugin-dir; - }; - - xdg.portal = { - enable = true; - xdgOpenUsePortal = true; - - extraPortals = with pkgs; [ - kdePackages.xdg-desktop-portal-kde - xdg-desktop-portal-gtk - xdg-desktop-portal-wlr - ]; - - config = { - hyprland = { - default = [ "hyprland" "gtk" ]; - # "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; - "org.freedesktop.impl.portal.FileChooser" = [ "kde" ]; - }; - }; - }; - - # Optional, hint electron apps to use wayland: - # environment.sessionVariables.NIXOS_OZONE_WL = "1"; +{ pkgs, ... }: { # Enable the KDE Plasma Desktop Environment. services.displayManager.sddm.enable = true; @@ -61,4 +20,16 @@ in { variant = ""; }; + # From when I tried hyprland, might aswell keep this? + xdg.portal = { + enable = true; + xdgOpenUsePortal = true; + + extraPortals = with pkgs; [ + kdePackages.xdg-desktop-portal-kde + xdg-desktop-portal-gtk + xdg-desktop-portal-wlr + ]; + }; + } |