diff --git a/home/lilith/hyprland/default.nix b/home/lilith/hyprland/default.nix index 5c26751d..d392f003 100644 --- a/home/lilith/hyprland/default.nix +++ b/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" diff --git a/home/lilith/hyprland/settings.nix b/home/lilith/hyprland/settings.nix deleted file mode 100644 index 70e17740..00000000 --- a/home/lilith/hyprland/settings.nix +++ /dev/null @@ -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" - ]; -} diff --git a/home/lilith/input.nix b/home/lilith/input.nix index 471812f7..a30dd557 100644 --- a/home/lilith/input.nix +++ b/home/lilith/input.nix @@ -1,29 +1,11 @@ { pkgs, ... }: { - home.packages = with pkgs; [ piper ]; - i18n.inputMethod = { - 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"; - }; - }; - }; + enabled = "fcitx5"; + fcitx5.addons = with pkgs; [ + fcitx5-gtk + fcitx5-chinese-addons + fcitx5-nord + ]; }; } diff --git a/system/core/default.nix b/system/core/default.nix index 6ba79ddf..30977e57 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -17,7 +17,6 @@ ./power.nix ./users.nix ./zsh.nix - ./input.nix ./virtualization.nix ]; diff --git a/system/core/input.nix b/system/core/input.nix deleted file mode 100644 index 2c5378c2..00000000 --- a/system/core/input.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - services.ratbagd.enable = true; -} diff --git a/system/optional/stylix.nix b/system/optional/stylix.nix index 883063fd..d274e384 100644 --- a/system/optional/stylix.nix +++ b/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 - ]; }; }