feat: update package for chissoku

s3igo · Sep 23, 2024 · c7ed5a8 · c7ed5a8
1 parent 6b1972c
commit c7ed5a8
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 35 deletions.
diff --git a/home/wezterm/chissoku.nix b/home/wezterm/chissoku.nix
diff --git a/home/wezterm/default.nix b/home/wezterm/default.nix
@@ -4,25 +4,26 @@
  user,
  ...
 }:
+
+let
+ chissoku = pkgs.callPackage ../../packages/chissoku.nix { };
+in
+
 {
  programs.wezterm = {
  enable = true;
- extraConfig =
- let
- chissoku = import ./chissoku.nix { inherit pkgs; };
- in
- ''
- ---@type { default: table, scheme: table }
- local colors = require('colors')
+ extraConfig = ''
+ ---@type { default: table, scheme: table }
+ local colors = require('colors')
 
-  require('events')(colors.default, '${chissoku}/bin/chissoku')
-  return require('config')(
-  colors.scheme,
-  require('wezterm').font('UDEV Gothic NFLG'),
-  require('mappings'),
-  '/etc/profiles/per-user/${user}/bin/fish'
-  )
-  '';
+ require('events')(colors.default, '${chissoku}/bin/chissoku')
+ return require('config')(
+ colors.scheme,
+ require('wezterm').font('UDEV Gothic NFLG'),
+ require('mappings'),
+ '/etc/profiles/per-user/${user}/bin/fish'
+ )
+ '';
  };
 
  xdg.configFile.wezterm = {

diff --git a/packages/chissoku.nix b/packages/chissoku.nix
@@ -0,0 +1,16 @@
+{
+ buildGoModule,
+ fetchurl,
+}:
+
+buildGoModule rec {
+ pname = "chissoku";
+ version = "v2.1.1";
+
+ src = fetchurl {
+ url = "https://github.com/northeye/chissoku/archive/refs/tags/${version}.tar.gz";
+ sha256 = "sha256-O2QZZJLBqKrY5ctcIW7RX6ZIgMg3jL6pp7vLhhfMv1k=";
+ };
+
+ vendorHash = "sha256-CmYv5AWRR+zllvxl4olBqfmB9B8X7QSgF9fHMnU6kaU=";
+}
diff --git a/packages/default.nix b/packages/default.nix
@@ -20,6 +20,7 @@ in
 
 {
  inherit (pkgs) skk-dict yaskkserv2 yaskkserv2-dict;
+ chissoku = pkgs.callPackage ./chissoku.nix { };
  neovim = makeNixvim {
  imports = with neovim-config.nixosModules; [
  default