Compare commits

..

No commits in common. "d97fea0e942de565ad74a57d01cabb920c46b2c0" and "8baa36909a37740d81d7dec11e6eac32fc579f8c" have entirely different histories.

2 changed files with 11 additions and 38 deletions

View File

@ -1,7 +1,6 @@
alias unlock="lpass show -c --password"
alias arduino-serial="busybox microcom -t 9600 /dev/ttyUSB0" alias arduino-serial="busybox microcom -t 9600 /dev/ttyUSB0"
alias grep='LC_ALL="C" grep' alias grep='LC_ALL="C" grep'
alias bt='transmission-remote' alias bt='transmission-remote'
alias dockviz="docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock nate/dockviz" alias dockviz="docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock nate/dockviz"
alias timestamp="date -u +'%Y%m%d%H%M%S'" alias timestamp="date -u +'%Y%m%d%H%M%S'"
alias http="http -F --session=/tmp/session"
alias otp="ykman oath accounts code"

View File

@ -5,14 +5,12 @@
(package-initialize) (package-initialize)
(add-to-list (add-to-list
'package-archives 'package-archives
'("melpa" . "http://melpa.org/packages/") '("melpa" . "http://melpa.milkbox.net/packages/")
t) t)
(custom-set-variables (custom-set-variables
;; custom-set-variables was added by Custom. ;; custom-set-variables was added by Custom -- don't edit or cut/paste it!
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(c-basic-offset 2) '(c-basic-offset 2)
'(c-tab-always-indent t) '(c-tab-always-indent t)
'(canlock-password "201dd6597717bea7c6569288a099ce4c838cd1a7") '(canlock-password "201dd6597717bea7c6569288a099ce4c838cd1a7")
@ -21,7 +19,6 @@
'(default-input-method "latin-1-prefix") '(default-input-method "latin-1-prefix")
'(global-font-lock-mode t nil (font-lock)) '(global-font-lock-mode t nil (font-lock))
'(make-backup-files nil) '(make-backup-files nil)
'(package-selected-packages (quote (py-autopep8 lua-mode go-mode)))
'(pc-select-meta-moves-sexps t) '(pc-select-meta-moves-sexps t)
'(pc-select-selection-keys-only t) '(pc-select-selection-keys-only t)
'(pc-selection-mode t t) '(pc-selection-mode t t)
@ -30,10 +27,8 @@
'(transient-mark-mode t) '(transient-mark-mode t)
'(version-control (quote never))) '(version-control (quote never)))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom -- don't edit or cut/paste it!
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(mmm-default-submode-face ((t nil)))) '(mmm-default-submode-face ((t nil))))
(put 'narrow-to-region 'disabled nil) (put 'narrow-to-region 'disabled nil)
@ -42,10 +37,10 @@
;; General custom variables ;; General custom variables
(setq require-final-newline 't) (setq require-final-newline 't)
(set-language-environment "UTF-8") (set-language-environment "UTF-8")
(setq inhibit-eol-conversion 't)
;; Kill GUI elements ;; Kill GUI elements
(menu-bar-mode 0) (menu-bar-mode -1)
(tool-bar-mode -1)
;; *** Programming ;; *** Programming
(global-set-key (kbd "C-x g") 'goto-line) (global-set-key (kbd "C-x g") 'goto-line)
@ -56,32 +51,11 @@
(setq-default tab-width 4) (setq-default tab-width 4)
(setq-default python-indent-offset 2) (setq-default python-indent-offset 2)
(setq-default css-indent-offset 2) (setq-default css-indent-offset 2)
(setq js-indent-level 4)
(column-number-mode) (column-number-mode)
;; Use the right mode for Arduino sketches ;; Use the right mode for Arduino sketches
(add-to-list 'auto-mode-alist '("\\.ino\\'" . c++-mode)) (add-to-list 'auto-mode-alist '("\\.ino\\'" . c++-mode))
(add-to-list 'load-path "~/.emacs.d/lisp") (add-to-list 'load-path "~/.emacs.d/local/")
(require 'yaml-mode) (require 'kos-mode)
(require 'slim-mode) (setq kos-indent 2)
(require 'haml-mode)
;; Markdown support
(autoload 'markdown-mode "markdown-mode"
"Major mode for editing Markdown files" t)
(add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
(add-hook 'go-mode-hook
(lambda ()
(add-hook 'before-save-hook 'gofmt-before-save)
(setq tab-width 2)
(setq indent-tabs-mode 0)))
(require 'py-autopep8)
(add-hook 'python-mode-hook 'py-autopep8-enable-on-save)
;; (require 'kos-mode)
;; (setq kos-indent 2)