From 07b178ede6e019f7b07df650089fea41dd1676b8 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Thu, 14 Sep 2023 20:30:37 +0200
Subject: [PATCH] refactor: `lib.getExe` -> explicit bin path

---
 home/apps/colorscheme-sync.nix |  4 ++--
 home/apps/neovim.nix           |  2 +-
 home/apps/sway.nix             | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/home/apps/colorscheme-sync.nix b/home/apps/colorscheme-sync.nix
index 1f627e1..ce5aa6d 100644
--- a/home/apps/colorscheme-sync.nix
+++ b/home/apps/colorscheme-sync.nix
@@ -39,8 +39,8 @@ in {
       useGeoclue = false;
     };
     activationScript = let
-      starship = lib.getExe config.programs.starship.package;
-      zsh = lib.getExe config.programs.zsh.package;
+      starship = "${config.programs.starship.package}/bin/starship";
+      zsh = "${config.programs.zsh.package}/bin/zsh";
     in {
       dark = ''
         ${starship} config palette catppuccin_mocha
diff --git a/home/apps/neovim.nix b/home/apps/neovim.nix
index 2b6eb9b..7cfa2ef 100644
--- a/home/apps/neovim.nix
+++ b/home/apps/neovim.nix
@@ -18,7 +18,7 @@
       name = "neovim";
       paths = [pkgs.neovim-unwrapped];
       buildInputs = [pkgs.makeWrapper pkgs.gcc];
-      postBuild = "wrapProgram $out/bin/nvim --prefix CC : ${pkgs.lib.getExe pkgs.gcc}";
+      postBuild = "wrapProgram $out/bin/nvim --prefix CC : ${pkgs.gcc}/bin/gcc";
     };
 
     extraPackages = with pkgs; [
diff --git a/home/apps/sway.nix b/home/apps/sway.nix
index 4348928..fcdb132 100644
--- a/home/apps/sway.nix
+++ b/home/apps/sway.nix
@@ -61,7 +61,7 @@ in {
         focus.mouseWarping = "container";
         startup = [
           {
-            command = "${lib.getExe pkgs.autotiling} -l2";
+            command = "${pkgs.autotiling}/bin/autotiling -l2";
             always = true;
           }
           {
@@ -82,8 +82,8 @@ in {
           }
         ];
         workspaceAutoBackAndForth = true;
-        terminal = lib.getExe config.programs.wezterm.package;
-        menu = lib.getExe config.programs.rofi.package;
+        terminal = "${config.programs.wezterm.package}/bin/wezterm";
+        menu = "${config.programs.rofi.package}/bin/rofi";
         defaultWorkspace = "workspace number 1";
         input."type:keyboard".xkb_options = "ctrl:nocaps,compose:ralt";
         output."*" = {
@@ -96,9 +96,9 @@ in {
           modFocus = "${mod}+Ctrl";
           hyper = "Mod4+Mod1+Shift+Ctrl";
 
-          pcmanfm = lib.getExe pkgs.pcmanfm;
-          screenshot = "${lib.getExe pkgs.sway-contrib.grimshot} copy area";
-          playerctl = lib.getExe pkgs.playerctl;
+          pcmanfm = "${pkgs.pcmanfm}/bin/pcmanfm";
+          screenshot = "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
+          playerctl = "${pkgs.playerctl}/bin/playerctl";
           wpctl = pkgs.wireplumber + "/bin/wpctl";
         in {
           "${mod}+Shift+b" = "border none";
@@ -188,7 +188,7 @@ in {
           # rofi instead of drun
           "${mod}+space" = "exec --no-startup-id ${menu} -show drun -dpi $dpi";
           # 1password
-          "${mod}+Shift+space" = "exec ${lib.getExe pkgs._1password-gui} --quick-access";
+          "${mod}+Shift+space" = "exec ${pkgs._1password-gui}/bin/1password-gui --quick-access";
 
           # audio
           "XF86AudioRaiseVolume" = "exec --no-startup-id ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.0";