aboutsummaryrefslogtreecommitdiff
path: root/programs
diff options
context:
space:
mode:
Diffstat (limited to 'programs')
-rw-r--r--programs/bash.nix1
-rw-r--r--programs/default.nix1
-rw-r--r--programs/fzf.nix12
-rw-r--r--programs/init.vim4
-rw-r--r--programs/neovim.nix4
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 @@
79 initExtra = '' 79 initExtra = ''
80 [ -f $HOME/.github ] && . $HOME/.github 80 [ -f $HOME/.github ] && . $HOME/.github
81 [ -f ~/.bash_aliases ] && . ~/.bash_aliases 81 [ -f ~/.bash_aliases ] && . ~/.bash_aliases
82 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
83 eval "$(direnv hook bash)" 82 eval "$(direnv hook bash)"
84 export PS1='\n$(pista)' 83 export PS1='\n$(pista)'
85 export PATH=$PATH:"$HOME/scripts" 84 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 @@
11 ./bash.nix 11 ./bash.nix
12 ./chromium.nix 12 ./chromium.nix
13 ./feh.nix 13 ./feh.nix
14 ./fzf.nix
14 ./git.nix 15 ./git.nix
15 ./htop.nix 16 ./htop.nix
16 ./neovim.nix 17 ./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 @@
1{ 1{
2 enable = true; 2 programs.fzf = {
3 enableBashIntegration = true; 3 enable = true;
4 defaultOptions = ["--height 40%" "--layout=reverse" "--color=bw"]; 4 enableBashIntegration = true;
5 defaultCommand = "rg -L --files"; 5 defaultOptions = [ "--height 40%" "--layout=reverse" "--color=bw" ];
6 changeDirWidgetCommand = "find . -type d"; 6 defaultCommand = "rg -L --files";
7 changeDirWidgetCommand = "fd --type d";
8 };
7} 9}
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"
2 2
3call plug#begin('~/.local/share/nvim/plugged') 3call plug#begin('~/.local/share/nvim/plugged')
4 4
5" syntax and friends
6Plug 'neovimhaskell/haskell-vim', {'for': ['haskell', 'cabal']}
7Plug 'elmcast/elm-vim'
8
9" my stuff 5" my stuff
10Plug 'git@ferrn:vim/vim-colors-plain' 6Plug 'git@ferrn:vim/vim-colors-plain'
11Plug 'git@ferrn:vim/better-text-objs' 7Plug '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 @@
24 (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars)) 24 (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
25 completion-nvim 25 completion-nvim
26 26
27 pkgs.statix-vim
28
29 # tpope 27 # tpope
30 vim-surround 28 vim-surround
31 vim-unimpaired 29 vim-unimpaired
@@ -34,6 +32,8 @@
34 32
35 # syntax 33 # syntax
36 rust-vim 34 rust-vim
35 haskell-vim
36 elm-vim
37 vim-nix 37 vim-nix
38 vimtex 38 vimtex
39 39