From 4eaf6ae98f3de16ae308329d110ca07bb9feae41 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Mon, 27 May 2024 04:55:52 +0530 Subject: [PATCH] use varnam from overlay --- flake.lock | 40 +++------------------------------------ flake.nix | 1 + hosts/skipper/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index eb35479..ef812f1 100644 --- a/flake.lock +++ b/flake.lock @@ -94,24 +94,6 @@ "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": [ @@ -353,32 +335,16 @@ "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=", + "lastModified": 1716722955, + "narHash": "sha256-aISfMjm7/9OQQNQ5f++TuD8wY87Bl1O0k+2snw1XLfY=", "owner": "adtya", "repo": "varnam-nix", - "rev": "24797f9cd1869d7961848100bcda2edd6ea48725", + "rev": "6abc81db9438b979d67ce33459316453e6857312", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b98825d..76ba621 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,7 @@ config = { allowUnfree = true; }; + overlays = [ varnam-nix.overlays.default ]; }; extra-packages = system: import ./extra-packages (packages system); in diff --git a/hosts/skipper/default.nix b/hosts/skipper/default.nix index edd2b2b..752171b 100644 --- a/hosts/skipper/default.nix +++ b/hosts/skipper/default.nix @@ -1,4 +1,4 @@ -{ pkgs, extra-packages, varnam-nix, ... }: { +{ pkgs, extra-packages, ... }: { imports = [ ./hardware ./programs @@ -34,7 +34,7 @@ enabled = "fcitx5"; fcitx5 = { waylandFrontend = true; - addons = [ varnam-nix.packages.${pkgs.system}.fcitx5-varnam pkgs.fcitx5-gtk ]; + addons = [ pkgs.fcitx5-varnam pkgs.fcitx5-gtk ]; }; }; defaultLocale = "en_IN.UTF-8";