home/lilith/hyprland/default.nix

@@ -5,7 +5,6 @@
     ./hyprpaper.nix
     ./hyprlock.nix
     ./hyprgrass.nix
-    ./settings.nix
     #    ./utils.nix
   ];
 
@@ -38,6 +37,12 @@
 
       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"

home/lilith/hyprland/settings.nix

@@ -1,21 +0,0 @@
-{ ... }:
-{
-  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,title:^(awakened-poe-trade)$"
-    "noblur,title:^(awakened-poe-trade)$"
-    "noborder,title:^(awakened-poe-trade)$"
-
-    "stayfocused,title:^(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)$"
-
-    "SUPER, mouse_down, sendshortcut, , mouse:272"
-  ];
-}

home/lilith/input.nix

@@ -1,29 +1,11 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs; [ piper ];
-
   i18n.inputMethod = {
-    enable = true;
+    enabled = "fcitx5";
-    type = "fcitx5";
+    fcitx5.addons = with pkgs; [
-    fcitx5 = {
+      fcitx5-gtk
-      addons = with pkgs; [
+      fcitx5-chinese-addons
-        fcitx5-gtk
+      fcitx5-nord
-        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";
-        };
-      };
-    };
   };
 }

system/core/default.nix

@@ -17,7 +17,6 @@
     ./power.nix
     ./users.nix
     ./zsh.nix
-    ./input.nix
 
     ./virtualization.nix
   ];

system/core/input.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.ratbagd.enable = true;
-}

system/optional/stylix.nix

@@ -23,6 +23,16 @@
       };
 
       fonts = rec {
+        # serif = {
+        #   package = pkgs.dejavu_fonts;
+        #   name = "DejaVu Serif";
+        # };
+
+        # sansSerif = {
+        #   package = pkgs.dejavu_fonts;
+        #   name = "DejaVu Sans";
+        # };
+
         serif = monospace;
         sansSerif = monospace;
 
@@ -32,7 +42,7 @@
         };
 
         emoji = {
-          package = pkgs.twemoji-color-font;
+          package = pkgs.twitter-color-emoji;
           name = "Twemoji";
         };
 
@@ -42,7 +52,6 @@
           popups = 12;
           terminal = 14;
         };
-
       };
 
       cursor = {
@@ -51,11 +60,5 @@
         size = 10;
       };
     };
-
-    fonts.packages = with pkgs; [
-      nerd-fonts.jetbrains-mono
-      source-han-sans
-      twemoji-color-font
-    ];
   };
 }