re-enable fzf

5 files changed, 10 insertions, 12 deletions

diff --git a/programs/bash.nix b/programs/bash.nix
index cbba2de..fcde389 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -79,7 +79,6 @@
     initExtra = ''
       [ -f $HOME/.github ] && . $HOME/.github
       [ -f ~/.bash_aliases ] && . ~/.bash_aliases
-      [ -f ~/.fzf.bash ] && source ~/.fzf.bash
       eval "$(direnv hook bash)"
       export PS1='\n$(pista)'
       export PATH=$PATH:"$HOME/scripts"
diff --git a/programs/default.nix b/programs/default.nix
index 74a6ad2..3175c64 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -11,6 +11,7 @@
     ./bash.nix
     ./chromium.nix
     ./feh.nix
+    ./fzf.nix
     ./git.nix
     ./htop.nix
     ./neovim.nix
diff --git a/programs/fzf.nix b/programs/fzf.nix
index b02a07c..92614f6 100644
--- a/programs/fzf.nix
+++ b/programs/fzf.nix
@@ -1,7 +1,9 @@
 {
-  enable = true;
-  enableBashIntegration = true;
-  defaultOptions = ["--height 40%" "--layout=reverse" "--color=bw"];
-  defaultCommand = "rg -L --files";
-  changeDirWidgetCommand = "find . -type d";
+  programs.fzf = {
+    enable = true;
+    enableBashIntegration = true;
+    defaultOptions = [ "--height 40%" "--layout=reverse" "--color=bw" ];
+    defaultCommand = "rg -L --files";
+    changeDirWidgetCommand = "fd --type d";
+  };
 }
diff --git a/programs/init.vim b/programs/init.vim
index 38e5eef..0393912 100644
--- a/programs/init.vim
+++ b/programs/init.vim
@@ -2,10 +2,6 @@ let &t_ZM = "\e[3m"
 
 call plug#begin('~/.local/share/nvim/plugged')
 
-" syntax and friends
-Plug 'neovimhaskell/haskell-vim', {'for': ['haskell', 'cabal']}
-Plug 'elmcast/elm-vim'
-
 " my stuff
 Plug 'git@ferrn:vim/vim-colors-plain'
 Plug 'git@ferrn:vim/better-text-objs'
diff --git a/programs/neovim.nix b/programs/neovim.nix
index 40f3998..e4878b3 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -24,8 +24,6 @@
       (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
       completion-nvim
 
-      pkgs.statix-vim
-
       # tpope
       vim-surround
       vim-unimpaired
@@ -34,6 +32,8 @@
 
       # syntax
       rust-vim
+      haskell-vim
+      elm-vim
       vim-nix
       vimtex