summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Stachurski <j.stachurski@student.utwente.nl>2025-05-02 12:09:54 +0200
committerJakub Stachurski <j.stachurski@student.utwente.nl>2025-05-02 12:09:54 +0200
commit9b4310a1c94b4f1bb21274ca04a010781345a754 (patch)
treef82bc174689e73a847b251c1e6befaed2891700c
parentd87e75acd2db95014819900b1d903108c8f57a0c (diff)
some hyprland stuff
-rw-r--r--home-manager/home/session_vars.nix6
-rw-r--r--home-manager/modules/apps/desktop/hyprland.nix5
-rw-r--r--nixos/desktop/default.nix12
3 files changed, 16 insertions, 7 deletions
diff --git a/home-manager/home/session_vars.nix b/home-manager/home/session_vars.nix
index 3ba8a7d..27ef47b 100644
--- a/home-manager/home/session_vars.nix
+++ b/home-manager/home/session_vars.nix
@@ -2,14 +2,8 @@
{
home.sessionVariables = {
EDITOR = "nvim";
- #XDG_SESSION_TYPE = "wayland";
- #GDK_BACKEND = "wayland";
GTK_USE_PORTAL = "1";
- #QT_QPA_PLATFORM = "wayland";
QT_STYLE_OVERRIDE = "kvantum";
QT_QPA_PLATFORM_THEME = "kvantum";
- #QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
- #QT_AUTO_SCREEN_SCALE_FACTOR = "1";
- #MOZ_ENABLE_WAYLAND = "1";
};
}
diff --git a/home-manager/modules/apps/desktop/hyprland.nix b/home-manager/modules/apps/desktop/hyprland.nix
index c2a794e..243f999 100644
--- a/home-manager/modules/apps/desktop/hyprland.nix
+++ b/home-manager/modules/apps/desktop/hyprland.nix
@@ -13,7 +13,9 @@ with lib;
wl-clipboard
];
- # TODO: Place environment variables in ./config/uwsm
+
+ # Environment variables for hyprland.
+ # This can be used to configure wayland/hyprland-specific things
home.file.".config/uwsm/env-hyprland".text = ''
export XDG_SESSION_TYPE=wayland
export GDK_BACKEND=wayland
@@ -24,6 +26,7 @@ with lib;
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
export QT_AUTO_SCREEN_SCALE_FACTOR=1
export MOZ_ENABLE_WAYLAND=1
+ export -n GTK_IM_MODULE
'';
# Hyprland
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
index f54acb8..13d3598 100644
--- a/nixos/desktop/default.nix
+++ b/nixos/desktop/default.nix
@@ -47,6 +47,18 @@
};
};
+ i18n.inputMethod = {
+ type = "fcitx5";
+ enable = true;
+ fcitx5.addons = with pkgs; [
+ fcitx5-gtk
+ fcitx5-lua
+ fcitx5-mozc
+ catppuccin-fcitx5
+ fcitx5-table-other
+ ];
+ };
+
fonts.packages = with pkgs; [
noto-fonts
font-awesome