commit ff114ea518be6653bebb3a9860aa1679dc41ee1b parent 19e3ded736900ec03c1541094144c5760990046e Author: Yohanes Bandung Bondowoso <hi@ybbond.dev> Date: Mon, 27 Jul 2020 00:56:52 +0700 update all and add gitconfig Diffstat:
| M | .config/nvim/coc-settings.json | | | 1 | + |
| M | .config/nvim/init.vim | | | 2 | ++ |
| M | .doom.d/+org.el | | | 10 | ++++++---- |
| A | .gitconfig | | | 32 | ++++++++++++++++++++++++++++++++ |
| M | .zshrc | | | 4 | ++-- |
| M | Library/Application Support/Sublime Text/Packages/User/Default (OSX).sublime-keymap | | | 58 | +++++++++++++++++++++++++++++++++++++++++++--------------- |
| M | Library/Application Support/Sublime Text/Packages/User/Preferences.sublime-settings | | | 5 | ++++- |
7 files changed, 90 insertions(+), 22 deletions(-)
diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json @@ -14,6 +14,7 @@ "prettier.tslintIntegration": true, "prettier.ignorePath": ".prettierignore", "tsserver.npm": "/usr/local/bin/npm", + "tsserver.locale": "/usr/local/bin/tsserver", "languageserver": { "ccls": { "command": "ccls", diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim @@ -40,6 +40,8 @@ call plug#begin(s:plugin_location) " *vim-easymotion* " Plug 'easymotion/vim-easymotion' + + " *vim-sneak* Plug 'justinmk/vim-sneak' " *vim-airline* diff --git a/.doom.d/+org.el b/.doom.d/+org.el @@ -5,14 +5,15 @@ (use-package! org-roam :hook (after-init . org-roam-mode)) -(setq org_notes "~/Library/Mobile Documents/com\~apple\~CloudDocs/Notes") -; (setq org_notes "~/Notes") +; (setq org_notes "~/Library/Mobile Documents/com\~apple\~CloudDocs/Notes") + (setq org_notes "~/org/Notes") (after! org-roam (add-hook 'after-init-hook 'org-roam-mode) :config (setq org-roam-directory org_notes) - (setq org-roam-db-location "~/Library/Mobile Documents/com\~apple\~CloudDocs/Notes/org-roam.db") + ; (setq org-roam-db-location "~/Library/Mobile Documents/com\~apple\~CloudDocs/Notes/org-roam.db") + (setq org-roam-db-location "~/org/org-roam.db") (setq org-roam-graph-viewer "/usr/bin/open") (setq org-roam-capture-ref-templates '(("r" "ref" plain (function org-roam-capture--get-point) @@ -102,7 +103,8 @@ ("C-c b" . org-journal-previous-entry) ("C-c f" . org-journal-next-entry) :config - (setq org-journal-dir "~/Library/Mobile Documents/com\~apple\~CloudDocs/Notes/journals/" + ; (setq org-journal-dir "~/Library/Mobile Documents/com\~apple\~CloudDocs/Notes/journals/" + (setq org-journal-dir "~/org/Notes/journals/" org-journal-date-prefix "#+title: " org-journal-file-format "%Y-%m-%d.org" org-journal-date-format "%A, %d %B %Y\n#+roam_tags: journals\n" diff --git a/.gitconfig b/.gitconfig @@ -0,0 +1,32 @@ +[alias] + s = status -s + b = branch --sort=-committerdate + rv = remote -v + co = checkout + cb = checkout -B + cm = checkout master + cane = commit --amend --no-edit + pumr = pull upstream master --rebase + pomr = pull origin master --rebase + pum = pull upstream master + pom = pull origin master + histi = "--no-pager log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short --max-count=20" + ; histi = "log --pretty=format:'%C(yellow)[%ad]%C(reset) %C(green)[%h]%C(reset) | %C(red)%s %C(bold red){{%an}}%C(reset) %C(blue)%d%C(reset)' --graph --date=short --max-count=20" + hist = "--no-pager log --pretty=format:'%C(yellow)%h%C(reset) %C(green)%ad%C(reset) | %C(reset)%s %C(bold)[%an]%C(reset) %C(blue)%d%C(reset)' --graph --date=short --max-count=20" +[user] + name = Yohanes Bandung Bondowoso + email = hi@ybbond.dev + signingkey = 56DAADB152461C806792DBAB84773B93988681A0 +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true +[gpg] + program = /usr/local/bin/gpg +[core] + excludesfile = /Users/yohanesbandung/.gitignore_global +[commit] + template = /Users/yohanesbandung/.stCommitMsg +[fetch] + prune = false diff --git a/.zshrc b/.zshrc @@ -26,8 +26,8 @@ export PATH="$HOME/.emacs.d/bin:$PATH" # export INITVIM=$HOME/.config/nvim/init.vim # export PATH=$HOME/bin:$PATH -export JAVA_HOME="/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home" export ANDROID_HOME=${HOME}/Library/Android/sdk +export JAVA_HOME=/Applications/Android\ Studio.app/Contents/jre/jdk/Contents/Home export PATH=${PATH}:${ANDROID_HOME}/emulator export PATH=${PATH}:${ANDROID_HOME}/tool export PATH="${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools" @@ -147,7 +147,7 @@ alias lg="lazygit" # misc alias ld="lazydocker" alias r="ranger" -alias nexus5x="~/Library/Android/sdk/emulator/emulator -avd Nexus_5X_API_28 -netdelay none -netspeed full" +alias pixel3a="~/Library/Android/sdk/emulator/emulator -avd Pixel_3a_API_29 -netdelay none -netspeed full" alias cdb="cd .." alias konak="kantal 10 yarn add" diff --git a/Library/Application Support/Sublime Text/Packages/User/Default (OSX).sublime-keymap b/Library/Application Support/Sublime Text/Packages/User/Default (OSX).sublime-keymap @@ -17,21 +17,47 @@ "args": {"mode": "mode_command"}, "context": [{"key": "vi_command_mode_aware"}] }, - { - "keys": ["g", "d"], - "command": "lsp_symbol_definition", - "context": [{"key": "setting.lsp_active"}] - }, - { - "keys": ["g", "s"], - "command": "lsp_document_symbols", - "context": [{"key": "setting.lsp_active"}] - }, - { - "keys": ["g", "h"], - "command": "lsp_hover", - "context": [{"key": "setting.lsp_active"}] - }, + // { + // "keys": ["g", "d"], + // "command": "lsp_symbol_definition", + // "context": [ + // {"key": "vi_command_mode_aware"}, + // { + // "key": "lsp.session_with_capability", + // "operator": "equal", + // "operand": "definitionProvider" + // }, + // { + // "key": "auto_complete_visible", + // "operator": "equal", + // "operand": false + // } + // ] + // }, + // { + // "keys": ["g", "s"], + // "command": "lsp_document_symbols", + // "context": [ + // {"key": "vi_command_mode_aware"}, + // { + // "key": "lsp.session_with_capability", + // "operator": "equal", + // "operand": "documentSymbolProvider" + // } + // ] + // }, + // { + // "keys": ["g", "h"], + // "command": "lsp_hover", + // "context": [ + // {"key": "vi_command_mode_aware"}, + // { + // "key": "lsp.session_with_capability", + // "operator": "equal", + // "operand": "hoverProvider" + // } + // ] + // }, { "keys": ["]", "C"], "command": "sublime_linter_goto_error", @@ -40,6 +66,8 @@ "wrap": true } }, + { "keys": ["ctrl+shift+tab"], "command": "prev_view" }, + { "keys": ["ctrl+tab"], "command": "next_view" }, { "keys": ["ctrl+super+r"], "command": "sublime_linter_line_report" diff --git a/Library/Application Support/Sublime Text/Packages/User/Preferences.sublime-settings b/Library/Application Support/Sublime Text/Packages/User/Preferences.sublime-settings @@ -14,7 +14,7 @@ "drag_text": false, "draw_white_space": "all", "font_face": "IBM Plex Mono", - "font_size": 12, + "font_size": 14, "highlight_line": true, "highlight_modified_tabs": true, "hot_exit": "disabled", @@ -31,7 +31,9 @@ "index_skip_unknown_extensions": false, "install_prereleases": ["NeoVintageous"], "match_brackets_angle": true, + "mini_diff": "auto", "relative_line_numbers": true, + "detect_indentation": false, "shift_tab_unindent": true, "show_indentation": false, "tab_size": 2, @@ -43,6 +45,7 @@ "neovintageous_search_occ_style": "outline", "vintage_start_in_command_mode": true, "vintageous_enable_sneak": true, + "vintageous_enable_multiple_cursors": false, "vintageous_i_escape_jk": true, "vintageous_reset_mode_when_switching_tabs": false, "vintageous_use_ctrl_keys": true,