From cd44fa3afcc5a3837ca3012d58c23f5a96c1f01d Mon Sep 17 00:00:00 2001 From: Lilith Date: Thu, 26 Jun 2025 16:58:58 +0200 Subject: [PATCH] poetrade --- home/lilith/hyprland/default.nix | 7 +------ home/lilith/hyprland/settings.nix | 19 +++++++++++++++++++ home/lilith/input.nix | 30 ++++++++++++++++++++++++------ system/core/default.nix | 1 + system/core/input.nix | 4 ++++ system/optional/stylix.nix | 19 ++++++++----------- 6 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 home/lilith/hyprland/settings.nix create mode 100644 system/core/input.nix diff --git a/home/lilith/hyprland/default.nix b/home/lilith/hyprland/default.nix index d392f003..5c26751d 100644 --- a/home/lilith/hyprland/default.nix +++ b/home/lilith/hyprland/default.nix @@ -5,6 +5,7 @@ ./hyprpaper.nix ./hyprlock.nix ./hyprgrass.nix + ./settings.nix # ./utils.nix ]; @@ -37,12 +38,6 @@ exec = [ "[workspace special:keepass silent] keepassxc" ]; - windowrule = [ - "workspace special:keepass,class:org.keepassxc.KeePassXC,title:^(.*)(KeePassXC)(.*)$" - "workspace unset,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC" - "noanim, class:^ueberzugpp_(.*)$" - ]; - workspace = [ "special:keepass,gapsout:45" "special:magic,gapsout:45" diff --git a/home/lilith/hyprland/settings.nix b/home/lilith/hyprland/settings.nix new file mode 100644 index 00000000..1b7ced8e --- /dev/null +++ b/home/lilith/hyprland/settings.nix @@ -0,0 +1,19 @@ +{ ... }: +{ + wayland.windowManager.hyprland.settings.windowrule = [ + "workspace special:keepass,class:org.keepassxc.KeePassXC,title:^(.*)(KeePassXC)(.*)$" + "workspace unset,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC" + "noanim, class:^ueberzugpp_(.*)$" + + "float,^(awakened-poe-trade)$" + "noblur,^(awakened-poe-trade)$" + "noborder,^(awakened-poe-trade)$" + + "stayfocused,^(steam_app_238960)$" + ]; + wayland.windowManager.hyprland.settings.bind = [ + "SHIFT,Space,pass,^(awakened-poe-trade)$" + "CTRL,D,pass,^(awakened-poe-trade)$" + "CTRL ALT,D,pass,^(awakened-poe-trade)$" + ]; +} diff --git a/home/lilith/input.nix b/home/lilith/input.nix index a30dd557..471812f7 100644 --- a/home/lilith/input.nix +++ b/home/lilith/input.nix @@ -1,11 +1,29 @@ { pkgs, ... }: { + home.packages = with pkgs; [ piper ]; + i18n.inputMethod = { - enabled = "fcitx5"; - fcitx5.addons = with pkgs; [ - fcitx5-gtk - fcitx5-chinese-addons - fcitx5-nord - ]; + enable = true; + type = "fcitx5"; + fcitx5 = { + addons = with pkgs; [ + fcitx5-gtk + fcitx5-chinese-addons + fcitx5-nord + ]; + ignoreUserConfig = true; + settings = { + inputMethod = { + GroupOrder."0" = "Default"; + "Groups/0" = { + Name = "Default"; + "Default Layout" = "us"; + DefaultIM = "pinyin"; + }; + "Groups/0/Items/0".Name = "keyboard-us"; + "Groups/0/Items/1".Name = "pinyin"; + }; + }; + }; }; } diff --git a/system/core/default.nix b/system/core/default.nix index 30977e57..6ba79ddf 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -17,6 +17,7 @@ ./power.nix ./users.nix ./zsh.nix + ./input.nix ./virtualization.nix ]; diff --git a/system/core/input.nix b/system/core/input.nix new file mode 100644 index 00000000..2c5378c2 --- /dev/null +++ b/system/core/input.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + services.ratbagd.enable = true; +} diff --git a/system/optional/stylix.nix b/system/optional/stylix.nix index d274e384..883063fd 100644 --- a/system/optional/stylix.nix +++ b/system/optional/stylix.nix @@ -23,16 +23,6 @@ }; fonts = rec { - # serif = { - # package = pkgs.dejavu_fonts; - # name = "DejaVu Serif"; - # }; - - # sansSerif = { - # package = pkgs.dejavu_fonts; - # name = "DejaVu Sans"; - # }; - serif = monospace; sansSerif = monospace; @@ -42,7 +32,7 @@ }; emoji = { - package = pkgs.twitter-color-emoji; + package = pkgs.twemoji-color-font; name = "Twemoji"; }; @@ -52,6 +42,7 @@ popups = 12; terminal = 14; }; + }; cursor = { @@ -60,5 +51,11 @@ size = 10; }; }; + + fonts.packages = with pkgs; [ + nerd-fonts.jetbrains-mono + source-han-sans + twemoji-color-font + ]; }; }