Merge branch 'main' of github.com:heypoom/dotfiles

heypoom · Aug 30, 2024 · eddd68c · eddd68c
2 parents cbf8b89 + 0b6553d
commit eddd68c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/config/dot_config/vscode-nvim/init.lua b/config/dot_config/vscode-nvim/init.lua
@@ -120,7 +120,3 @@ require("lazy").setup({
 -- setup unnamed clipboard
 -- https://github.com/vscode-neovim/vscode-neovim/issues/298
 vim.opt.clipboard:append("unnamedplus")
-
-if vim.g.vscode then
-	--- vscode-only configuration
-end
diff --git a/config/dot_gitconfig.tmpl b/config/dot_gitconfig.tmpl
@@ -3,6 +3,9 @@
   name = {{ .full_name | quote }}
   signingkey = {{ .git.signing_key | quote }}
 
+[alias]
+  undo = reset --soft HEAD^
+
 [credential]
   helper = osxkeychain
 

diff --git a/config/vscode/settings.json b/config/vscode/settings.json
@@ -103,6 +103,8 @@
   },
   "workbench.startupEditor": "newUntitledFile",
   "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.formatOnSave": true,
     "editor.formatOnType": true
   },
   "editor.suggestSelection": "first",
@@ -314,5 +316,6 @@
   "zig.initialSetupDone": true,
   "github.copilot.editor.enableCodeActions": false,
   "github.copilot.renameSuggestions.triggerAutomatically": false,
-  "supermaven.otherWarning": false
+  "supermaven.otherWarning": false,
+  "vscode-neovim.compositeKeys": {}
 }