aboutsummaryrefslogtreecommitdiff
path: root/programs
diff options
context:
space:
mode:
Diffstat (limited to 'programs')
-rw-r--r--programs/bash.nix2
-rw-r--r--programs/git.nix23
-rw-r--r--programs/neovim.nix1
3 files changed, 25 insertions, 1 deletions
diff --git a/programs/bash.nix b/programs/bash.nix
index f6f8de9..e2b825a 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -87,7 +87,7 @@
87 git worktree list | \ 87 git worktree list | \
88 fzf --min-height=15 \ 88 fzf --min-height=15 \
89 --preview-window=up,10 \ 89 --preview-window=up,10 \
90 --preview='git log --color=always -n10 --oneline {2}' \ 90 --preview='git log --color=always -n10 --decorate --oneline {2}' \
91 --cycle -1 \ 91 --cycle -1 \
92 -q "$query" | \ 92 -q "$query" | \
93 awk '{print $1}' 93 awk '{print $1}'
diff --git a/programs/git.nix b/programs/git.nix
index bc312de..e4b5e0f 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -39,11 +39,34 @@ with theme;
39 }; 39 };
40 }; 40 };
41 }; 41 };
42 # difftastic = {
43 # enable = true;
44 # background = "dark";
45 # display = "inline";
46 # };
47 aliases = {
48 co = "checkout";
49 rb = "rebase";
50 };
42 extraConfig = { 51 extraConfig = {
43 commit.verbose = true; 52 commit.verbose = true;
44 core = { 53 core = {
45 hooksPath = "/home/np/.hooks"; 54 hooksPath = "/home/np/.hooks";
46 }; 55 };
56 column = {
57 ui = "auto dense";
58 status = "never";
59 };
60 branch.sort = "-committerdate";
61 worktree.guessRemote = true;
62 rebase = {
63 abbreviateCommands = true;
64 stat = true;
65 };
66 rerere = {
67 enabled = true;
68 autoUpdate = true;
69 };
47 }; 70 };
48 }; 71 };
49} 72}
diff --git a/programs/neovim.nix b/programs/neovim.nix
index 0430868..08a1ada 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -14,6 +14,7 @@
14 extraPackages = with pkgs; [ 14 extraPackages = with pkgs; [
15 # gcc 15 # gcc
16 python311Packages.yapf 16 python311Packages.yapf
17 nodePackages.bash-language-server
17 # hlint 18 # hlint
18 # ocamlformat 19 # ocamlformat
19 ]; 20 ];