refactor: change to use lib.getExe

s3igo · Sep 28, 2024 · 9195aae · 9195aae
1 parent c134a89
commit 9195aae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/home/fish.nix b/home/fish.nix
@@ -2,7 +2,7 @@
  pkgs,
  config,
  # osConfig,
- # lib,
+ lib,
  ...
 }:
 
@@ -145,7 +145,7 @@ in
  set fish_greeting
 
  # LS_COLORS
- set --export LS_COLORS "$(${pkgs.vivid}/bin/vivid generate snazzy)"
+ set --export LS_COLORS "$(${lib.getExe pkgs.vivid} generate snazzy)"
 
  # # restricting abbrs
  # ## git
@@ -196,6 +196,6 @@ in
  };
 
  # home.activation.updateFishCompletions = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
- # ${pkgs.fish}/bin/fish -c 'fish_update_completions'
+ # ${lib.getExe pkgs.fish} -c 'fish_update_completions'
  # '';
 }
diff --git a/home/git.nix b/home/git.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
  programs.git = {
@@ -8,7 +8,7 @@
  sync = "pull --rebase --autostash";
  init-empty = "!git init && git commit --allow-empty -m 'initial commit'";
  init-exist = "!git init && git add . && git commit -m 'first commit'";
- create = ''!f() { ${pkgs.gh}/bin/gh repo create "$1" --private && ${pkgs.ghq}/bin/ghq get -p "$1"; }; f'';
+ create = ''!f() { ${lib.getExe pkgs.gh} repo create "$1" --private && ${lib.getExe pkgs.ghq} get -p "$1"; }; f'';
  pr = ''!f() { git fetch origin "pull/$1/head:PR-$1"; }; f'';
  };
  delta = {

diff --git a/home/joshuto.nix b/home/joshuto.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 let
  package = pkgs.joshuto.overrideAttrs (oldAttrs: rec {
@@ -70,7 +70,7 @@ in
  fish.functions.jo = ''
  mkdir -p /tmp/$USER
  set -l output_file "/tmp/$USER/joshuto-cwd-$fish_pid"
- ${package}/bin/joshuto --output-file "$output_file" $argv
+ ${lib.getExe package} --output-file "$output_file" $argv
 
  # Whether the output contains the current directory
  if test $status -eq 101

diff --git a/home/wezterm/default.nix b/home/wezterm/default.nix
@@ -16,7 +16,7 @@ in
  ---@type { default: table, scheme: table }
  local colors = require('colors')
 
- require('events')(colors.default, '${chissoku}/bin/chissoku')
+ require('events')(colors.default, '${lib.getExe chissoku}')
  return require('config')(
  colors.scheme,
  require('wezterm').font('UDEV Gothic NFLG'),