Skip to content

Commit 03e8483

Browse files
author
Stephan Badragan
committed
more small changes and scripts
1 parent b6f8dd3 commit 03e8483

File tree

9 files changed

+106
-5
lines changed

9 files changed

+106
-5
lines changed

.config/Code/User/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,6 @@
8585
"vim.easymotionMarkerFontFamily": "Input Mono",
8686
"vim.easymotionMarkerForegroundColorOneChar": "black",
8787
"vim.easymotionMarkerForegroundColorTwoChar": "black",
88-
"vim.easymotionMarkerFontSize": "12"
88+
"vim.easymotionMarkerFontSize": "12",
89+
"editor.minimap.enabled": false
8990
}

.config/nvim/init.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Plug 'scrooloose/nerdcommenter'
143143
Plug 'easymotion/vim-easymotion'
144144

145145
"Plug 'lambdalisue/vim-gita'
146-
Plug 'tpope/vim-fugitive'
146+
"Plug 'tpope/vim-fugitive'
147147

148148
Plug 'ryanoasis/vim-devicons'
149149

.spacemacs

+10-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ values."
3131
;; List of configuration layers to load.
3232
dotspacemacs-configuration-layers
3333
'(
34+
javascript
3435
;; ----------------------------------------------------------------
3536
;; Example of useful layers you may want to use right away.
3637
;; Uncomment some layer names and press <SPC f e R> (Vim style) or
@@ -50,12 +51,16 @@ values."
5051
syntax-checking
5152
version-control
5253
themes-megapack
54+
javascript
5355
)
5456
;; List of additional packages that will be installed without being
5557
;; wrapped in a layer. If you need some configuration for these
5658
;; packages, then consider creating a layer. You can also put the
5759
;; configuration in `dotspacemacs/user-config'.
58-
dotspacemacs-additional-packages '()
60+
dotspacemacs-additional-packages
61+
'(
62+
prettier-js
63+
)
5964
;; A list of packages that cannot be updated.
6065
dotspacemacs-frozen-packages '()
6166
;; A list of packages that will not be installed and loaded.
@@ -134,7 +139,7 @@ values."
134139
dotspacemacs-colorize-cursor-according-to-state t
135140
;; Default font, or prioritized list of fonts. `powerline-scale' allows to
136141
;; quickly tweak the mode-line size to make separators look not too crappy.
137-
dotspacemacs-default-font '("Source Code Pro"
142+
dotspacemacs-default-font '("Input Mono"
138143
:size 13
139144
:weight normal
140145
:width normal
@@ -321,6 +326,8 @@ layers configuration.
321326
This is the place where most of your configurations should be done. Unless it is
322327
explicitly specified that a variable should be set before a package is loaded,
323328
you should place your code here."
329+
(add-hook 'js2-mode-hook 'prettier-js-mode)
330+
(add-hook 'web-mode-hook 'prettier-js-mode)
324331
)
325332

326333
;; Do not write anything past this comment. This is where Emacs will
@@ -333,7 +340,7 @@ you should place your code here."
333340
'(evil-want-Y-yank-to-eol nil)
334341
'(package-selected-packages
335342
(quote
336-
(zenburn-theme zen-and-art-theme white-sand-theme underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme toxi-theme tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme seti-theme reverse-theme rebecca-theme railscasts-theme purple-haze-theme professional-theme planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme organic-green-theme omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme naquadah-theme mustang-theme monokai-theme monochrome-theme molokai-theme moe-theme minimal-theme material-theme majapahit-theme madhat2r-theme lush-theme light-soap-theme jbeans-theme jazz-theme ir-black-theme inkpot-theme heroku-theme hemisu-theme hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme gandalf-theme flatui-theme flatland-theme farmhouse-theme exotica-theme espresso-theme dracula-theme django-theme darktooth-theme autothemer darkokai-theme darkmine-theme darkburn-theme dakrone-theme cyberpunk-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme cherry-blossom-theme busybee-theme bubbleberry-theme birds-of-paradise-plus-theme badwolf-theme apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes afternoon-theme xterm-color unfill smeargle shell-pop orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download mwim multi-term mmm-mode markdown-toc markdown-mode magit-gitflow magit-popup htmlize helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md fuzzy flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck evil-magit magit transient git-commit with-editor eshell-z eshell-prompt-extras esh-help diff-hl company-statistics company auto-yasnippet yasnippet auto-dictionary ac-ispell auto-complete ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra lv hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile projectile pkg-info epl helm-mode-manager helm-make helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist highlight evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))))
343+
(web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor multiple-cursors js2-mode js-doc company-tern dash-functional tern coffee-mode prettier-js zenburn-theme zen-and-art-theme white-sand-theme underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme toxi-theme tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme seti-theme reverse-theme rebecca-theme railscasts-theme purple-haze-theme professional-theme planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme organic-green-theme omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme naquadah-theme mustang-theme monokai-theme monochrome-theme molokai-theme moe-theme minimal-theme material-theme majapahit-theme madhat2r-theme lush-theme light-soap-theme jbeans-theme jazz-theme ir-black-theme inkpot-theme heroku-theme hemisu-theme hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme gandalf-theme flatui-theme flatland-theme farmhouse-theme exotica-theme espresso-theme dracula-theme django-theme darktooth-theme autothemer darkokai-theme darkmine-theme darkburn-theme dakrone-theme cyberpunk-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme cherry-blossom-theme busybee-theme bubbleberry-theme birds-of-paradise-plus-theme badwolf-theme apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes afternoon-theme xterm-color unfill smeargle shell-pop orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download mwim multi-term mmm-mode markdown-toc markdown-mode magit-gitflow magit-popup htmlize helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md fuzzy flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck evil-magit magit transient git-commit with-editor eshell-z eshell-prompt-extras esh-help diff-hl company-statistics company auto-yasnippet yasnippet auto-dictionary ac-ispell auto-complete ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra lv hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile projectile pkg-info epl helm-mode-manager helm-make helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist highlight evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))))
337344
(custom-set-faces
338345
;; custom-set-faces was added by Custom.
339346
;; If you edit it by hand, you could mess it up, so be careful.

.tmux.conf

+9
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,14 @@ set-option -g mouse on
4646
bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'"
4747
bind -n WheelDownPane select-pane -t= \; send-keys -M
4848

49+
# status bar ---------------------------------------------
50+
4951
# see https://github.com/edkolev/tmuxline.vim
5052
source-file ~/.tmux/airline_theme.tmux
5153

54+
# based on: tmux show-options -g | grep status
55+
set-option status-right "#[fg=colour254,bg=colour24,nobold,nounderscore,noitalics]#[fg=colour240,bg=colour254] #h "
56+
5257
# key bindings ---------------------------------------------
5358

5459
# add PageUp as prefix
@@ -71,6 +76,10 @@ bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel
7176
unbind f
7277
bind-key f run "tmux list-windows -F \"##I:##W\" | fzf-tmux | cut -d \":\" -f 1 | xargs tmux select-window -t"
7378

79+
# window creation, create
80+
unbind c
81+
bind-key -T prefix c command-prompt -p "Name of new window: " "new-window -a -n '%%'"
82+
7483
# Has to stay at bottom of file --------------------------
7584
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
7685
run -b '~/.tmux/plugins/tpm/tpm'

.zshrc

+1
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ case $OS in
160160
export JAVA_HOME=$(/usr/libexec/java_home)
161161
export HOMEBREW_NO_GITHUB_API=1
162162
export DISABLE_AUTO_TITLE='true' # for tmuxp
163+
export GROOVY_HOME=/usr/local/opt/groovy/libexec
163164
;;
164165
Linux)
165166
;;

bin/confirm

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
echo "Are you sure (y/n)? "
4+
read answer
5+
6+
if [ "$answer" != "${answer#[Yy]}" ] ;then
7+
exit 0
8+
else
9+
exit 1
10+
fi
11+

bin/git-up-xmdev

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
3+
read -p "Run git pull --rebase in xmdev projects? " -n 1 -r
4+
echo # (optional) move to a new line
5+
if [[ $REPLY =~ ^[Yy]$ ]]
6+
then
7+
cd ~/ondemand
8+
git pull --rebase
9+
10+
cd ~/xm-database
11+
git stash
12+
git pull --rebase
13+
git stash pop
14+
15+
cd ~/xm-api
16+
git pull --rebase
17+
fi

bin/kill-tmux-session

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/usr/bin/env sh
2+
3+
session=$1
4+
5+
echo "Are you sure you want to kill session '${session}' (y/n)? "
6+
read answer
7+
8+
if [ "$answer" == "${answer#[Yy]}" ] ;then
9+
echo "exiting '${answer}'"
10+
exit 1
11+
fi
12+
13+
sessiontest=`tmux ls | grep ${session}`
14+
15+
if [ "${sessiontest}" == "" ];
16+
then
17+
echo no running session ${session}
18+
else
19+
for name in `tmux list-windows -F '#{window_name}' -t ${session}` ; do
20+
21+
tmux select-window -n
22+
23+
for pane in `tmux list-panes -F '#{pane_id}' -t ${session}` ; do
24+
tmux send-keys -t $pane C-c
25+
# send SIGINT to all panes in selected window
26+
echo ${session}:$name.${pane//%}
27+
done
28+
29+
for pane in `tmux list-panes -F '#{pane_pid}' -t ${session}` ; do
30+
kill -TERM ${pane}
31+
# terminate pane
32+
done
33+
done
34+
fi
35+
36+
echo list-sessions:
37+
tmux list-sessions

bin/xmdev-rebuild

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
3+
echo "Do you wish to rebuild xmdev (y/n)? "
4+
read answer
5+
6+
if [ "$answer" != "${answer#[Yy]}" ] ;then
7+
echo "\nMaking sure postres docker started ................." &&
8+
docker start postgres && sleep 10 &&
9+
echo "\nApplying DB Patches ................." &&
10+
cd ~/xm-database &&
11+
./gradlew applyDbPatches &&
12+
13+
echo "\nRebuild onDemand ...................." &&
14+
cd ~/ondemand &&
15+
./gradlew linkWebui
16+
#./gradlew clean build -x test
17+
fi
18+

0 commit comments

Comments
 (0)