From 429fbc0d63e8b306f2ce65afe7fb7e1dc0f2ae96 Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Tue, 30 Jan 2024 10:10:42 -0500
Subject: [PATCH] moar

---
 src/modules/utils/modules/vim/config/vimrc | 48 +++++++++++++++-------
 src/modules/utils/modules/vim/default.nix  |  7 ++--
 src/systems/wsl/default.nix                |  4 +-
 src/systems/wsl/home.nix                   |  6 +--
 4 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/modules/utils/modules/vim/config/vimrc b/src/modules/utils/modules/vim/config/vimrc
index f9c371e..4dd4ca7 100644
--- a/src/modules/utils/modules/vim/config/vimrc
+++ b/src/modules/utils/modules/vim/config/vimrc
@@ -13,7 +13,6 @@ autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
   \| endif
 
 call plug#begin('~/.vim/plugged')
-
   Plug 'joshdick/onedark.vim'
   Plug 'tpope/vim-surround'
   Plug 'jiangmiao/auto-pairs'
@@ -22,16 +21,26 @@ call plug#begin('~/.vim/plugged')
   Plug 'mtdl9/vim-log-highlighting'
   Plug 'machakann/vim-highlightedyank'
   Plug 'itchyny/lightline.vim'
-
+  Plug 'tpope/vim-fugitive'
+  Plug 'mhinz/vim-signify'
 call plug#end()
 
-let mapleader = " "
+let mapleader = "\<Space>"
 colorscheme onedark
 
+highlight CursorLine ctermbg=NONE guibg=NONE
+highlight CursorLineNr ctermfg=magenta guifg=magenta
+highlight HighlightedyankRegion ctermfg=NONE guifg=NONE
+highlight Normal ctermbg=NONE guibg=NONE
+highlight NormalNC ctermbg=NONE guibg=NONE
+highlight Search ctermfg=yellow guifg=yellow
+highlight Search ctermbg=black guibg=black
+
+let g:highlightedyank_highlight_duration = 80
+let g:lightline = { 'colorscheme': 'one', }
+
 let $FZF_DEFAULT_OPTS = '--bind=tab:up,shift-tab:down'
 let g:fzf_layout = { 'window': 'enew' }
-let g:highlightedyank_highlight_duration = 80
-let g:lightline = { 'colorscheme': 'one', }
 
 set laststatus=2
 
@@ -49,20 +58,29 @@ set tabstop=2
 set shiftwidth=2
 set expandtab
 
-highlight CursorLine ctermbg=NONE guibg=NONE
-highlight CursorLineNr ctermfg=magenta guifg=magenta
-highlight HighlightedyankRegion ctermfg=NONE guifg=NONE
-highlight Normal ctermbg=NONE guibg=NONE
-highlight NormalNC ctermbg=NONE guibg=NONE
-highlight Search ctermfg=yellow guifg=yellow
-highlight Search ctermbg=black guibg=black
-
 vnoremap < <gv
 vnoremap > >gv
-
 nnoremap <C-U> <C-U>zz
 nnoremap <C-D> <C-D>zz
+
+nnoremap <leader>gs :Git status<CR>
+nnoremap <leader>gl :Git log<CR>
+nnoremap <leader>ga :Git add<CR>
+nnoremap <leader>gc :Git commit<CR>
+nnoremap <leader>gd :Git diff<CR>
+
 nnoremap <leader>e :Explore<CR>
-nnoremap <leader><ESC> :noh<CR>
 nnoremap <leader>/ :Rg<Space>
+
+nnoremap <leader>bd :bd<CR>
+nnoremap H :bprevious<CR>
+nnoremap L :bnext<CR>
+
+nnoremap <leader>wh :split<CR>
+nnoremap <leader>wv :vsplit<CR>
+nnoremap <leader>wd :q<CR>
+nnoremap <leader>ww :wincmd w<CR>
+nnoremap <leader>wW :wincmd W<CR>
+
 nnoremap <Leader>ts :execute "normal! a" . strftime('[%b %d %H:%M:%S - BR]')<CR>
+nnoremap <leader><ESC> :noh<CR>
diff --git a/src/modules/utils/modules/vim/default.nix b/src/modules/utils/modules/vim/default.nix
index d8469dd..8d2064f 100644
--- a/src/modules/utils/modules/vim/default.nix
+++ b/src/modules/utils/modules/vim/default.nix
@@ -9,10 +9,11 @@ in
   config = mkIf cfg.enable {
     home = {
       packages = with pkgs; [ 
-        vim 
+        vim
        ];
-      file.".config/.vimrc" = {
-        source = ./config/vimrc;
+      file.".vim" = {
+        source = ./config;
+        recursive = true;
       };
     };
     programs.bash.shellAliases = {
diff --git a/src/systems/wsl/default.nix b/src/systems/wsl/default.nix
index 5318a10..6e1d6d3 100644
--- a/src/systems/wsl/default.nix
+++ b/src/systems/wsl/default.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 
-{ 
+{
   imports = [
     ../../user
-    ./system.nix 
+    ./system.nix
   ];
 }
diff --git a/src/systems/wsl/home.nix b/src/systems/wsl/home.nix
index d4d3c19..4c30d8e 100644
--- a/src/systems/wsl/home.nix
+++ b/src/systems/wsl/home.nix
@@ -6,9 +6,9 @@
     nixup = "sudo nixos-rebuild switch --flake .#windows";
   };
 
-  imports = [ 
-    ../../modules 
-    ../../user 
+  imports = [
+    ../../modules
+    ../../user
   ];
 
   home.stateVersion = "23.11";