From 024b7a90a30aa645dd5910cd95ab8d1e7682ef99 Mon Sep 17 00:00:00 2001 From: polwex Date: Sun, 26 Oct 2025 01:03:18 +0700 Subject: fcitx ded --- flake.lock | 53 +++++++++++++++++++++++++++++--------------- flake.nix | 1 + hosts/local/gui.nix | 32 ++++++++++++++------------ hosts/local/i3.nix | 13 ----------- hosts/local/niri.nix | 26 ++-------------------- hosts/local/p16/keyboard.nix | 20 ----------------- hosts/local/s15/keyboard.nix | 20 ----------------- hosts/local/sway.nix | 20 +---------------- hosts/pkgs.nix | 1 + 9 files changed, 58 insertions(+), 128 deletions(-) diff --git a/flake.lock b/flake.lock index 63eaa3d..b6feb97 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1761401328, - "narHash": "sha256-irCSzTFtjQtibLRRvSWCymAf6cr7AoGJAR6oTxBYF9w=", + "lastModified": 1761410608, + "narHash": "sha256-I5qm5PBxQTRJHUvuX7N9KPA2qsbZhtvOKJcCj6jl0bo=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "607b5320fd04056e4d5bcd2632b1873731a58fd1", + "rev": "7a45f370b54b9a01eea5a80e2ef8e96b9380cc83", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1761397800, - "narHash": "sha256-z5jLUZ2dcicgRkwaDPWS0aXlqcAAjSSmEg9ujGFWoM0=", + "lastModified": 1761413329, + "narHash": "sha256-HGLw+5QkV0nCHUIJlwMMBr5zTUiQM47roqIjXgvGkH0=", "owner": "AvengeMedia", "repo": "danklinux", - "rev": "f759ffbcded5c524bce4a1b3441a337174161bf0", + "rev": "3c468ff5332748aa84852a05bdabcf703d956f7c", "type": "github" }, "original": { @@ -495,7 +495,7 @@ ] }, "locked": { - "lastModified": 1753566031, + "lastModified": 1761115047, "narHash": "sha256-ypEepJDaIjQx2Ou813++x5c1Kt11DR8vAWITBlmlgKU=", "path": "/home/y/nixconf/derivations/gemini", "type": "path" @@ -877,11 +877,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761348525, - "narHash": "sha256-V738NRqRVHCug0rPbYmXFAZsQnqmQAurDzu54WY/YIk=", + "lastModified": 1761413535, + "narHash": "sha256-bLkDHmHCYn9hWZJXXRAYCnB1OI7Garoe19571V7bPsU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "34e1de2311cda824f7685f2e2cd9453263ef75d5", + "rev": "0ec38cd3276971c99289d80b1215aaf7ada65573", "type": "github" }, "original": { @@ -1533,17 +1533,33 @@ "type": "github" } }, + "nixstaging": { + "locked": { + "lastModified": 1761402570, + "narHash": "sha256-1VB+TyMQwtW4I3v6Dc1tt9xFpSJ81A1rAXsbQvSSnmQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7cd973a281b4b2cfe96f746f7316fba57c62d555", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "staging", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts_5", "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1761400656, - "narHash": "sha256-RU9aNWVM233G5ViVQvGdwjKW48ne9Sf/kVl+bpUSwgI=", + "lastModified": 1761411824, + "narHash": "sha256-pcIB+NirMkYHe6zqC0zYMqZO3wyGdPoej4IMiERHSYU=", "owner": "nix-community", "repo": "NUR", - "rev": "7229d59faeaa6f005719c742068ce12ffdaa5ee6", + "rev": "8dec4c083a4653a82a1c05ba981301fe1aa426b0", "type": "github" }, "original": { @@ -1680,6 +1696,7 @@ "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unfree": "nixpkgs-unfree", "nixpkgs-wayland": "nixpkgs-wayland", + "nixstaging": "nixstaging", "nur": "nur", "openai-codex": "openai-codex", "polybar-themes": "polybar-themes", @@ -1851,7 +1868,7 @@ ] }, "locked": { - "lastModified": 1740186345, + "lastModified": 1761115047, "narHash": "sha256-Qox5x+FI4OhCs/7T/v4hZlR9Rm7ZfpXP7ISy+OrHCyw=", "path": "/home/y/nixconf/derivations/windsurf", "type": "path" @@ -1896,11 +1913,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761345612, - "narHash": "sha256-ph61jGpaonY04jdfQxkBYRgw7ptlNHo7K0W+5kCV/+0=", + "lastModified": 1761407446, + "narHash": "sha256-Z2IB6ni6iPtv2Bon/bkru9R96UzBR3s8HY+tcDuCH74=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "04816e2a3634087db3de39043fcc9db2afcb0c44", + "rev": "52cc06e6c63674fc997fd61d27aaccfce2da5b5d", "type": "github" }, "original": { @@ -1916,7 +1933,7 @@ ] }, "locked": { - "lastModified": 1740469068, + "lastModified": 1761115047, "narHash": "sha256-uoitiN9zrv9QaGf8mKIXhRxXtsNi6MupZVK+Zy3jOoA=", "path": "/home/y/nixconf/derivations/yek", "type": "path" diff --git a/flake.nix b/flake.nix index 1a1a8bd..d89ff21 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ description = "Master flake"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixstaging.url = "github:nixos/nixpkgs/staging"; nixpkgs-old.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix index 1532013..de16ac8 100644 --- a/hosts/local/gui.nix +++ b/hosts/local/gui.nix @@ -49,7 +49,7 @@ # chat signal-desktop telegram-desktop - electrum + # electrum # xdg whatever bs glib # gio desktop-file-utils @@ -58,19 +58,23 @@ gparted ]; - i18n.inputMethod = { - enable = true; - type = "fcitx5"; - fcitx5.addons = with pkgs; [ - fcitx5-mozc - # mozc-ut is better, wat do - fcitx5-gtk - libsForQt5.fcitx5-qt - fcitx5-lua - fcitx5-configtool - fcitx5-rime - ]; - }; + # i18n.inputMethod = { + # enable = true; + # type = "fcitx5"; + # fcitx5.addons = with pkgs; [ + # fcitx5-mozc + # # mozc-ut is better, wat do + # # fcitx5-gtk + # # libsForQt5.fcitx5-qt + # fcitx5-lua + # fcitx5-configtool + # fcitx5-rime + # ]; + # }; + # + # https://github.com/NixOS/nixpkgs/issues/454887 + # # + # environment.variables = { GTK_IM_MODULE = "fcitx"; QT_IM_MODULE = "fcitx"; diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix index da9d503..da5dcaf 100644 --- a/hosts/local/i3.nix +++ b/hosts/local/i3.nix @@ -38,11 +38,6 @@ in { defaultSession = "none+i3"; }; - environment.sessionVariables = { - GTK_IM_MODULE = "fcitx"; - QT_IM_MODULE = "fcitx"; - XMODIFIERS = "@im=fcitx"; - }; # gnome stuff services.gvfs.enable = true; programs.dconf.enable = true; @@ -76,14 +71,6 @@ in { ]; services.flatpak.enable = true; - # cjk input - # i18n = { - # inputMethod = { - # type = "fcitx5"; - # fcitx5.addons = with pkgs; [fcitx5-rime fcitx5-mozc]; - # }; - # }; - fonts = { enableDefaultPackages = true; fontconfig = { diff --git a/hosts/local/niri.nix b/hosts/local/niri.nix index be92df0..ee5fae2 100644 --- a/hosts/local/niri.nix +++ b/hosts/local/niri.nix @@ -35,14 +35,9 @@ _JAVA_AWT_WM_NONREPARENTING = "1"; MOZ_ENABLE_WAYLAND = "1"; - # GTK_IM_MODULE = "fcitx"; - # QT_IM_MODULE = "fcitx"; - # SDL_IM_MODULE = "fcitx"; - XDG_CURRENT_DESKTOP = "sway"; GDK_BACKEND = "wayland"; XDG_SESSION_TYPE = "wayland"; - XMODIFIERS = "@im=fcitx"; }; xdg.portal = { @@ -146,25 +141,6 @@ ]; services.speechd.enable = true; - # cjk input - - i18n.inputMethod = { - type = "fcitx5"; - enable = true; - fcitx5 = { - # enabled = true; - addons = with pkgs; [ - rime-data - fcitx5-rime - fcitx5-mozc - fcitx5-configtool - fcitx5-chinese-addons - fcitx5-gtk - libsForQt5.fcitx5-qt - ]; - waylandFrontend = true; - }; - }; services.xserver.desktopManager.runXdgAutostartIfNone = true; fonts = { @@ -226,6 +202,8 @@ jack.enable = true; }; + i18n.inputMethod.fcitx5.waylandFrontend = true; + # pipewire requires these off # sound.enable = true; # hardware.pulseaudio.enable = true; diff --git a/hosts/local/p16/keyboard.nix b/hosts/local/p16/keyboard.nix index f6cfa8c..d335f22 100644 --- a/hosts/local/p16/keyboard.nix +++ b/hosts/local/p16/keyboard.nix @@ -4,26 +4,6 @@ HandlePowerKey = "ignore"; }; - # config file keeps getting rewritten but I don't know by who - # i18n.inputMethod = { - # enable = true; - # type = "fcitx5"; - # fcitx5.addons = with pkgs; [ - # fcitx5-mozc - # # mozc-ut is better, wat do - # fcitx5-gtk - # libsForQt5.fcitx5-qt - # fcitx5-lua - # fcitx5-configtool - # fcitx5-rime - # ]; - # }; - environment.variables = { - QT_IM_MODULE = "fcitx"; - XMODIFIERS = "@im=fcitx"; - FCITX_SOCKET = "default"; - }; - #kmonad services.kmonad = { enable = true; diff --git a/hosts/local/s15/keyboard.nix b/hosts/local/s15/keyboard.nix index 88f8545..19b05be 100644 --- a/hosts/local/s15/keyboard.nix +++ b/hosts/local/s15/keyboard.nix @@ -9,26 +9,6 @@ HandlePowerKey=ignore ''; - # config file keeps getting rewritten but I don't know by who - # i18n.inputMethod = { - # enabled = "fcitx5"; - # fcitx5.addons = with pkgs; [ - # fcitx5-mozc - # # mozc-ut is better, wat do - # fcitx5-gtk - # libsForQt5.fcitx5-qt - # fcitx5-lua - # fcitx5-configtool - # fcitx5-rime - # ]; - # }; - environment.variables = { - GTK_IM_MODULE = "fcitx"; - QT_IM_MODULE = "fcitx"; - XMODIFIERS = "@im=fcitx"; - FCITX_SOCKET = "default"; - }; - #kmonad services.kmonad = lib.mkIf (pkgs.system == "x86_64-linux") { enable = true; diff --git a/hosts/local/sway.nix b/hosts/local/sway.nix index 0fb8020..30834c3 100644 --- a/hosts/local/sway.nix +++ b/hosts/local/sway.nix @@ -69,14 +69,9 @@ _JAVA_AWT_WM_NONREPARENTING = "1"; MOZ_ENABLE_WAYLAND = "1"; - # GTK_IM_MODULE = "fcitx"; - # QT_IM_MODULE = "fcitx"; - # SDL_IM_MODULE = "fcitx"; - XDG_CURRENT_DESKTOP = "sway"; GDK_BACKEND = "wayland"; XDG_SESSION_TYPE = "wayland"; - XMODIFIERS = "@im=fcitx"; }; environment.systemPackages = with pkgs; [ @@ -113,20 +108,7 @@ # cjk input i18n.inputMethod = { - type = "fcitx5"; - enable = true; - fcitx5 = { - # enabled = true; - addons = with pkgs; [ - rime-data - fcitx5-rime - fcitx5-mozc - fcitx5-configtool - fcitx5-chinese-addons - fcitx5-gtk - ]; - waylandFrontend = true; - }; + waylandFrontend = true; }; services.xserver.desktopManager.runXdgAutostartIfNone = true; diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix index 17a90b9..22ca094 100644 --- a/hosts/pkgs.nix +++ b/hosts/pkgs.nix @@ -16,6 +16,7 @@ autossh sshfs # terminal basics + lshw htop btop -- cgit v1.2.3