diff --git a/home/default.nix b/home/default.nix index 188f2a81..11806cbf 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,8 +3,8 @@ { imports = [ - # ./hyprland - ./i3 + ./hyprland + # ./i3 ./programs ./rofi ./shell diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index f8ba2d6b..29ef4a87 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -18,6 +18,7 @@ home.file.".config/hypr/wallpapers/wallpaper.png".source = ../wallpapers/wallpaper.png; home.file.".config/fcitx5/profile".source = ./profile; + home.file.".config/fcitx5/profile-bak".source = ./profile; # used for backup # fcitx5 每次切换输入法,就会修改 ~/.config/fcitx5/profile 文件,导致我用 hm 管理的配置被覆盖 # 解决方法是通过如下内置,每次 rebuild 前都先删除下 profile 文件 home.activation.removeExistingFcitx5Profile = lib.hm.dag.entryBefore ["checkLinkTargets"] '' diff --git a/home/hyprland/hypr-conf/hyprland.conf b/home/hyprland/hypr-conf/hyprland.conf index 9fcc8056..6753eaab 100644 --- a/home/hyprland/hypr-conf/hyprland.conf +++ b/home/hyprland/hypr-conf/hyprland.conf @@ -194,7 +194,6 @@ exec-once=~/.config/hypr/scripts/startup #-- Fcitx5 input method ---------------------------------------------------- windowrule=pseudo,fcitx # enable this will make fcitx5 works, but fcitx5-configtool will not work! -exec-once=fcitx5-remote -r -exec-once=fcitx5 -d --replace -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 # start fcitx5 daemon bind=ALT,E,exec,pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r \ No newline at end of file diff --git a/home/i3/default.nix b/home/i3/default.nix index 2efcb386..c31de5bc 100644 --- a/home/i3/default.nix +++ b/home/i3/default.nix @@ -46,7 +46,7 @@ # set cursor size and dpi for 4k monitor xresources.properties = { "Xcursor.size" = 16; - "Xft.dpi" = 150; + "Xft.dpi" = 160; }; } \ No newline at end of file diff --git a/home/programs/browsers.nix b/home/programs/browsers.nix index 5521156a..d832260f 100644 --- a/home/programs/browsers.nix +++ b/home/programs/browsers.nix @@ -10,8 +10,8 @@ }; in { home.packages = with pkgs-stable; [ - # firefox-wayland - firefox + firefox-wayland + # firefox ]; programs = { @@ -24,26 +24,26 @@ # https://github.com/swaywm/sway/issues/7562 package = pkgs-stable.google-chrome; - # commandLineArgs = [ - # # 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) - # "--gtk-version=4" - # # make it use text-input-v1, which works for kwin 5.27 and weston - # # "--enable-wayland-ime" + commandLineArgs = [ + # 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) + "--gtk-version=4" + # make it use text-input-v1, which works for kwin 5.27 and weston + # "--enable-wayland-ime" - # # enable hardware acceleration - vulkan api - # # "--enable-features=Vulkan" - # ]; + # enable hardware acceleration - vulkan api + # "--enable-features=Vulkan" + ]; }; vscode = { enable = true; # use the stable version package = pkgs-stable.vscode.override { - # commandLineArgs = [ - # # make it use text-input-v1, which works for kwin 5.27 and weston - # # "--enable-wayland-ime" - # ]; + commandLineArgs = [ + # make it use text-input-v1, which works for kwin 5.27 and weston + # "--enable-wayland-ime" + ]; }; # let vscode sync and update its configuration & extensions across devices, using github account. diff --git a/hosts/msi-rtx4090/default.nix b/hosts/msi-rtx4090/default.nix index 55063281..8d8c8766 100644 --- a/hosts/msi-rtx4090/default.nix +++ b/hosts/msi-rtx4090/default.nix @@ -9,7 +9,8 @@ [ ./cifs-mount.nix ../../modules/system.nix - ../../modules/i3.nix + ../../modules/hyprland.nix + #../../modules/i3.nix ../../modules/fcitx5 ../../modules/nur-packages.nix