aboutsummaryrefslogtreecommitdiff
path: root/programs
diff options
context:
space:
mode:
authorAkshay <[email protected]>2022-08-21 03:26:02 +0100
committerAkshay <[email protected]>2022-08-21 03:26:02 +0100
commit467552d5876ca2535a270c506fbfbd54946fe348 (patch)
tree7cce4d7ce41711630f0f4e45f0c266516d8f9fb8 /programs
parent6066b1bbe2c1cdaa8b0085a92071c11d64e9abbf (diff)
switch to iwd
Diffstat (limited to 'programs')
-rw-r--r--programs/default.nix5
-rw-r--r--programs/git.nix56
-rw-r--r--programs/neovim.nix9
3 files changed, 33 insertions, 37 deletions
diff --git a/programs/default.nix b/programs/default.nix
index 8157c8a..2b12888 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -27,10 +27,7 @@
27 direnv = { 27 direnv = {
28 enable = true; 28 enable = true;
29 enableBashIntegration = true; 29 enableBashIntegration = true;
30 nix-direnv = { 30 nix-direnv.enable = true;
31 enable = true;
32 enableFlakes = true;
33 };
34 }; 31 };
35 autojump = { 32 autojump = {
36 enable = true; 33 enable = true;
diff --git a/programs/git.nix b/programs/git.nix
index dc842ce..b906efa 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -9,9 +9,35 @@ with theme;
9 programs.git = { 9 programs.git = {
10 enable = true; 10 enable = true;
11 ignores = [ ".envrc" ]; 11 ignores = [ ".envrc" ];
12 delta.enable = true;
13 userEmail = "[email protected]"; 12 userEmail = "[email protected]";
14 userName = "Akshay"; 13 userName = "Akshay";
14 delta = {
15 enable = true;
16 options = {
17 features = "decorations labels";
18 syntax-theme = "none";
19 zero-style = "8";
20 navigate = "true";
21 keep-plus-minus-markers = "true";
22 decorations = {
23 file-decoration-style = "none";
24 whitespace-error-style = "22 reverse";
25 minus-style = "${base08}";
26 minus-emph-style = "${base08} bold";
27 plus-style = "${base0B}";
28 plus-emph-style = "${base0B} bold";
29 file-style = "7 italic";
30 hunk-header-style = "7";
31 hunk-header-decoration-style = "8 ul";
32 };
33 labels = {
34 file-modified-label = " MODIFIED ";
35 file-removed-label = " REMOVED ";
36 file-added-label = " ADDED ";
37 file-renamed-label = " RENAMED ";
38 };
39 };
40 };
15 extraConfig = { 41 extraConfig = {
16 commit.verbose = true; 42 commit.verbose = true;
17 core = { 43 core = {
@@ -20,30 +46,4 @@ with theme;
20 }; 46 };
21 }; 47 };
22} 48}
23# delta = { 49
24# enable = true;
25# options = {
26# features = "decorations labels";
27# syntax-theme = "none";
28# zero-style = "8";
29# navigate = "true";
30# keep-plus-minus-markers = "true";
31# decorations = {
32# file-decoration-style = "none";
33# whitespace-error-style = "22 reverse";
34# minus-style = "${base08}";
35# minus-emph-style = "${base08} bold";
36# plus-style = "${base0B}";
37# plus-emph-style = "${base0B} bold";
38# file-style = "7 italic";
39# hunk-header-style = "7";
40# hunk-header-decoration-style = "8 ul";
41# };
42# labels = {
43# file-modified-label = " MODIFIED ";
44# file-removed-label = " REMOVED ";
45# file-added-label = " ADDED ";
46# file-renamed-label = " RENAMED ";
47# };
48# };
49# };
diff --git a/programs/neovim.nix b/programs/neovim.nix
index f108993..6095e0f 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -12,11 +12,10 @@
12 vimAlias = true; 12 vimAlias = true;
13 withPython3 = true; 13 withPython3 = true;
14 extraPackages = with pkgs; [ 14 extraPackages = with pkgs; [
15 gcc 15 # gcc
16 python37Packages.yapf 16 # python37Packages.yapf
17 hlint 17 # hlint
18 ocamlformat 18 # ocamlformat
19 ocamlPackages.ocaml-lsp
20 ]; 19 ];
21 plugins = with pkgs.vimPlugins; [ 20 plugins = with pkgs.vimPlugins; [
22 # neovim only 21 # neovim only