updated dotiles

Signed-off-by: Michael Skrynski <zlorfi@gmail.com>
2019-07-05 13:32:52 +02:00
parent 1f9079246e
commit e35256f98b
7 changed files with 98 additions and 18 deletions
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,5 +1,5 @@
 # setting defualt editor
-set -U EDITOR vim
+set EDITOR vim

 # setting PATH for rbenv
 # set PATH /usr/local/var/rbenv/shims $PATH
@@ -22,14 +22,21 @@ set GREP_OPTIONS '--color=auto'
 set GREP_COLOR '1;32'

 # setting locale
- set -x LC_ALL 'en_US.UTF-8'
- set -x LANG 'en_US.UTF-8'
+set -x LC_ALL 'en_US.UTF-8'
+set -x LANG 'en_US.UTF-8'
+
+# define GOPATH
+set -x -U GOPATH $HOME/Documents/workspace_go
+
+# setting GPG
+set GPG_TTY /dev/ttys001

 # set abbveriations
 if status --is-interactive
    set -g fish_user_abbreviations
    abbr --add wtm 'cd ~/Documents/workspace_tm'
    abbr --add obc 'cd ~/Documents/workspace_tm/obc'
+    abbr --add tix 'cd ~/Documents/workspace_tm/amadeus_api/'
    abbr --add gst 'git status'
    abbr --add gd 'git diff'
    abbr --add ga 'git add .'
@@ -55,3 +62,4 @@ end
 # disable login greeting
 set fish_greeting ''
 set -g fish_user_paths "/usr/local/opt/mysql@5.5/bin" $fish_user_paths
+set -g fish_user_paths "/usr/local/opt/node@10/bin" $fish_user_paths
--- a/fish/fish_variables
+++ b/fish/fish_variables
@@ -0,0 +1,61 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR EDITOR:vim
+SETUVAR --export --path GOPATH:/Users/michi/Documents/workspace_go
+SETUVAR --export LANG:en_US\x2eUTF\x2d8
+SETUVAR --export LC_ALL:en_US\x2eUTF\x2d8
+SETUVAR __fish_classic_git_prompt_initialized:\x1d
+SETUVAR __fish_init_2_39_8:\x1d
+SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR _fish_abbr_bb:brew\x20update\x3b\x20and\x20brew\x20outdated
+SETUVAR _fish_abbr_bx:bundle\x20exec
+SETUVAR _fish_abbr_bxrc:bundle\x20exec\x20rails\x20c
+SETUVAR _fish_abbr_bxrs:bundle\x20exec\x20rails\x20s
+SETUVAR _fish_abbr_cloud:cd\x20\x7e/Library/Mobile\x5c\x20Documents/com\x7eapple\x7eCloudDocs
+SETUVAR _fish_abbr_ga:git\x20add\x20\x2e
+SETUVAR _fish_abbr_gb:git\x20branch
+SETUVAR _fish_abbr_gba:git\x20branch\x20\x2da
+SETUVAR _fish_abbr_gc:git\x20commit\x20\x2dv
+SETUVAR _fish_abbr_gc_21_:git\x20commit\x20\x2d\x2damend
+SETUVAR _fish_abbr_gca:git\x20commit\x20\x2dv\x20\x2da
+SETUVAR _fish_abbr_gco:git\x20checkout
+SETUVAR _fish_abbr_gcount:git\x20shortlog\x20\x2dsn
+SETUVAR _fish_abbr_gcp:git\x20cherry\x2dpick
+SETUVAR _fish_abbr_gd:git\x20diff
+SETUVAR _fish_abbr_gl:git\x20pull
+SETUVAR _fish_abbr_glg:git\x20log\x20\x2d\x2dstat\x20\x2d\x2dmax\x2dcount\x3d5
+SETUVAR _fish_abbr_gp:git\x20push
+SETUVAR _fish_abbr_gst:git\x20status
+SETUVAR _fish_abbr_gup:git\x20fetch\x20\x26\x26\x20git\x20rebase
+SETUVAR _fish_abbr_obc:cd\x20\x7e/Documents/workspace_tm/obc
+SETUVAR _fish_abbr_tix:cd\x20\x7e/Documents/workspace_tm/amadeus_api/
+SETUVAR _fish_abbr_wtm:cd\x20\x7e/Documents/workspace_tm
+SETUVAR fish_color_autosuggestion:93a1a1
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:586e75
+SETUVAR fish_color_comment:93a1a1
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:268bd2
+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_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:bryellow
+SETUVAR fish_color_param:657b83
+SETUVAR fish_color_quote:839496
+SETUVAR fish_color_redirection:6c71c4
+SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_completion:\x1d
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_user_abbreviations:\x1d
--- a/fish/functions/az_web.fish
+++ b/fish/functions/az_web.fish
@@ -0,0 +1,4 @@
+function az_web --description 'Use az web'
+  az aks browse --name aks-$argv --resource-group $argv
+end
+
--- a/17
+++ b/17
@@ -1,12 +1,13 @@
 [user]
-  name = Michael Skrynski
-  email = zlorfi@gmail.com
+	name = Michael Skrynski
+	email = zlorfi@gmail.com
+	signingkey = 555B96D159FC1BB5
 [push]
  default = simple
 [pull]
  rebase = true
 [core]
-  excludesfile = /Users/michi/.gitignore
+	excludesfile = /Users/michi/.gitignore
  editor = 'vim'
 [branch]
  autosetuprebase = always
@@ -14,3 +15,13 @@
  ui = auto
 [diff]
  tool = vimdiff
+[gpg]
+	program = gpg2
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true
+[commit]
+	template = /Users/michi/.stCommitMsg
--- a/make_my_dotfiles.sh
+++ b/make_my_dotfiles.sh
@@ -3,7 +3,7 @@
 # some variables
 _fish_shell="/usr/local/bin/fish"
 _homebrew=`which brew`
-_to_install="the_silver_searcher imagemagick postgresql rbenv redis ruby-build tmux unrar yasm youtube-dl elixir git git-flow vim --with-override-system-vi fish mysql@5.5 emacs node yarn chromedriver"
+_to_install="the_silver_searcher imagemagick postgresql rbenv redis ruby-build tmux unrar yasm youtube-dl elixir git git-flow vim --with-override-system-vi fish emacs node yarn chromedriver"

 # Generate symlinks for files
 for i in gemrc gitconfig gitignore gvimrc irbrc mongorc.js NERDTreeBookmarks rspec screenrc tmux.conf vimrc rubocop.yml spacemacs
--- a/4
+++ b/4
@@ -155,7 +155,7 @@ values."
   dotspacemacs-colorize-cursor-according-to-state t
   ;; Default font, or prioritized list of fonts. `powerline-scale' allows to
   ;; quickly tweak the mode-line size to make separators look not too crappy.
-   dotspacemacs-default-font '("Sauce Code Powerline"
+   dotspacemacs-default-font '("SauceCodePro Nerd Font Mono"
                               :size 15
                               :weight normal
                               :width normal
@@ -371,7 +371,7 @@ you should place your code here."
    ("fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" default)))
 '(package-selected-packages
   (quote
-    (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))))
+    (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.
--- a/vsc_settings.json
+++ b/vsc_settings.json
@@ -1,7 +1,6 @@
 {
    "telemetry.enableTelemetry": false,
    "telemetry.enableCrashReporter": false,
-    "workbench.colorTheme": "Visual Studio Dark",
    "git.autofetch": true,
    "editor.fontSize": 16,
    "editor.fontFamily": "Source Code Pro for Powerline",
@@ -14,12 +13,9 @@
    "git.path": "/usr/local/bin/git",
    "workbench.statusBar.feedback.visible": false,
    "githubPullRequests.telemetry.enabled": false,
-    "githubPullRequests.hosts": [
-        {
-            "host": "https://github.com",
-            "username": "oauth",
-            "token": "system"
-        }
-    ],
-    "javascript.updateImportsOnFileMove.enabled": "always"
+    "javascript.updateImportsOnFileMove.enabled": "always",
+    "breadcrumbs.enabled": true,
+    "workbench.colorTheme": "One Dark Pro Vivid",
+    "extensions.ignoreRecommendations": false,
+    "window.zoomLevel": 0
 }