diff --git a/config/configstore/update-notifier-npm.json b/config/configstore/update-notifier-npm.json index b36c513..3c7587d 100644 --- a/config/configstore/update-notifier-npm.json +++ b/config/configstore/update-notifier-npm.json @@ -1,4 +1,4 @@ { "optOut": false, - "lastUpdateCheck": 1573420147842 + "lastUpdateCheck": 1598354868785 } \ No newline at end of file diff --git a/config/fish/config.fish b/config/fish/config.fish index f499fbf..ed230d7 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -72,3 +72,4 @@ set -g fish_user_paths "/usr/local/sbin" $fish_user_paths # add kitty support # kitty + complete setup fish | source set -g fish_user_paths "/usr/local/opt/postgresql@9.5/bin" $fish_user_paths +set -g fish_user_paths "/usr/local/opt/imagemagick@6/bin" $fish_user_paths diff --git a/config/fish/fish_variables b/config/fish/fish_variables index 0f722b5..716d46d 100644 --- a/config/fish/fish_variables +++ b/config/fish/fish_variables @@ -8,6 +8,7 @@ SETUVAR __fish_classic_git_prompt_initialized:\x1d SETUVAR __fish_init_2_39_8:\x1d SETUVAR __fish_init_2_3_0:\x1d SETUVAR __fish_init_3_x:\x1d +SETUVAR __fish_initialized:3100 SETUVAR _fish_abbr_bb:brew\x20update\x3b\x20and\x20brew\x20outdated SETUVAR _fish_abbr_bx:bundle\x20exec SETUVAR _fish_abbr_bxrc:bundle\x20exec\x20rails\x20c @@ -46,6 +47,7 @@ SETUVAR fish_color_error:dc322f SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold SETUVAR fish_color_history_current:\x2d\x2dbold SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue SETUVAR fish_color_normal:normal SETUVAR fish_color_operator:bryellow diff --git a/gitconfig b/gitconfig index aa2cff2..4355f1d 100644 --- a/gitconfig +++ b/gitconfig @@ -19,9 +19,14 @@ program = gpg2 [difftool "sourcetree"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" - path = + path = [mergetool "sourcetree"] cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" trustExitCode = true [commit] template = /Users/michi/dotfiles/gitmessage +[filter "lfs"] + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f diff --git a/make_my_dotfiles.sh b/make_my_dotfiles.sh index 8e45f10..b6df0fd 100755 --- a/make_my_dotfiles.sh +++ b/make_my_dotfiles.sh @@ -8,7 +8,7 @@ _to_install="the_silver_searcher imagemagick postgresql@9.5 pgcli rbenv redis ru azure-cli octant openssl fzf go" # Generate symlinks for files -for i in gemrc gitconfig gitignore gvimrc irbrc mongorc.js NERDTreeBookmarks rspec screenrc tmux.conf vimrc rubocop.yml spacemacs +for i in gemrc gitconfig gitmessage gitignore gvimrc irbrc mongorc.js NERDTreeBookmarks rspec screenrc tmux.conf vimrc rubocop.yml spacemacs do if [ ! -f $HOME/.$i ] then diff --git a/rubocop.yml b/rubocop.yml index 9173968..7819eab 100644 --- a/rubocop.yml +++ b/rubocop.yml @@ -4,5 +4,5 @@ Style/Documentation: Style/FrozenStringLiteralComment: Enabled: false -Metrics/LineLength: +Layout/LineLength: Max: 120 diff --git a/settings.json b/settings.json index 20a9399..3dfff24 100644 --- a/settings.json +++ b/settings.json @@ -18,5 +18,8 @@ "files.trimTrailingWhitespace": true, "extensions.ignoreRecommendations": false, "terminal.integrated.shell.osx": "/usr/local/bin/fish", - "editor.minimap.enabled": false + "editor.minimap.enabled": false, + "explorer.confirmDragAndDrop": false, + "editor.tabSize": 2, + "javascript.updateImportsOnFileMove.enabled": "always" } \ No newline at end of file diff --git a/spacemacs b/spacemacs index 6b7434b..fa3a5ab 100644 --- a/spacemacs +++ b/spacemacs @@ -31,6 +31,8 @@ values." ;; List of configuration layers to load. dotspacemacs-configuration-layers '( + typescript + go ;; ---------------------------------------------------------------- ;; Example of useful layers you may want to use right away. ;; Uncomment some layer names and press (Vim style) or @@ -258,7 +260,7 @@ values." ;; A value from the range (0..100), in increasing opacity, which describes ;; the transparency level of a frame when it's inactive or deselected. ;; Transparency can be toggled through `toggle-transparency'. (default 90) - dotspacemacs-inactive-transparency 90 + dotspacemacs-inactive-transparency 60 ;; If non nil show the titles of transient states. (default t) dotspacemacs-show-transient-state-title t ;; If non nil show the color guide hint for transient state keys. (default t) @@ -371,7 +373,7 @@ you should place your code here." ("fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" default))) '(package-selected-packages (quote - (lv reformatter transient graphql treepy insert-shebang fish-mode company-shell csv-mode all-the-icons memoize sql-indent company-auctex auctex-latexmk auctex evil-commentary flycheck-elm elm-mode flycheck-pos-tip pos-tip yaml-mode git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter diff-hl web-mode web-beautify tagedit slim-mode scss-mode sass-mode rvm ruby-tools ruby-test-mode rubocop rspec-mode robe rbenv pug-mode projectile-rails rake inflections ob-elixir minitest livid-mode skewer-mode simple-httpd less-css-mode json-mode json-snatcher json-reformat js2-refactor multiple-cursors js2-mode js-doc helm-css-scss haml-mode flycheck-mix flycheck-credo flycheck feature-mode emmet-mode company-web web-completion-data company-tern dash-functional tern coffee-mode chruby bundler inf-ruby alchemist elixir-mode xterm-color unfill smeargle shell-pop reveal-in-osx-finder pbcopy osx-trash osx-dictionary 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 launchctl htmlize helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gh-md fuzzy flyspell-correct-helm flyspell-correct evil-magit magit magit-popup git-commit ghub let-alist with-editor eshell-z eshell-prompt-extras esh-help 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 hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl 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 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 highlight 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)))) + (tide typescript-mode go-guru go-eldoc company-go go-mode lv reformatter transient graphql treepy insert-shebang fish-mode company-shell csv-mode all-the-icons memoize sql-indent company-auctex auctex-latexmk auctex evil-commentary flycheck-elm elm-mode flycheck-pos-tip pos-tip yaml-mode git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter diff-hl web-mode web-beautify tagedit slim-mode scss-mode sass-mode rvm ruby-tools ruby-test-mode rubocop rspec-mode robe rbenv pug-mode projectile-rails rake inflections ob-elixir minitest livid-mode skewer-mode simple-httpd less-css-mode json-mode json-snatcher json-reformat js2-refactor multiple-cursors js2-mode js-doc helm-css-scss haml-mode flycheck-mix flycheck-credo flycheck feature-mode emmet-mode company-web web-completion-data company-tern dash-functional tern coffee-mode chruby bundler inf-ruby alchemist elixir-mode xterm-color unfill smeargle shell-pop reveal-in-osx-finder pbcopy osx-trash osx-dictionary 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 launchctl htmlize helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gh-md fuzzy flyspell-correct-helm flyspell-correct evil-magit magit magit-popup git-commit ghub let-alist with-editor eshell-z eshell-prompt-extras esh-help 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 hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl 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 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 highlight 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)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.