From d465beeca47baf6e609e9df89f5d15eca76ede23 Mon Sep 17 00:00:00 2001
From: Nikos Papadakis <nikos@papadakis.xyz>
Date: Mon, 23 Oct 2023 14:36:02 +0300
Subject: [PATCH] rm packages.nix

---
 home.nix                        | 12 +++++++++++-
 nvim/after/plugin/telescope.lua | 13 ++++---------
 nvim/init.lua                   |  3 ---
 packages.nix                    | 11 -----------
 4 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 packages.nix

diff --git a/home.nix b/home.nix
index 3484d26..5c091ce 100644
--- a/home.nix
+++ b/home.nix
@@ -27,7 +27,17 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = import ./packages.nix pkgs;
+  home.packages = with pkgs; [
+    neovim # neovim nightly
+    ripgrep # "rg" cli, alternative to grep, used by nvim
+    fd # find alternative, used by nvim
+    lsd # "ls" alternative
+    zoxide # "z" command
+    nil # Nix LSP
+    nixpkgs-fmt # Nix formatter
+    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) # nerdfonts jetbrains mono
+    efm-langserver # Generic language server
+  ];
 
   fonts.fontconfig.enable = true;
 
diff --git a/nvim/after/plugin/telescope.lua b/nvim/after/plugin/telescope.lua
index 8c2faea..d296c23 100644
--- a/nvim/after/plugin/telescope.lua
+++ b/nvim/after/plugin/telescope.lua
@@ -23,15 +23,10 @@ local function project()
         "*.jpg",
     }
 
-    local find_command = nil
-    if FD_EXISTS == 1 then
-        find_command = { "fd", "--hidden", "-t", "f" }
-        for _, value in ipairs(exclusions) do
-            table.insert(find_command, "--exclude")
-            table.insert(find_command, value)
-        end
-    elseif RIPGREP_EXISTS == 1 then
-        find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" }
+    local find_command = { "fd", "--hidden", "-t", "f" }
+    for _, value in ipairs(exclusions) do
+        table.insert(find_command, "--exclude")
+        table.insert(find_command, value)
     end
 
     builtin.find_files {
diff --git a/nvim/init.lua b/nvim/init.lua
index 917297e..b00e820 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -4,9 +4,6 @@ Neovim Configuration
 
 --]]
 
-FD_EXISTS = vim.fn.executable("fd")
-RIPGREP_EXISTS = vim.fn.executable("rg")
-
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 -- vim.g.netrw_banner = 0
diff --git a/packages.nix b/packages.nix
deleted file mode 100644
index a65dab6..0000000
--- a/packages.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-pkgs: with pkgs; [
-  neovim # neovim nightly
-  ripgrep # "rg" cli, alternative to grep, used by nvim
-  fd # find alternative, used by nvim
-  lsd # "ls" alternative
-  zoxide # "z" command
-  nil # Nix LSP
-  nixpkgs-fmt # Nix formatter
-  (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) # nerdfonts jetbrains mono
-  efm-langserver # Generic language server
-]