diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 1515c29..d0e7d87 100644 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -77,6 +77,14 @@ ]; home-manager.users.djai.xdg.desktopEntries = { + opencloud = { + name = "opencloud desktop "; + exec = ''QT_STLE_OVERRIDE="" opencloud --showsettings''; + mimeType = [ "application/vnd.opencloud" ]; + icon = "opencloud"; + settings.StartupWMClass = "opencloud"; + }; + feishin = { name = "Feishin"; exec = "env XDG_CURRENT_DESKTOP=GNOME feishin"; @@ -91,7 +99,7 @@ exec = "signal-desktop --disable-features=AudioServiceOutOfProcess -- %u"; terminal = false; categories = [ "InstantMessaging" ]; - settings = { StartupWMClass = "signal";}; + settings.StartupWMClass = "signal"; mimeType = [ "x-scheme-handler/sgnl" "x-scheme-handler/signalcaptcha" diff --git a/modules/base.nix b/modules/base.nix index 3133913..de3940d 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -87,6 +87,7 @@ ''; sessionVariables = { # TODO: add rest of .config/uwms/env.bck here + XCURSOR_SIZE=24; NEWT_COLORS_FILE = "$HOME/.newtColours"; BROWSER = "librewolf"; EDITOR = "nvim"; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index fa3647b..ff44bd3 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ lib, pkgs, inputs, ... }: { imports = [ @@ -90,24 +90,17 @@ }; }; - # TODO: check termfilechooser still works; had to disable this becos of hyprland - # portal = { - # enable = true; - # config = { - # common.default = [ "gtk" ]; - # hyprland = { - # default = [ - # "gtk" - # "hyprland" - # ]; - # org.freedesktop.impl.portal.FileChooser = [ "termfilechooser" ]; - # }; - # }; - # extraPortals = with pkgs; [ - # xdg-desktop-portal-gtk - # xdg-desktop-portal-termfilechooser - # ]; - # }; + portal = { + enable = true; + config.hyprland = { + default = [ "hyprland" ]; + "org.freedesktop.impl.portal.FileChooser" = lib.mkForce [ "termfilechooser" ]; + }; + extraPortals = with pkgs; lib.mkForce [ + xdg-desktop-portal-hyprland + xdg-desktop-portal-termfilechooser + ]; + }; }; @@ -115,7 +108,7 @@ catppuccin = { cursors = { enable = true; - accent = "mauve"; # TODO: should maybe be dark? unsure + accent = "dark"; }; qt5ct.enable = true; }; diff --git a/modules/desktop/hypr.nix b/modules/desktop/hypr.nix index ded07da..012ae77 100644 --- a/modules/desktop/hypr.nix +++ b/modules/desktop/hypr.nix @@ -53,19 +53,17 @@ in hyprlandPlugins.hypr-darkwindow ]; - portalPackage = null; + # portalPackage = null; systemd.enable = false; settings = { - on = [ #TODO: set up exec oncess + on = [ (hyprLib.on-signal "hyprland.start" [ - "uwsm app -- opencloud" + ''uwsm app -- QT_STYLE_OVERRIDE="" opencloud'' "uwsm app -- openrgb --noautoconnect -p aroace.orp" "uwsm app -- kitty --class scratchme -d /home/djai/Documents/diary" "uwsm app -- nohup flameshot" - # these should be done thru systemd already - # hl.exec_cmd("hyprpm reload") - # hl.exec_cmd("hyprctl setcursor Catppuccin-Macchiato-Dark-Cursors 24") + "hyprctl setcursor Catppuccin-Macchiato-Dark-Cursors 24" # really shouldnt be in here but we get veyr large cursors if we dont ]) ];