dotfiles

commit ff88d23cde4b39d5f3c08319020295a858f6cd8c
parent 2cdfc64d2e8554de3b8eb01b36b30e28a810a7bb
Author: Bharatvaj <bharatvaj@yahoo.com>
Date:   Mon, 30 May 2022 10:33:17 +0530

Merge branch 'windows' of github.com:bharatvaj/dotfiles into base

Diffstat:
M
.config/cmd/aliases.cmd
 | 
1
+
M
.config/cmd/profile.cmd
 | 
3
+++
A
.config/cmd/setup.cmd
 | 
6
++++++
M
.config/cmd/setup.ps1
 | 
4
+---
A
.config/vim/gvimrc
 | 
2
++
M
.config/vim/vimrc
 | 
15
++++++++-------

6 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/.config/cmd/aliases.cmd b/.config/cmd/aliases.cmd
@@ -2,4 +2,5 @@ doskey v=vim $*
 doskey vi=vim $*
 doskey n=nvim $*
 doskey g=git $*
+doskey e=%EDITOR% $*
 doskey l=%USERPROFILE%\.config\cmd\lfcd.cmd
diff --git a/.config/cmd/profile.cmd b/.config/cmd/profile.cmd
@@ -9,4 +9,7 @@ set XDG_CONFIG_HOME=%USERPROFILE%\.config
 set XDG_DATA_HOME=%USERPROFILE%\.local\share
 set XDG_CACHE_HOME=%USERPROFILE%\.cache
 
+set MYVIMRC=%XDG_CONFIG_HOME%\vim\vimrc
+set VIMINIT=source $MYVIMRC
+
 %USERPROFILE%\.config\cmd\aliases.cmd
diff --git a/.config/cmd/setup.cmd b/.config/cmd/setup.cmd
@@ -0,0 +1,6 @@
+powershell setup.ps1
+
+# Apply config patches
+xcopy %USERPROFILE%\.config\cmd\patch %USERPROFILE%\ /S /E
+
+mklink %USERPROFILE%\_vimrc %USERPROFILE%\.config\vim\vimrc
diff --git a/.config/cmd/setup.ps1 b/.config/cmd/setup.ps1
@@ -1,10 +1,8 @@
 Set-ExecutionPolicy RemoteSigned -scope CurrentUser
 
-# TODO Handle Admin user check
+#TODO Make this work for Administrator accounts
 Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
 
 # Install the absolute essentials
 scoop install $(gc ~/.config/cmd/packages.txt)
 
-# Apply config patches
-xcopy %USERPROFILE%\.config\cmd\patch %USERPROFILE% /E
diff --git a/.config/vim/gvimrc b/.config/vim/gvimrc
@@ -0,0 +1,2 @@
+set guifont=Fira\ Code\ SemiBold
+set guioptions=
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
@@ -83,14 +83,15 @@ augroup user_cmds
 	autocmd VimEnter * call timer_start(20, function('s:load_plugins'))
 augroup END
 
+if has("gui")
+	source $XDG_CONFIG_HOME/vim/gvimrc
+endif
+
 if has("win32")
-	if executable("pwsh")
-		set shell=pwsh
-		set shellcmdflag=-ExecutionPolicy\ RemoteSigned\ -Command
-		set shellquote=\" 
-		" shellxquote must be a literal space character.
-		set shellxquote=  
-	endif
+	set shell=cmd
+	set shellquote=\" 
+	" shellxquote must be a literal space character.
+	set shellxquote=  
 endif
 
 set path+=**