starred/nix-config-ryan4yin
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-04-25 09:28:27 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

feat: cannot use fcitx5-rime in firefox/vscode, revert to hyprland

Browse Source
This commit is contained in:
ryan4yin
2023-05-14 12:02:45 +08:00
parent 47a7828bc7
commit 373348e406
6 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
home/default.nix
View File

@@ -3,8 +3,8 @@
{ {
imports = [ imports = [
# ./hyprland ./hyprland
./i3 # ./i3
./programs ./programs
./rofi ./rofi
./shell ./shell

1
home/hyprland/default.nix
View File

@@ -18,6 +18,7 @@
home.file.".config/hypr/wallpapers/wallpaper.png".source = ../wallpapers/wallpaper.png; home.file.".config/hypr/wallpapers/wallpaper.png".source = ../wallpapers/wallpaper.png;
home.file.".config/fcitx5/profile".source = ./profile; home.file.".config/fcitx5/profile".source = ./profile;
home.file.".config/fcitx5/profile-bak".source = ./profile; # used for backup
# fcitx5 每次切换输入法，就会修改 ~/.config/fcitx5/profile 文件，导致我用 hm 管理的配置被覆盖 # fcitx5 每次切换输入法，就会修改 ~/.config/fcitx5/profile 文件，导致我用 hm 管理的配置被覆盖
# 解决方法是通过如下内置，每次 rebuild 前都先删除下 profile 文件 # 解决方法是通过如下内置，每次 rebuild 前都先删除下 profile 文件
home.activation.removeExistingFcitx5Profile = lib.hm.dag.entryBefore ["checkLinkTargets"] '' home.activation.removeExistingFcitx5Profile = lib.hm.dag.entryBefore ["checkLinkTargets"] ''

5
home/hyprland/hypr-conf/hyprland.conf
View File

@@ -194,7 +194,6 @@ exec-once=~/.config/hypr/scripts/startup
#-- Fcitx5 input method ---------------------------------------------------- #-- Fcitx5 input method ----------------------------------------------------
windowrule=pseudo,fcitx # enable this will make fcitx5 works, but fcitx5-configtool will not work! windowrule=pseudo,fcitx # enable this will make fcitx5 works, but fcitx5-configtool will not work!
exec-once=fcitx5-remote -r exec-once=cp ~/.config/fcitx5/profile-bak ~/.config/fcitx5/profile # restore fcitx5 profile manged by nixos
exec-once=fcitx5 -d --replace exec-once=fcitx5 -d --replace # start fcitx5 daemon
exec-once=fcitx5-remote -r
bind=ALT,E,exec,pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r bind=ALT,E,exec,pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r

2
home/i3/default.nix
View File

@@ -46,7 +46,7 @@
# set cursor size and dpi for 4k monitor # set cursor size and dpi for 4k monitor
xresources.properties = { xresources.properties = {
"Xcursor.size" = 16; "Xcursor.size" = 16;
"Xft.dpi" = 150; "Xft.dpi" = 160;
}; };
} }

30
home/programs/browsers.nix
View File

@@ -10,8 +10,8 @@
}; };
in { in {
home.packages = with pkgs-stable; [ home.packages = with pkgs-stable; [
# firefox-wayland firefox-wayland
firefox # firefox
]; ];
programs = { programs = {
@@ -24,26 +24,26 @@
# https://github.com/swaywm/sway/issues/7562 # https://github.com/swaywm/sway/issues/7562
package = pkgs-stable.google-chrome; package = pkgs-stable.google-chrome;
# commandLineArgs = [ commandLineArgs = [
# # make it use GTK_IM_MODULE if it runs with Gtk4, so fcitx5 can work with it. # make it use GTK_IM_MODULE if it runs with Gtk4, so fcitx5 can work with it.
# # (only supported by chromium/chrome at this time, not electron) # (only supported by chromium/chrome at this time, not electron)
# "--gtk-version=4" "--gtk-version=4"
# # make it use text-input-v1, which works for kwin 5.27 and weston # make it use text-input-v1, which works for kwin 5.27 and weston
# # "--enable-wayland-ime" # "--enable-wayland-ime"
# # enable hardware acceleration - vulkan api # enable hardware acceleration - vulkan api
# # "--enable-features=Vulkan" # "--enable-features=Vulkan"
# ]; ];
}; };
vscode = { vscode = {
enable = true; enable = true;
# use the stable version # use the stable version
package = pkgs-stable.vscode.override { package = pkgs-stable.vscode.override {
# commandLineArgs = [ commandLineArgs = [
# # make it use text-input-v1, which works for kwin 5.27 and weston # make it use text-input-v1, which works for kwin 5.27 and weston
# # "--enable-wayland-ime" # "--enable-wayland-ime"
# ]; ];
}; };
# let vscode sync and update its configuration & extensions across devices, using github account. # let vscode sync and update its configuration & extensions across devices, using github account.

3
hosts/msi-rtx4090/default.nix
View File

@@ -9,7 +9,8 @@
[ [
./cifs-mount.nix ./cifs-mount.nix
../../modules/system.nix ../../modules/system.nix
../../modules/i3.nix ../../modules/hyprland.nix
#../../modules/i3.nix
../../modules/fcitx5 ../../modules/fcitx5
../../modules/nur-packages.nix ../../modules/nur-packages.nix