Merge branch 'main' of github.com:edthedev/dotfiles into main

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 992e3ae0b7b0325d9c1af560494e20745ccc576a..2780358526871692519b231dd85906e4754cf365 100644 (file)
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,13 +2,14 @@
   "peacock.color": "#215732",
   "python.pythonPath": "/usr/bin/python3",
   "workbench.colorCustomizations": {
-    "activityBar.activeBackground": "#2f7c47",
     "activityBar.activeBorder": "#422c74",
+    "activityBar.activeBackground": "#2f7c47",
     "activityBar.background": "#2f7c47",
     "activityBar.foreground": "#e7e7e7",
     "activityBar.inactiveForeground": "#e7e7e799",
     "activityBarBadge.background": "#422c74",
     "activityBarBadge.foreground": "#e7e7e7",
+    "commandCenter.border": "#e7e7e799",
     "sash.hoverBorder": "#2f7c47",
     "statusBar.background": "#215732",
     "statusBar.foreground": "#e7e7e7",
@@ -18,7 +19,7 @@
     "titleBar.activeBackground": "#215732",
     "titleBar.activeForeground": "#e7e7e7",
     "titleBar.inactiveBackground": "#21573299",
-    "titleBar.inactiveForeground": "#e7e7e799",
-    "commandCenter.border": "#e7e7e799"
-  }
+    "titleBar.inactiveForeground": "#e7e7e799"
+  },
+  "peacock.remoteColor": "#215732"
 }
\ No newline at end of file

diff --git a/install/vscode.sh b/install/vscode.sh
old mode 100644 (file)
new mode 100755 (executable)
index e8faee0..9964937
--- a/install/vscode.sh
+++ b/install/vscode.sh
@@ -1 +1,2 @@
-sudo apt install -y wget
\ No newline at end of file
+sudo apt install -y wget
+echo "Make sure the VSCode is on the path and run `code .` to finish."
\ No newline at end of file

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 46da273520f83fd385d933a8525d4a51f4619e7f..1633f5f9ff83d12a634e535cc61a75cef1d72473 100755 (executable)
--- a/setup_cli_basics.sh
+++ b/setup_cli_basics.sh
@@ -13,18 +13,18 @@ if [ ! -f ~/.screenrc ]; then
        ln -s ~/dotfiles/files/screenrc ~/.screenrc
 fi
 
-if [ -f ~/.vimrc ]; then
-       echo "************** Link Vimrc"
-       ln -s ~/dotfiles/files/vimrc ~/.vimrc
-       echo "************** Configure Git to use Vim"
-       git config --global core.editor /usr/bin/vim
-fi
-
-if [ -f ~/.gitconfig ]; then
+if [ ! -f ~/.gitconfig ]; then
        echo "************** Configure Git user"
        git config --global user.email "edward@delaporte.us"
        git config --global user.name "Edward Delaporte"
        git config --global pull.ff only
+       git config --global core.editor /usr/bin/vi
+fi
+
+if [ ! -f ~/.vimrc ]; then
+       echo "************** Link Vimrc"
+       ln -s ~/dotfiles/files/vimrc ~/.vimrc
+       ls -a ~ | grep vim
 fi
 
 if [ ! -f ~/.ssh/id_ed25519 ]; then
@@ -33,6 +33,12 @@ if [ ! -f ~/.ssh/id_ed25519 ]; then
 
        echo "************** Reminder to setup GitHub key"
        cat ~/dotfiles/doc/GitHubKey.md
-       cat ~/.ssh/id_rsa.pub
+       cat ~/.ssh/id_ed25519.pub
 fi
 
+echo "************** Status: Symlinks "
+ls -la ~ | grep "\->"
+echo "************** Status: Git Config"
+cat ~/.gitconfig
+echo "************** Status: Pubkey "
+cat ~/.ssh/id_ed25519.pub
\ No newline at end of file