home manager config

homes/base.nix

@@ -33,12 +33,23 @@
       difftastic.enable = true;
       userName = "Adrien Faure";
       userEmail = "[email protected]";
+
       aliases = {
         ds = "diff --staged";
         l = "log --pretty=format:'%C(auto,yellow)%h%C(auto,magenta) %C(auto,blue)%ad %C(auto,green)%aN %C(auto,reset)%s%C(auto)% gD%d' --graph --date=format:'%Y-%m-%d %H:%M:%S' --decorate-refs-exclude='refs/remotes/*/HEAD'";
         st = "status";
         chk = "checkout";
       };
+      extraConfig = {
+        # init = {
+        #   defaultBranch = "master";
+        # };
+        # push.default = "current";
+        # safe.bareRepository = "explicit";
+        # rebase.instructionFormat = "%d %s";
+        merge.conflictstyle = "diff3";
+        # commit.verbose = true;
+      };
     };
 
     programs.starship = {

homes/modules/vim/my_vim_plugins.nix

@@ -5,6 +5,7 @@
   unstable,
 }: {
   plugins = with vimPlugins; [
+    telescope-nvim
     # lib for some plugins
     vim-misc
     # Multi vim cursor

homes/modules/vim/vimrc

@@ -182,3 +182,10 @@ let g:airline#extensions#ale#enabled = 1
 
 nmap K :ALEHover<CR>
 nmap gd :ALEGoToDefinition<CR>
+
+" Find files using Telescope command-line sugar.
+nnoremap <leader>ff <cmd>Telescope find_files<cr>
+nnoremap <leader>fg <cmd>Telescope live_grep<cr>
+nnoremap <leader>fb <cmd>Telescope buffers<cr>
+nnoremap <leader>fh <cmd>Telescope help_tags<cr>
+

homes/modules/zsh/default.nix

@@ -15,10 +15,14 @@ in {
   programs.zsh = {
     enable = true;
     enableCompletion = true;
-    enableAutosuggestions = true;
+    autosuggestion.enable = true;
 
     shellAliases = {
       r = "ranger";
+      t1 = "tree -L 1";
+      t2 = "tree -L 2";
+      t3 = "tree -L 3";
+
       v = "vim";
       vim = "nvim";
       t = "task";