update
This commit is contained in:
parent
0cf03d25d8
commit
924ec15b2a
4 changed files with 14 additions and 2 deletions
|
|
@ -15,6 +15,7 @@
|
|||
[[default]]
|
||||
[[[child1]]]
|
||||
parent = window0
|
||||
profile = default
|
||||
type = Terminal
|
||||
[[[window0]]]
|
||||
parent = ""
|
||||
|
|
@ -27,6 +28,7 @@
|
|||
background_type = transparent
|
||||
font = Droid Sans Mono Dotted 15
|
||||
foreground_color = "#ffffff"
|
||||
scroll_on_output = False
|
||||
scrollback_infinite = True
|
||||
scrollbar_position = hidden
|
||||
show_titlebar = False
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
;; (package-initialize)
|
||||
|
||||
(setq gc-cons-threshold 100000000)
|
||||
(defconst spacemacs-version "0.105.8" "Spacemacs version.")
|
||||
(defconst spacemacs-version "0.105.20" "Spacemacs version.")
|
||||
(defconst spacemacs-emacs-min-version "24.3" "Minimal version of Emacs.")
|
||||
|
||||
(if (not (version<= spacemacs-emacs-min-version emacs-version))
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
submodule-pull = submodule foreach git pull
|
||||
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
|
||||
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
|
||||
praise = blame
|
||||
|
||||
[diff]
|
||||
renamelimit = 0
|
||||
|
|
|
|||
11
.spacemacs
11
.spacemacs
|
|
@ -50,6 +50,7 @@ values."
|
|||
dotspacemacs-additional-packages '(
|
||||
s
|
||||
protobuf-mode
|
||||
systemd
|
||||
)
|
||||
;; A list of packages and/or extensions that will not be install and loaded.
|
||||
dotspacemacs-excluded-packages '(
|
||||
|
|
@ -294,6 +295,10 @@ BUFFER may be either a buffer or its name (a string)."
|
|||
(setq flycheck-display-error 0.2)
|
||||
(setq x-gtk-use-system-tooltips nil)
|
||||
(setq flycheck-display-errors-function 'flycheck-display-error-messages-unless-error-list)
|
||||
(setq vc-ignore-dir-regexp
|
||||
(format "\\(%s\\)\\|\\(%s\\)"
|
||||
vc-ignore-dir-regexp
|
||||
tramp-file-name-regexp))
|
||||
|
||||
(setq tramp-ssh-controlmaster-options "-o ControlMaster=auto -o ControlPath='tramp.%%C' -o ControlPersist=no")
|
||||
|
||||
|
|
@ -359,7 +364,11 @@ BUFFER may be either a buffer or its name (a string)."
|
|||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
'(org-support-shift-select (quote always))
|
||||
'(safe-local-variable-values (quote ((eval setenv "GOPATH" "/home/barak/src/agro")))))
|
||||
'(safe-local-variable-values
|
||||
(quote
|
||||
((eval setenv "GOPATH" "/home/barak/src/cayley")
|
||||
(eval setenv "GOPATH" "/home/barak/src/livemd")
|
||||
(eval setenv "GOPATH" "/home/barak/src/agro")))))
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue