stuff

4 files changed, 18 insertions, 8 deletions

diff --git a/programs/atuin.nix b/programs/atuin.nix
new file mode 100644
index 0000000..2a501fc
--- /dev/null
+++ b/programs/atuin.nix
@@ -0,0 +1,6 @@
+{
+  programs.atuin = {
+    enable = true;
+    enableBashIntegration = true;
+  };
+}
diff --git a/programs/default.nix b/programs/default.nix
index 482c02e..32eaf18 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -8,6 +8,7 @@
 {
 
   imports = [
+    ./atuin.nix
     ./bash.nix
     ./chromium.nix
     ./feh.nix
@@ -16,9 +17,9 @@
     ./htop.nix
     ./neovim.nix
     ./readline.nix
+    ./rofi.nix
     ./tmux.nix
     ./zathura.nix
-    ./rofi.nix
   ];
 
   programs = {
diff --git a/programs/git.nix b/programs/git.nix
index 69dd409..d4fac67 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -19,7 +19,13 @@ with theme;
         syntax-theme = "none";
         zero-style = "8";
         navigate = "true";
+        line-numbers = "true";
         keep-plus-minus-markers = "true";
+        line-numbers-zero-style = "8";
+        line-numbers-left-style = "8";
+        line-numbers-right-style = "8";
+        line-numbers-minus-style = "${base08}";
+        line-numbers-plus-style = "${base0B}";
         decorations = {
           file-decoration-style = "none";
           whitespace-error-style = "22 reverse";
@@ -27,7 +33,7 @@ with theme;
           minus-emph-style = "${base08} bold";
           plus-style = "${base0B}";
           plus-emph-style = "${base0B} bold";
-          file-style = "7 italic";
+          file-style = "7 bold";
           hunk-header-style = "7";
           hunk-header-decoration-style = "8 ul";
         };
@@ -39,11 +45,6 @@ with theme;
         };
       };
     };
-    # difftastic = {
-    #   enable = true;
-    #   background = "dark";
-    #   display = "inline";
-    # };
     aliases = {
       co = "checkout";
       rb = "rebase";
diff --git a/programs/init.vim b/programs/init.vim
index c62f419..af74f32 100644
--- a/programs/init.vim
+++ b/programs/init.vim
@@ -55,6 +55,7 @@ set dir=/tmp
 
 syntax on
 
+set nocursorline
 set omnifunc=syntaxcomplete#Complete
 set completefunc=LanguageClient#complete
 set list
@@ -76,6 +77,7 @@ set path+=**
 set backspace=indent,eol,start
 set hidden
 set wildmenu
+set pumheight=8
 set complete=.,w,b,i,u,t,
 set background=dark
 set mouse=a
@@ -83,7 +85,7 @@ set conceallevel=0
 set nonumber
 set grepprg=rg\ --vimgrep\ --no-heading
 set grepformat=%f:%l:%c:%m,%f:%l:%m
-set cmdheight=2
+set cmdheight=1
 set shortmess+=c
 set updatetime=300
 set signcolumn=yes