From 82228e93cd058345a14d671458e34b53133058eb Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Fri, 29 Sep 2023 18:09:43 +0200
Subject: [PATCH] cleanup

---
 custom-pkgs/cargo-bisect-rustc/default.nix | 2 +-
 home-manager/common.nix                    | 4 ++--
 home-manager/git.nix                       | 6 +++---
 home-manager/vscode.nix                    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/custom-pkgs/cargo-bisect-rustc/default.nix b/custom-pkgs/cargo-bisect-rustc/default.nix
index 121cb1b..a7d9c0b 100644
--- a/custom-pkgs/cargo-bisect-rustc/default.nix
+++ b/custom-pkgs/cargo-bisect-rustc/default.nix
@@ -1,4 +1,4 @@
-pkgs: pkgs.rustPlatform.buildRustPackage rec {
+pkgs: pkgs.rustPlatform.buildRustPackage {
   pname = "cargo-bisect-rustc";
   version = "0.6.7";
 
diff --git a/home-manager/common.nix b/home-manager/common.nix
index 475a9d1..b2a711b 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -9,8 +9,8 @@
   home.file.".cargo/config.toml" = {
     text = ''
       [target.x86_64-unknown-linux-gnu]
-      linker = "${pkgs.llvmPackages_16.clang}/bin/clang"
-      rustflags = ["-Clink-arg=-fuse-ld=${pkgs.mold}/bin/mold", "-Ctarget-cpu=native"]
+      linker = "${lib.getExe pkgs.llvmPackages_16.clang}"
+      rustflags = ["-Clink-arg=-fuse-ld=${lib.getExe' pkgs.mold "mold"}", "-Ctarget-cpu=native"]
     '';
   };
 
diff --git a/home-manager/git.nix b/home-manager/git.nix
index c2f8258..e88186b 100644
--- a/home-manager/git.nix
+++ b/home-manager/git.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   programs.git = {
     enable = true;
 
@@ -10,14 +10,14 @@
       fpush = "push --force-with-lease";
       resq = "rebase --autosquash -i";
       pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
-      sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${pkgs.lib.getExe pkgs.fzf})";
+      sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})";
     };
     difftastic = {
       enable = true;
     };
     extraConfig = {
       core.autocrlf = false;
-      core.editor = "${pkgs.neovim}/bin/nvim";
+      core.editor = "${lib.getExe pkgs.neovim}";
       pull.ff = "only";
       push.autoSetupRemote = true;
       init.defaultBranch = "main";
diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix
index 33b35a8..13a0fc0 100644
--- a/home-manager/vscode.nix
+++ b/home-manager/vscode.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   programs.vscode = {
     enable = true;
     package = pkgs.vscode;
@@ -9,11 +9,11 @@
       "[nix]"."editor.formatOnSave" = true;
       "[nix]"."editor.defaultFormatter" = "jnoortheen.nix-ide";
       "nix.enableLanguageServer" = true;
-      "nix.serverPath" = "${pkgs.nil}/bin/nil";
+      "nix.serverPath" = "${lib.getExe pkgs.nil}";
       "nix.serverSettings" = {
         nil = {
           formatting = {
-            command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ];
+            command = [ "${lib.getExe pkgs.nixpkgs-fmt}" ];
           };
         };
       };