various updates
This commit is contained in:
parent
f8bba57269
commit
6841031dea
9 changed files with 72 additions and 45 deletions
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"coc-go": ">=0.6.2",
|
||||
"coc-json": ">=1.2.5",
|
||||
"coc-python": ">=1.2.9",
|
||||
"coc-snippets": ">=2.1.19"
|
||||
"coc-json": ">=1.2.6",
|
||||
"coc-python": ">=1.2.12",
|
||||
"coc-snippets": ">=2.1.26"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<property name="shortcuts-icon-size" type="empty"/>
|
||||
<property name="last-view" type="string" value="ThunarIconView"/>
|
||||
<property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_75_PERCENT"/>
|
||||
<property name="last-window-width" type="int" value="1276"/>
|
||||
<property name="last-window-width" type="int" value="1916"/>
|
||||
<property name="last-window-height" type="int" value="2131"/>
|
||||
<property name="last-window-maximized" type="bool" value="false"/>
|
||||
<property name="last-location-bar" type="string" value="ThunarLocationEntry"/>
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
<property name="unredirect_overlays" type="bool" value="true"/>
|
||||
<property name="urgent_blink" type="bool" value="false"/>
|
||||
<property name="use_compositing" type="bool" value="true"/>
|
||||
<property name="workspace_count" type="int" value="4"/>
|
||||
<property name="workspace_count" type="int" value="1"/>
|
||||
<property name="wrap_cycle" type="bool" value="true"/>
|
||||
<property name="wrap_layout" type="bool" value="true"/>
|
||||
<property name="workspace_names" type="array">
|
||||
|
|
|
|||
|
|
@ -1,35 +1,53 @@
|
|||
;;; init.el --- Spacemacs Initialization File
|
||||
;;; init.el -*- lexical-binding: t; -*-
|
||||
;;
|
||||
;; Copyright (c) 2012-2016 Sylvain Benner & Contributors
|
||||
;; Author: Henrik Lissner <henrik@lissner.net>
|
||||
;; URL: https://github.com/hlissner/doom-emacs
|
||||
;;
|
||||
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
||||
;; URL: https://github.com/syl20bnr/spacemacs
|
||||
;; ================= =============== =============== ======== ========
|
||||
;; \\ . . . . . . .\\ //. . . . . . .\\ //. . . . . . .\\ \\. . .\\// . . //
|
||||
;; ||. . ._____. . .|| ||. . ._____. . .|| ||. . ._____. . .|| || . . .\/ . . .||
|
||||
;; || . .|| ||. . || || . .|| ||. . || || . .|| ||. . || ||. . . . . . . ||
|
||||
;; ||. . || || . .|| ||. . || || . .|| ||. . || || . .|| || . | . . . . .||
|
||||
;; || . .|| ||. _-|| ||-_ .|| ||. . || || . .|| ||. _-|| ||-_.|\ . . . . ||
|
||||
;; ||. . || ||-' || || `-|| || . .|| ||. . || ||-' || || `|\_ . .|. .||
|
||||
;; || . _|| || || || || ||_ . || || . _|| || || || |\ `-_/| . ||
|
||||
;; ||_-' || .|/ || || \|. || `-_|| ||_-' || .|/ || || | \ / |-_.||
|
||||
;; || ||_-' || || `-_|| || || ||_-' || || | \ / | `||
|
||||
;; || `' || || `' || || `' || || | \ / | ||
|
||||
;; || .===' `===. .==='.`===. .===' /==. | \/ | ||
|
||||
;; || .==' \_|-_ `===. .===' _|_ `===. .===' _-|/ `== \/ | ||
|
||||
;; || .==' _-' `-_ `=' _-' `-_ `=' _-' `-_ /| \/ | ||
|
||||
;; || .==' _-' '-__\._-' '-_./__-' `' |. /| | ||
|
||||
;; ||.==' _-' `' | /==.||
|
||||
;; ==' _-' \/ `==
|
||||
;; \ _-' `-_ /
|
||||
;; `'' ``'
|
||||
;;
|
||||
;; This file is not part of GNU Emacs.
|
||||
;; These demons are not part of GNU Emacs.
|
||||
;;
|
||||
;;; License: GPLv3
|
||||
;;; License: MIT
|
||||
|
||||
;; Without this comment emacs25 adds (package-initialize) here
|
||||
;; (package-initialize)
|
||||
;; A big contributor to startup times is garbage collection. We up the gc
|
||||
;; threshold to temporarily prevent it from running, then reset it later by
|
||||
;; enabling `gcmh-mode'. Not resetting it will cause stuttering/freezes.
|
||||
(setq gc-cons-threshold most-positive-fixnum)
|
||||
|
||||
;; Increase gc-cons-threshold, depending on your system you may set it back to a
|
||||
;; lower value in your dotfile (function `dotspacemacs/user-config')
|
||||
(setq gc-cons-threshold 100000000)
|
||||
;; In noninteractive sessions, prioritize non-byte-compiled source files to
|
||||
;; prevent the use of stale byte-code. Otherwise, it saves us a little IO time
|
||||
;; to skip the mtime checks on every *.elc file.
|
||||
(setq load-prefer-newer noninteractive)
|
||||
|
||||
(defconst spacemacs-version "0.200.3" "Spacemacs version.")
|
||||
(defconst spacemacs-emacs-min-version "24.4" "Minimal version of Emacs.")
|
||||
(let (file-name-handler-alist)
|
||||
;; Ensure Doom is running out of this file's directory
|
||||
(setq user-emacs-directory (file-name-directory load-file-name)))
|
||||
|
||||
(if (not (version<= spacemacs-emacs-min-version emacs-version))
|
||||
(message (concat "Your version of Emacs (%s) is too old. "
|
||||
"Spacemacs requires Emacs version %s or above.")
|
||||
emacs-version spacemacs-emacs-min-version)
|
||||
(load-file (concat (file-name-directory load-file-name)
|
||||
"core/core-load-paths.el"))
|
||||
(require 'core-spacemacs)
|
||||
(spacemacs/init)
|
||||
(spacemacs/maybe-install-dotfile)
|
||||
(configuration-layer/sync)
|
||||
(spacemacs-buffer/display-info-box)
|
||||
(spacemacs/setup-startup-hook)
|
||||
(require 'server)
|
||||
(unless (server-running-p) (server-start)))
|
||||
;; Load the heart of Doom Emacs
|
||||
(load (concat user-emacs-directory "core/core")
|
||||
nil 'nomessage)
|
||||
|
||||
;; And let 'er rip!
|
||||
(doom-initialize)
|
||||
(if noninteractive
|
||||
(doom-initialize-packages)
|
||||
(doom-initialize-core)
|
||||
(doom-initialize-modules))
|
||||
|
|
|
|||
|
|
@ -249,7 +249,6 @@ This requires library `rainbow-mode'.")
|
|||
;nil
|
||||
;'(("\\<\\(\\(0[xX]\\|0[bB]\\)?-?[0-9a-fA-F]+\\.?[0-9]*?[fFlL]?\\)\\>" 1 '((t (:foreground "#E3AC3D")))))))))
|
||||
|
||||
(provide-theme 'barak)
|
||||
|
||||
;;;###autoload
|
||||
;; (add-to-list 'safe-local-eval-forms
|
||||
|
|
@ -260,3 +259,7 @@ This requires library `rainbow-mode'.")
|
|||
;; indent-tabs-mode: nil
|
||||
;; eval: (when (require 'rainbow-mode nil t) (rainbow-mode 1))
|
||||
;; End:
|
||||
|
||||
(provide-theme 'barak)
|
||||
(provide 'barak-theme)
|
||||
;;; barak-theme ends here
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
/home/bmichener/.fonts
|
||||
/home/barak/.fonts
|
||||
|
|
@ -55,3 +55,6 @@ set -g visual-activity on
|
|||
|
||||
# Highlighting the active window in status bar
|
||||
setw -g window-status-current-style bg=red,bright
|
||||
|
||||
setw -g aggressive-resize on
|
||||
setw -g window-size largest
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ au! BufNewFile,BufRead *.pde setf arduino
|
|||
augroup org
|
||||
" leave these as is:
|
||||
au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
|
||||
au BufRead,BufNewFile *.org call org#SetOrgFileType()
|
||||
"au BufRead,BufNewFile *.org call org#SetOrgFileType()
|
||||
au BufRead,BufNewFile *.org :GitGutterDisable
|
||||
au BufRead *.org :PreLoadTags
|
||||
au BufWrite *.org :PreWriteTags
|
||||
au BufWritePost *.org :PostWriteTags
|
||||
"au BufRead *.org :PreLoadTags
|
||||
"au BufWrite *.org :PreWriteTags
|
||||
"au BufWritePost *.org :PostWriteTags
|
||||
augroup END
|
||||
|
||||
au BufNewFile,BufRead motd.public,/tmp/motd.public.r.* setf motd
|
||||
|
|
|
|||
15
.vimrc
15
.vimrc
|
|
@ -112,7 +112,8 @@ Plug 'ambv/black'
|
|||
Plug 'kana/vim-textobj-user'
|
||||
|
||||
" Plugins I wish I used more
|
||||
Plug 'hsitz/VimOrganizer'
|
||||
"Plug 'hsitz/VimOrganizer'
|
||||
Plug 'jceb/vim-orgmode'
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'tpope/vim-unimpaired'
|
||||
Plug 'b4winckler/vim-angry'
|
||||
|
|
@ -165,6 +166,7 @@ Plug 'Shougo/context_filetype.vim'
|
|||
Plug 'idris-hackers/idris-vim', {'for': 'idris'}
|
||||
Plug 'derekwyatt/vim-scala', {'for': 'scala'}
|
||||
Plug 'hwayne/tla.vim'
|
||||
Plug 'zchee/vim-goasm'
|
||||
|
||||
" Plugins that autocomplete
|
||||
"Plug 'Shougo/deoplete.nvim'
|
||||
|
|
@ -199,6 +201,7 @@ Plug 'lervag/vimtex'
|
|||
|
||||
" Unclear
|
||||
Plug 'ncm2/float-preview.nvim'
|
||||
Plug 'tomasiser/vim-code-dark'
|
||||
|
||||
call plug#end()
|
||||
|
||||
|
|
@ -234,7 +237,7 @@ autocmd InsertLeave * if pumvisible() == 0|pclose|endif
|
|||
"source ~/.vim/supertab.vim
|
||||
"source ~/.vim/charm.vim
|
||||
"source ~/.vim/plugin/AppleT.vim
|
||||
source ~/.vim/vim-lsp-conf.vim
|
||||
"source ~/.vim/vim-lsp-conf.vim
|
||||
runtime macros/matchit.vim
|
||||
|
||||
" Completion features (TODO: Add to filetype.vim)
|
||||
|
|
@ -244,13 +247,13 @@ autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags
|
|||
"autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
|
||||
|
||||
" Set filetype for VimOrganizer
|
||||
au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
|
||||
au BufEnter *.org call org#SetOrgFileType()
|
||||
"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
|
||||
"au BufEnter *.org call org#SetOrgFileType()
|
||||
|
||||
"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
|
||||
"au BufEnter *.org call org#SetOrgFileType()
|
||||
command! OrgCapture :call org#CaptureBuffer()
|
||||
command! OrgCaptureFile :call org#OpenCaptureFile()
|
||||
"command! OrgCapture :call org#CaptureBuffer()
|
||||
"command! OrgCaptureFile :call org#OpenCaptureFile()
|
||||
|
||||
" Cull trailing whitespace for all files.
|
||||
autocmd BufWritePre * :call AutoTrimWhitespace()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue