From f10598f2a16f5235537f34e295252edc92b34c74 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Sat, 25 May 2024 23:16:19 +0530 Subject: [PATCH] expetimenting with fcitx5 and varnam --- common/nix.nix | 2 ++ flake.lock | 71 ++++++++++++++++++++++++++++++++++++++- flake.nix | 2 ++ hosts/skipper/default.nix | 9 ++++- 4 files changed, 82 insertions(+), 2 deletions(-) diff --git a/common/nix.nix b/common/nix.nix index 089a19f..05b7269 100644 --- a/common/nix.nix +++ b/common/nix.nix @@ -13,10 +13,12 @@ auto-allocate-uids = true; sandbox = true; trusted-substituters = [ + "https://varnam-nix.cachix.org" "https://nix-community.cachix.org" "https://cache.nixos.org" ]; trusted-public-keys = [ + "varnam-nix.cachix.org-1:IduaZzaMOJmY32L11e+a4fDDq6Xnq9/NcocAPcIbX9Y=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; diff --git a/flake.lock b/flake.lock index 9e4ec8d..befa0f0 100644 --- a/flake.lock +++ b/flake.lock @@ -94,6 +94,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -223,6 +241,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1716220750, + "narHash": "sha256-Lhhrd1ZBNXCbUupWGq6gRPIy1qMKEdcAXcjnwgVqe/U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "641daa314d5bc1bca4b345da8eb08a130b109c79", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -260,7 +294,8 @@ "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "varnam-nix": "varnam-nix" } }, "rust-overlay": { @@ -317,6 +352,40 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "varnam-nix": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1716576381, + "narHash": "sha256-O2TA5icv31+ThiaOvw9npyKQ2051CMpLhfo6XA8thRc=", + "owner": "adtya", + "repo": "varnam-nix", + "rev": "24797f9cd1869d7961848100bcda2edd6ea48725", + "type": "github" + }, + "original": { + "owner": "adtya", + "repo": "varnam-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 932686c..b98825d 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ flake-utils.url = "github:numtide/flake-utils"; impermanence.url = "github:nix-community/impermanence"; lanzaboote.url = "github:nix-community/lanzaboote"; + varnam-nix.url = "github:adtya/varnam-nix"; }; outputs = @@ -30,6 +31,7 @@ , home-manager , impermanence , lanzaboote + , varnam-nix , } @ inputs: let diff --git a/hosts/skipper/default.nix b/hosts/skipper/default.nix index db39401..edd2b2b 100644 --- a/hosts/skipper/default.nix +++ b/hosts/skipper/default.nix @@ -1,4 +1,4 @@ -{ pkgs, extra-packages, ... }: { +{ pkgs, extra-packages, varnam-nix, ... }: { imports = [ ./hardware ./programs @@ -30,6 +30,13 @@ gtk.iconCache.enable = true; i18n = { + inputMethod = { + enabled = "fcitx5"; + fcitx5 = { + waylandFrontend = true; + addons = [ varnam-nix.packages.${pkgs.system}.fcitx5-varnam pkgs.fcitx5-gtk ]; + }; + }; defaultLocale = "en_IN.UTF-8"; extraLocaleSettings = { LC_ADDRESS = "en_IN.UTF-8";