ソースを参照

remove tons of old stuff

Josh Bicking 6 年 前
コミット
443c94b87e

+ 2 - 2
.gitmodules

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

+ 3 - 8
bash/.bashrc

@@ -17,14 +17,9 @@ eval $(dircolors ~/.dircolors)
 # grep the entirety of the history
 alias hg='history | grep'
 
-# Use vim as the default text editor
-export VISUAL=vim
+# Use emacs as the default text editor
+export EDITOR="emacsclient -t"
+export VISUAL="emacsclient -c -a emacs"
 
 # local folder in PATH
 export PATH=$HOME/bin:$PATH
-
-# Terminal Emacs
-alias emacs-term='\emacs -nw --color=no'
-
-# alias for vim muscle memory when quitting
-alias :q='exit'

+ 0 - 0
emacs/.emacs.d/.gitignore → old/emacs/.emacs.d/.gitignore


+ 0 - 0
emacs/.emacs.d/init.el → old/emacs/.emacs.d/init.el


+ 0 - 0
emacs/.emacs.d/packages/packages.el → old/emacs/.emacs.d/packages/packages.el


+ 0 - 0
emacs/.emacs.d/packages/prettify-custom-symbols.el → old/emacs/.emacs.d/packages/prettify-custom-symbols.el


+ 0 - 0
emacs/.local/share/applications/emacs-client.desktop → old/emacs/.local/share/applications/emacs-client.desktop


+ 0 - 0
i3/.i3/config → old/i3/.i3/config


+ 0 - 0
i3/.i3/config.purple → old/i3/.i3/config.purple


+ 0 - 0
i3/.i3/gnome.sh → old/i3/.i3/gnome.sh


+ 0 - 0
i3/.i3/i3exit → old/i3/.i3/i3exit


+ 0 - 0
i3/.i3/i3status → old/i3/.i3/i3status


+ 0 - 0
i3/.i3/rofi.sh → old/i3/.i3/rofi.sh


+ 0 - 0
i3/.i3/togglecompton.sh → old/i3/.i3/togglecompton.sh


+ 0 - 0
i3/.i3/toggletouchpad.sh → old/i3/.i3/toggletouchpad.sh


+ 0 - 0
kde-xmonad/.config/kglobalshortcutsrc → old/kde-xmonad/.config/kglobalshortcutsrc


+ 0 - 0
kde-xmonad/.config/konsolerc → old/kde-xmonad/.config/konsolerc


+ 0 - 0
kde-xmonad/.config/plasma-workspace/env/set_window_manager.sh → old/kde-xmonad/.config/plasma-workspace/env/set_window_manager.sh


+ 0 - 0
makedots.sh → old/makedots.sh


+ 0 - 0
rmdots.sh → old/rmdots.sh


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


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


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

@@ -0,0 +1,10 @@
+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 - 0
vim/.vim/CapsEsc.ahk → old/vim/.vim/CapsEsc.ahk


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


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


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


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


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


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


+ 0 - 0
xmonad/.xmobarrc → old/xmonad/.xmobarrc


+ 0 - 0
xmonad/.xmonad/.gitignore → old/xmonad/.xmonad/.gitignore


+ 0 - 0
xmonad/.xmonad/xmonad.hs → old/xmonad/.xmonad/xmonad.hs


+ 15 - 0
spacemacs/.local/share/applications/emacs-client.desktop

@@ -0,0 +1,15 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Version=1.0
+Name=GNU Emacs (Client)
+GenericName=Text Editor
+Comment=GNU Emacs is an extensible, customizable text editor - and more
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+TryExec=/usr/bin/emacsclient
+Exec=/usr/bin/emacsclient -c %F
+Icon=emacs25
+Type=Application
+Terminal=false
+Categories=Utility;Development;TextEditor;
+StartupWMClass=Emacs
+Keywords=Text;Editor;

+ 5 - 0
spacemacs/.spacemacs

@@ -314,6 +314,11 @@ layers configuration.
 This is the place where most of your configurations should be done. Unless it is
 explicitly specified that a variable should be set before a package is loaded,
 you should place your code here."
+  (setq undo-tree-auto-save-history t
+        undo-tree-history-directory-alist
+        `(("." . ,(concat spacemacs-cache-directory "undo"))))
+  (unless (file-exists-p (concat spacemacs-cache-directory "undo"))
+    (make-directory (concat spacemacs-cache-directory "undo")))
   )
 
 ;; Do not write anything past this comment. This is where Emacs will

+ 0 - 21
zsh-local-arch/.zshrc.local

@@ -6,15 +6,6 @@ export DEVKITPRO=/home/josh/devkitPro/
 export DEVKITPPC=${DEVKITPRO}/devkitPPC
 export DEVKITARM=${DEVKITPRO}/devkitARM
 
-# local bin in PATH
-export PATH=$HOME/bin:$PATH
-
-# clang in PATH
-export PATH=/usr/lib/ccache/bin/:$PATH
-
-# stack software in PATH
-export PATH=$HOME/.local/bin:$PATH
-
 # DOOM config
 alias doom='dosbox -conf .dosbox/dosbox-0.74-doom.conf'
 
@@ -27,18 +18,6 @@ export ANDROID_HOME=/opt/android-sdk
 # go
 export GOPATH=/home/josh/go
 
-# Use ccache when compiling
-export PATH="/usr/lib/ccache/bin/:$PATH"
-
-# # Emacs as a daemon
-export ALTERNATE_EDITOR=""
-export EDITOR="emacsclient -t"                  # $EDITOR should open in terminal
-export VISUAL="emacsclient -c -a emacs"         # $VISUAL opens in GUI with non-daemon as alternate
-
-alias emacs='emacsclient -c'
-
-alias beep='paplay /usr/share/sounds/gnome/default/alerts/glass.ogg'
-
 # pyenv
 export PATH="/home/josh/.pyenv/bin:$PATH"
 eval "$(pyenv init -)"

+ 0 - 8
zsh-local-pi/.zshrc.local

@@ -1,8 +0,0 @@
-# ls pleasantness for the pi
-alias l='\ls --color=auto'
-alias ls='ls --color=auto'
-alias la='ls -a --color=auto'
-alias lsa='ls -a --color=auto'
-alias lls='ls -lh --color=auto'
-alias ll='ls -lh --color=auto'
-

+ 1 - 10
zsh-local-server/.zshrc.local

@@ -1,10 +1 @@
-# apt-get aliases 
-alias update='sudo apt-get update && sudo apt-get dist-upgrade' 
-alias clean='sudo apt-get clean'
-
-alias zork='sudo ttyecho -n /dev/tty7'
-
-export PATH=$PATH:$HOME/bin
-export PATH=$PATH:/home/josh/.local/bin
-
-export EDITOR='emacs-term'
+alias zork='sudo ttyecho -n /dev/tty7'

+ 0 - 7
zsh-local-tablet/.zshrc.local

@@ -1,10 +1,3 @@
-# apt-get aliases 
-alias update='sudo apt-get update && sudo apt-get dist-upgrade' 
-alias clean='sudo apt-get clean'
-
 # devkit
 export DEVKITPRO=/mnt/data/devkitPro
 export DEVKITARM=${DEVKITPRO}/devkitARM
-
-# emacs on CS machines
-alias emacsbeatles='ssh -Y [email protected] emacs'

+ 6 - 21
zsh/.zshrc

@@ -1,6 +1,9 @@
 # local zsh config
 source ~/.zshrc.local
 
+export PATH=$PATH:$HOME/bin
+export PATH=$PATH:$HOME/.local/bin
+
 # load antigen if it exists
 if [ -h ~/.antigen.zsh ]
 then
@@ -68,21 +71,15 @@ alias ll='ls -lh --color=auto'
 # Custom ls colors
 eval $(dircolors ~/.dircolors)
 
-# Use vim as the default text editor
-export VISUAL=vim
+# Use emacsclient as the default text editor
+export EDITOR="emacsclient -t"
+export VISUAL="emacsclient -c -a emacs"
 
 # eval used by thefuck
 if hash fuck 2>/dev/null; then
     eval $(thefuck --alias)
 fi
 
-# timestamp alias for dates
-alias ts='date +%y-%m-%d'
-
-# alias for getting latest file in a folder
-alias latest='ls -t | head -n 1'
-
-
 # Home and End keys jump the the beginning/end of the command
 bindkey "^[OH" beginning-of-line
 bindkey "^[[H" beginning-of-line
@@ -101,18 +98,6 @@ function cd {
     builtin cd "$@" && ls -F
 }
 
-# Editor defaults
-export EDITOR=emacs
-export VISUAL=emacs
-
-# Terminal Emacs
-alias emacs-term='\emacs -nw'
-
-# Vim and vi bindings
-
-# alias for vim muscle memory when quitting
-alias :q='exit'
-
 function sl_func() {
     # sl - prints a mirror image of ls. (C) 2017 Tobias Girstmair, https://gir.st/, GPLv3
     #