Browse Source

Merge branch 'master' of github.com:bixel/dotfiles

Kevin Heinicke 7 years ago
parent
commit
87ddeab2b9
15 changed files with 132 additions and 230 deletions
  1. 0 50
      atom/config.cson
  2. 0 1
      atom/github.cson
  3. 0 11
      atom/init.coffee
  4. 0 32
      atom/keymap.cson
  5. 0 21
      atom/markdown-preview-plus.cson
  6. 0 16
      atom/packages.cson
  7. 0 21
      atom/snippets.cson
  8. 0 32
      atom/styles.less
  9. 1 1
      flake8
  10. 0 5
      install.conf.yaml
  11. 1 0
      install_osx.conf.yaml
  12. 14 2
      nvimrc
  13. 0 21
      sshrc
  14. 101 0
      task.theme
  15. 15 17
      zshrc

+ 0 - 50
atom/config.cson

@@ -1,50 +0,0 @@
-"*":
-  "autocomplete-python":
-    useKite: false
-  core:
-    closeDeletedFileTabs: true
-    disabledPackages: [
-      "git-time-machine"
-      "markdown-preview"
-    ]
-    telemetryConsent: "no"
-    themes: [
-      "one-light-ui"
-      "solarized-light-syntax"
-    ]
-  editor:
-    autoIndentOnPaste: false
-    fontFamily: "Source Code Pro"
-    fontSize: 16
-    invisibles: {}
-  "exception-reporting":
-    userId: "f97fbf72-4900-4b83-9479-351989e3d1bc"
-  "git-diff":
-    showIconsInEditorGutter: true
-  "linter-ui-default":
-    panelHeight: 226
-  "markdown-preview-plus":
-    enableLatexRenderingByDefault: true
-  "minimap-plus":
-    absoluteMode: true
-    adjustAbsoluteModeHeight: true
-  "package-sync":
-    createOnChange: true
-    forceOverwrite: true
-  "split-diff":
-    diffWords: true
-    ignoreWhitespace: true
-    leftEditorColor: "red"
-    rightEditorColor: "green"
-    scrollSyncType: "Vertical + Horizontal"
-  "vim-mode-plus":
-    useSmartcaseForSearch: true
-  welcome:
-    showOnStartup: false
-  whitespace:
-    ensureSingleTrailingNewline: false
-    removeTrailingWhitespace: false
-  "you-complete-me":
-    globalExtraConfig: "~/.ycm_extra_conf.py"
-    pythonExecutable: "python3"
-    ycmdPath: "/Users/kheinicke/repos/ycmd/"

+ 0 - 1
atom/github.cson

@@ -1 +0,0 @@
-# Store non-visible GitHub package state.

+ 0 - 11
atom/init.coffee

@@ -1,11 +0,0 @@
-# Your init script
-#
-# Atom will evaluate this file each time a new window is opened. It is run
-# after packages are loaded/activated and after the previous editor state
-# has been restored.
-#
-# An example hack to log to the console when each text editor is saved.
-#
-# atom.workspace.observeTextEditors (editor) ->
-#   editor.onDidSave ->
-#     console.log "Saved! #{editor.getPath()}"

+ 0 - 32
atom/keymap.cson

@@ -1,32 +0,0 @@
-# Your keymap
-#
-# Atom keymaps work similarly to style sheets. Just as style sheets use
-# selectors to apply styles to elements, Atom keymaps use selectors to associate
-# keystrokes with events in specific contexts. Unlike style sheets however,
-# each selector can only be declared once.
-#
-# You can create a new keybinding in this file by typing "key" and then hitting
-# tab.
-#
-# Here's an example taken from Atom's built-in keymap:
-#
-# 'atom-text-editor':
-#   'enter': 'editor:newline'
-#
-# 'atom-workspace':
-#   'ctrl-shift-p': 'core:move-up'
-#   'ctrl-p': 'core:move-down'
-#
-# You can find more information about keymaps in these guides:
-# * http://flight-manual.atom.io/using-atom/sections/basic-customization/#_customizing_keybindings
-# * http://flight-manual.atom.io/behind-atom/sections/keymaps-in-depth/
-#
-# If you're having trouble with your keybindings not working, try the
-# Keybinding Resolver: `Cmd+.` on macOS and `Ctrl+.` on other platforms. See the
-# Debugging Guide for more information:
-# * http://flight-manual.atom.io/hacking-atom/sections/debugging/#check-the-keybindings
-#
-# This file uses CoffeeScript Object Notation (CSON).
-# If you are unfamiliar with CSON, you can read more about it in the
-# Atom Flight Manual:
-# http://flight-manual.atom.io/using-atom/sections/basic-customization/#_cson

+ 0 - 21
atom/markdown-preview-plus.cson

@@ -1,21 +0,0 @@
-# You can place LaTeX Macros here.
-# They are written as coffeescript objects in CSON.
-# So don't forget to escape your backslashes!
-# Here are some examples to get you going:
-
-# A zero argument macro
-# This is just an alias for \theta.
-
-# th: "{\\theta}" # Example usage: $\th$
-
-# A one argument macro
-# This one gives you "1 over something" as a fraction.
-
-# inv: ["{\\frac{1}{#1}}",1] # Example usage: $\inv{x}$
-
-# A two argument macro
-# This one gives you a fraction with nicely typeset parentheses on either side.
-
-# pfrac: ["{\\left(\\frac{#1}{#2}\\right)}",2] # Example usage: $\pfrac{x}{y}$
-
-# You can use up to 9 arguments like this!

+ 0 - 16
atom/packages.cson

@@ -1,16 +0,0 @@
-packages: [
-  "autocomplete-python"
-  "busy-signal"
-  "ex-mode"
-  "hyperclick"
-  "intentions"
-  "linter"
-  "linter-ui-default"
-  "markdown-preview-plus"
-  "minimap-plus"
-  "package-sync"
-  "scroll-through-time"
-  "underline-trailing-whitespace"
-  "vim-mode-plus"
-  "you-complete-me"
-]

+ 0 - 21
atom/snippets.cson

@@ -1,21 +0,0 @@
-# Your snippets
-#
-# Atom snippets allow you to enter a simple prefix in the editor and hit tab to
-# expand the prefix into a larger code block with templated values.
-#
-# You can create a new snippet in this file by typing "snip" and then hitting
-# tab.
-#
-# An example CoffeeScript snippet to expand log to console.log:
-#
-# '.source.coffee':
-#   'Console log':
-#     'prefix': 'log'
-#     'body': 'console.log $1'
-#
-# Each scope (e.g. '.source.coffee' above) can only be declared once.
-#
-# This file uses CoffeeScript Object Notation (CSON).
-# If you are unfamiliar with CSON, you can read more about it in the
-# Atom Flight Manual:
-# http://flight-manual.atom.io/using-atom/sections/basic-customization/#_cson

+ 0 - 32
atom/styles.less

@@ -1,32 +0,0 @@
-/*
- * Your Stylesheet
- *
- * This stylesheet is loaded when Atom starts up and is reloaded automatically
- * when it is changed and saved.
- *
- * Add your own CSS or Less to fully customize Atom.
- * If you are unfamiliar with Less, you can read more about it here:
- * http://lesscss.org
- */
-
-
-/*
- * Examples
- * (To see them, uncomment and save)
- */
-
-// style the background color of the tree view
-.tree-view {
-  // background-color: whitesmoke;
-}
-
-// style the background and foreground colors on the atom-text-editor-element itself
-atom-text-editor {
-  // color: white;
-  // background-color: hsl(180, 24%, 12%);
-}
-
-// style UI elements inside atom-text-editor
-atom-text-editor .cursor {
-  // border-color: red;
-}

+ 1 - 1
flake8

@@ -1,3 +1,3 @@
 [flake8]
 select = C,E,F,W,B,B950
-ignore = E501,F401
+ignore = E501,W503

+ 0 - 5
install.conf.yaml

@@ -28,9 +28,4 @@
     ~/.zprezto:
         relink: true
         path: external/prezto/
-    ~/.ssh/rc: sshrc
-    ~/.atom:
-        relink: true
-        path: atom/
-        create: true
     ~/.gitignore_global: gitignore_global

+ 1 - 0
install_osx.conf.yaml

@@ -8,3 +8,4 @@
 
 - link:
     /usr/local/bin/syncIgnore: scripts/syncIgnore
+    ~/.latexmkrc: latexmkrc

+ 14 - 2
nvimrc

@@ -185,10 +185,22 @@ set list
 
 " use latex flavour for plaintex files
 let g:tex_flavour="latex"
+
 " set some default options for my personal latexmk
 let g:vimtex_compiler_progname="nvr"
-let g:vimtex_view_general_viewer = 'open'
-let g:vimtex_view_general_options = '-a Skim'
+let g:vimtex_view_method = 'skim'
+" let g:vimtex_view_general_viewer = 'open'
+" let g:vimtex_view_general_options = '-a Skim'
+
+let g:vimtex_compiler_latexmk={
+    \ 'options' : [
+    \   '-lualatex',
+    \   '-silent',
+    \   '-synctex=1',
+    \   '-interaction=nonstopmode',
+    \ ],
+    \ 'build_dir' : 'livepreview',
+    \}
 
 " use deoplete
 let g:deoplete#enable_at_startup = 1

+ 0 - 21
sshrc

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# based on/using http://stackoverflow.com/questions/21378569 and
-# https://gist.github.com/martijnvermaat/8070533
-
-# Fix SSH auth socket location so agent forwarding works with tmux
-if test "$SSH_AUTH_SOCK" ; then
-  ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
-fi
-
-# Taken from the sshd(8) manpage.
-if read proto cookie && [ -n "$DISPLAY" ]; then
-    if [ `echo $DISPLAY | cut -c1-10` = 'localhost:' ]; then
-            # X11UseLocalhost=yes
-            echo add unix:`echo $DISPLAY |
-                cut -c11-` $proto $cookie
-    else
-            # X11UseLocalhost=no
-            echo add $DISPLAY $proto $cookie
-    fi | xauth -q -
-fi

+ 101 - 0
task.theme

@@ -0,0 +1,101 @@
+###############################################################################
+#
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# http://www.opensource.org/licenses/mit-license.php
+#
+###############################################################################
+
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
+
+# This is a theme that disables all default colors
+# It can be used as template for other themes
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=
+color.header=
+color.footnote=
+color.warning=
+color.error=
+color.debug=
+
+# Task state
+color.completed=
+color.deleted=
+color.active=
+color.recurring=
+color.scheduled=
+color.until=
+color.blocked=
+color.blocking=
+
+# Project
+color.project.none=
+
+# Priority
+color.uda.priority.H=
+color.uda.priority.L=
+color.uda.priority.M=
+
+# Tags
+color.tag.next=
+color.tag.none=
+color.tagged=
+
+# Due
+color.due=
+color.due.today=
+color.overdue=
+
+# Report: burndown
+color.burndown.done=on white
+color.burndown.pending=on Red
+color.burndown.started=on Yellow
+
+# Report: history
+color.history.add=
+color.history.delete=
+color.history.done=
+
+# Report: summary
+color.summary.background=
+color.summary.bar=
+
+# Command: calendar
+color.calendar.due=
+color.calendar.due.today=
+color.calendar.holiday=
+color.calendar.overdue=
+color.calendar.today=
+color.calendar.weekend=
+color.calendar.weeknumber=
+
+# Command: sync
+color.sync.added=
+color.sync.changed=
+color.sync.rejected=
+
+# Command: undo
+color.undo.after=
+color.undo.before=
+

+ 15 - 17
zshrc

@@ -19,7 +19,7 @@ fi
 # random string function
 random-string()
 {
-  LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom | fold -w ${1:-32} | head -n 1
+  LC_ALL=C tr -dc A-Za-z0-9 < /dev/urandom | fold -w ${1:-32} | head -n 1
 }
 
 # make code printable with pandocs
@@ -49,22 +49,6 @@ mountremote () {
   unset mountpoint
 }
 
-# use the symlinked ssh-auth-sock if inside tmux session otherwise update the
-# symlink
-# if [[ -f "$HOME/.ssh/ssh_auth_sock" ]]; then
-#     export SSH_AUTH_SOCK=$HOME/.ssh/ssh_auth_sock;
-# fi
-
-# if we have a working socket, everything is fine
-if [[ -f "$SSH_AUT_SOCK" ]]; then
-    # if the socket is working, symlink it for other uses
-    if ssh-add -l; then
-        ln -sf $SSH_AUTH_SOCK $HOME/.ssh/ssh_auth_sock;
-    fi
-elif [[ -f "$HOME/.ssh/ssh_auth_sock" ]]; then
-    export SSH_AUTH_SOCK=$HOME/.ssh/ssh_auth_sock
-fi
-
 # make the clipboard working on remote
 if [[ -n "$SSH_CLIENT" ]]; then
   SSH_IP=$(echo $SSH_CLIENT | awk '{print $1}')
@@ -96,3 +80,17 @@ fi
 if [[ -n "$ITERM_INTEGRATION" && -f ~/.iterm2_shell_integration.zsh ]]; then
   test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
 fi
+
+# a new attempt to forward ssh sockets to tmux
+
+if [[ -n "$SSH_AUTH_SOCK" ]]; then
+    # based on/using http://stackoverflow.com/questions/21378569 and
+    # https://gist.github.com/martijnvermaat/8070533
+
+    # Fix SSH auth socket location so agent forwarding works with tmux
+    if [[ -z "$TMUX" ]] ; then
+        ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
+    else
+        export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock
+    fi
+fi