Browse Source

add slim vim & spacemacs systemd service

Josh Bicking 3 years ago
parent
commit
0ab228b5f6

+ 1 - 1
.gitmodules

@@ -2,7 +2,7 @@
 	path = antigen/.antigen
 	url = https://github.com/zsh-users/antigen
 [submodule "old/vim/.vim/bundle/Vundle.vim"]
-	path = old/vim/.vim/bundle/Vundle.vim
+	path = vim/.vim/bundle/Vundle.vim
 	url = https://github.com/VundleVim/Vundle.vim
 [submodule "spacemacs/.emacs.d"]
 	path = spacemacs/.emacs.d

+ 0 - 10
old/vim/.vim/.netrwhist

@@ -1,10 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =8
-let g:netrw_dirhist_1='/home/josh'
-let g:netrw_dirhist_2='/home'
-let g:netrw_dirhist_3='/home/josh'
-let g:netrw_dirhist_4='/home/josh/fallout-terminal-clone'
-let g:netrw_dirhist_5='/etc/NetworkManager/system-connections'
-let g:netrw_dirhist_6='/home/josh/.config/mpv'
-let g:netrw_dirhist_7='/home/josh/.config/kdebackup'
-let g:netrw_dirhist_8='/home/josh/dotfiles/zsh-local-pi'

+ 0 - 147
old/vim/.vim/bundle/ycm_extra_conf.py

@@ -1,147 +0,0 @@
-# This file is NOT licensed under the GPLv3, which is the license for the rest
-# of YouCompleteMe.
-#
-# Here's the license text for this file:
-#
-# This is free and unencumbered software released into the public domain.
-#
-# Anyone is free to copy, modify, publish, use, compile, sell, or
-# distribute this software, either in source code form or as a compiled
-# binary, for any purpose, commercial or non-commercial, and by any
-# means.
-#
-# In jurisdictions that recognize copyright laws, the author or authors
-# of this software dedicate any and all copyright interest in the
-# software to the public domain. We make this dedication for the benefit
-# of the public at large and to the detriment of our heirs and
-# successors. We intend this dedication to be an overt act of
-# relinquishment in perpetuity of all present and future rights to this
-# software under copyright law.
-#
-# 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 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.
-#
-# For more information, please refer to <http://unlicense.org/>
-
-import os
-import ycm_core
-
-# These are the compilation flags that will be used in case there's no
-# compilation database set (by default, one is not set).
-# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR.
-flags = [
-'-Wall',
-'-Wextra',
-'ggdb',
-'-std=c99',
-'-pedantic'
-]
-
-
-# Set this to the absolute path to the folder (NOT the file!) containing the
-# compile_commands.json file to use that instead of 'flags'. See here for
-# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
-#
-# You can get CMake to generate this file for you by adding:
-#   set( CMAKE_EXPORT_COMPILE_COMMANDS 1 )
-# to your CMakeLists.txt file.
-#
-# Most projects will NOT need to set this to anything; you can just change the
-# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
-compilation_database_folder = ''
-
-if os.path.exists( compilation_database_folder ):
-  database = ycm_core.CompilationDatabase( compilation_database_folder )
-else:
-  database = None
-
-SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
-
-def DirectoryOfThisScript():
-  return os.path.dirname( os.path.abspath( __file__ ) )
-
-
-def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
-  if not working_directory:
-    return list( flags )
-  new_flags = []
-  make_next_absolute = False
-  path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
-  for flag in flags:
-    new_flag = flag
-
-    if make_next_absolute:
-      make_next_absolute = False
-      if not flag.startswith( '/' ):
-        new_flag = os.path.join( working_directory, flag )
-
-    for path_flag in path_flags:
-      if flag == path_flag:
-        make_next_absolute = True
-        break
-
-      if flag.startswith( path_flag ):
-        path = flag[ len( path_flag ): ]
-        new_flag = path_flag + os.path.join( working_directory, path )
-        break
-
-    if new_flag:
-      new_flags.append( new_flag )
-  return new_flags
-
-
-def IsHeaderFile( filename ):
-  extension = os.path.splitext( filename )[ 1 ]
-  return extension in [ '.h', '.hxx', '.hpp', '.hh' ]
-
-
-def GetCompilationInfoForFile( filename ):
-  # The compilation_commands.json file generated by CMake does not have entries
-  # for header files. So we do our best by asking the db for flags for a
-  # corresponding source file, if any. If one exists, the flags for that file
-  # should be good enough.
-  if IsHeaderFile( filename ):
-    basename = os.path.splitext( filename )[ 0 ]
-    for extension in SOURCE_EXTENSIONS:
-      replacement_file = basename + extension
-      if os.path.exists( replacement_file ):
-        compilation_info = database.GetCompilationInfoForFile(
-          replacement_file )
-        if compilation_info.compiler_flags_:
-          return compilation_info
-    return None
-  return database.GetCompilationInfoForFile( filename )
-
-
-def FlagsForFile( filename, **kwargs ):
-  if database:
-    # Bear in mind that compilation_info.compiler_flags_ does NOT return a
-    # python list, but a "list-like" StringVec object
-    compilation_info = GetCompilationInfoForFile( filename )
-    if not compilation_info:
-      return None
-
-    final_flags = MakeRelativePathsInFlagsAbsolute(
-      compilation_info.compiler_flags_,
-      compilation_info.compiler_working_dir_ )
-
-    # NOTE: This is just for YouCompleteMe; it's highly likely that your project
-    # does NOT need to remove the stdlib flag. DO NOT USE THIS IN YOUR
-    # ycm_extra_conf IF YOU'RE NOT 100% SURE YOU NEED IT.
-    try:
-      final_flags.remove( '-stdlib=libc++' )
-    except ValueError:
-      pass
-  else:
-    relative_to = DirectoryOfThisScript()
-    final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
-
-  return {
-    'flags': final_flags,
-    'do_cache': True
-  }

+ 5 - 1
profile/.profile

@@ -35,5 +35,9 @@ pathappend "$HOME/bin"
 pathappend "$HOME/.local/bin"
 pathappend "$HOME/.cargo/bin"
 pathappend "$HOME/.poetry/bin"
+pathappend "/usr/lib/go-1.12/bin"
+pathappend "/usr/local/go/bin"
+pathappend "/usr/sbin"
+
+# export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src/"
 
-export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src/"

+ 1 - 0
spacemacs/.config/systemd/user/default.target.wants/emacs.service

@@ -0,0 +1 @@
+/home/josh/.config/systemd/user/emacs.service

+ 11 - 0
spacemacs/.config/systemd/user/emacs.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Emacs Daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/emacs --daemon
+ExecStop=/usr/bin/emacsclient --eval "(progn (setq kill-emacs-hook 'nil) (kill-emacs))"
+Restart=always
+
+[Install]
+WantedBy=default.target

File diff suppressed because it is too large
+ 1 - 0
spacemacs/.spacemacs


+ 0 - 0
old/vim/.config/nvim → vim/.config/nvim


+ 0 - 0
old/vim/.gvimrc → vim/.gvimrc


+ 0 - 0
old/vim/.vim/CapsEsc.ahk → vim/.vim/CapsEsc.ahk


+ 0 - 0
old/vim/.vim/autoload/pathogen.vim → vim/.vim/autoload/pathogen.vim


+ 0 - 0
old/vim/.vim/bundle/Vundle.vim → vim/.vim/bundle/Vundle.vim


+ 0 - 0
old/vim/.vim/init.vim → vim/.vim/init.vim


+ 0 - 0
old/vim/.vim/undodir/.gitignore → vim/.vim/undodir/.gitignore


+ 20 - 18
old/vim/.vimrc → vim/.vimrc

@@ -2,6 +2,7 @@
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
+if isdirectory(expand('~/.vim/bundle/Vundle.vim'))
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
@@ -37,6 +38,7 @@ filetype plugin indent on    " required
 "
 " see :h vundle for more details or wiki for FAQ
 " Put your non-Plugin stuff after this line
+endif
 
 
 " space is Leader
@@ -67,24 +69,24 @@ set expandtab " tabs are spaces
 
 """ Numbering
 
-set number " show line numbers
-
-set rnu " show relative line numbers
-
-" toggle relative line nums when focus is gained/lost
-:au FocusLost * :set norelativenumber
-:au FocusGained * :set relativenumber
-
-" map C-n to toggle line nums
-function! NumberToggle()
-    if(&relativenumber == 1)
-        set norelativenumber
-    else
-        set relativenumber
-    endif
-endfunc
-
-nnoremap <Leader>n :call NumberToggle()<CR>
+"set number " show line numbers
+"
+"set rnu " show relative line numbers
+"
+"" toggle relative line nums when focus is gained/lost
+":au FocusLost * :set norelativenumber
+":au FocusGained * :set relativenumber
+"
+"" map C-n to toggle line nums
+"function! NumberToggle()
+"    if(&relativenumber == 1)
+"        set norelativenumber
+"    else
+"        set relativenumber
+"    endif
+"endfunc
+"
+"nnoremap <Leader>n :call NumberToggle()<CR>
 
 
 """ Command menu and Searching

Some files were not shown because too many files changed in this diff