summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Stachurski <j.stachurski@student.utwente.nl>2025-11-23 18:41:01 +0100
committerJakub Stachurski <j.stachurski@student.utwente.nl>2025-11-23 18:41:01 +0100
commitce021eefaf1f337ed8ac406dea70947033bd70c1 (patch)
tree83a2050505555b72bb3191ce371f117b6b44b387
parentc4a4c9efaf7227d0b9a0fde28cf8c4612176aea0 (diff)
Fix fcitx5 by moving it to home-manager and updating the flake
-rw-r--r--flake.lock30
-rw-r--r--home-modules/apps/desktop/default.nix18
-rw-r--r--modules/desktop/common.nix18
3 files changed, 33 insertions, 33 deletions
diff --git a/flake.lock b/flake.lock
index 0fb29e4..6b7cf31 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,11 +40,11 @@
]
},
"locked": {
- "lastModified": 1761191301,
- "narHash": "sha256-xsRL2Oyb4YRZZ1Tu4WzR2uFg1n931bH+PfLdFcqtLg8=",
+ "lastModified": 1763906693,
+ "narHash": "sha256-inm7paa3myo8gE4TzjM8OPvsEg8xocWreIZBgBPEKgo=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "4958aafe7b237dc1e857fb0c916efff72075048f",
+ "rev": "3d6c1c8fa0bea3a1a7ba23d6fa5993116766073b",
"type": "github"
},
"original": {
@@ -55,11 +55,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1761114652,
- "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+ "lastModified": 1763678758,
+ "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+ "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
"type": "github"
},
"original": {
@@ -71,11 +71,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1761016216,
- "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+ "lastModified": 1763622513,
+ "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+ "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
"type": "github"
},
"original": {
@@ -101,11 +101,11 @@
]
},
"locked": {
- "lastModified": 1760998189,
- "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+ "lastModified": 1763870012,
+ "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+ "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3",
"type": "github"
},
"original": {
@@ -138,11 +138,11 @@
]
},
"locked": {
- "lastModified": 1763244706,
- "narHash": "sha256-TILRFbMuCYzphAvGnKhOEv//WxT83eA45LMOJttis4s=",
+ "lastModified": 1763680318,
+ "narHash": "sha256-/LSEBVRXjD/7uppeOETqal8ibk/afR0br884dhYiIi0=",
"owner": "Wilkuu-2",
"repo": "tatuin",
- "rev": "23cd8de48424c9f0937fa645888c5cddabf45621",
+ "rev": "8cdde22f370e2e739762d6ee455782b3bff76154",
"type": "github"
},
"original": {
diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix
index c326607..64f1382 100644
--- a/home-modules/apps/desktop/default.nix
+++ b/home-modules/apps/desktop/default.nix
@@ -29,6 +29,24 @@ in
variant = "mocha";
})
];
+ # Use fcitx
+ i18n.inputMethod = {
+ type = "fcitx5";
+ enable = true;
+ fcitx5 = {
+ waylandFrontend = true;
+ addons = with pkgs; [
+ fcitx5-gtk
+ fcitx5-lua
+ fcitx5-mozc
+ fcitx5-table-other
+ fcitx5-gtk
+ ];
+ };
+ };
+
+ # Install the theme for fcitx
+ home.file."/.local/share/fcitx5/themes".source = "${pkgs.catppuccin-fcitx5}/share/fcitx5/themes";
})
(lib.mkIf cfg.email.enable {
home.packages = with pkgs; [
diff --git a/modules/desktop/common.nix b/modules/desktop/common.nix
index ca43c5f..5c77fc8 100644
--- a/modules/desktop/common.nix
+++ b/modules/desktop/common.nix
@@ -55,24 +55,6 @@
};
- # fcitx is broken for now
- i18n.inputMethod = {
- type = "fcitx5";
- enable = false;
- fcitx5 = {
- waylandFrontend = true;
- addons = with pkgs; [
- # fcitx5-gtk
- # fcitx5-lua
- # fcitx5-mozc
- # catppuccin-fcitx5
- # fcitx5-table-other
- # fcitx5-gtk
- # libsForQt5.fcitx5-qt
- # kdePackages.fcitx5-qt
- ];
- };
- };
fonts.packages = with pkgs; [
noto-fonts