From 5eb01e5962ba32416e597868f603b79304a61b9c Mon Sep 17 00:00:00 2001 From: Blaise Thompson Date: Fri, 25 Aug 2017 23:54:39 -0500 Subject: improve link.sh --- .pypirc | 6 -- dotfiles/pypirc | 6 ++ dotfiles/spacemacs | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++ link.sh | 25 +++------ spacemacs | 160 ---------------------------------------------------- 5 files changed, 174 insertions(+), 184 deletions(-) delete mode 100644 .pypirc create mode 100644 dotfiles/pypirc create mode 100644 dotfiles/spacemacs delete mode 100644 spacemacs diff --git a/.pypirc b/.pypirc deleted file mode 100644 index 568f97d..0000000 --- a/.pypirc +++ /dev/null @@ -1,6 +0,0 @@ -[distutils] -index-servers= pypi - -[pypi] -username=untzag - diff --git a/dotfiles/pypirc b/dotfiles/pypirc new file mode 100644 index 0000000..568f97d --- /dev/null +++ b/dotfiles/pypirc @@ -0,0 +1,6 @@ +[distutils] +index-servers= pypi + +[pypi] +username=untzag + diff --git a/dotfiles/spacemacs b/dotfiles/spacemacs new file mode 100644 index 0000000..f3fa8fd --- /dev/null +++ b/dotfiles/spacemacs @@ -0,0 +1,161 @@ +;; -*- mode: emacs-lisp -*- + +(defun dotspacemacs/layers () + (setq-default + dotspacemacs-distribution 'spacemacs + dotspacemacs-enable-lazy-installation 'unused + dotspacemacs-ask-for-lazy-installation t + dotspacemacs-configuration-layer-path '() + dotspacemacs-configuration-layers + '( + yamlauto-completion + better-defaults + bibtex + emacs-lisp + games + git + helm + latex + markdown + org + pdf-tools + python + ranger + shell + (shell :variables + shell-default-height 30 + shell-default-position 'bottom + shell-default-shell 'term) + spell-checking + syntax-checking + version-control + ) + dotspacemacs-additional-packages '() + dotspacemacs-frozen-packages '() + dotspacemacs-excluded-packages '() + dotspacemacs-install-packages 'used-only)) + +(defun dotspacemacs/init () + (setq-default + dotspacemacs-elpa-https t + dotspacemacs-elpa-timeout 5 + dotspacemacs-check-for-update t + dotspacemacs-elpa-subdirectory nil + dotspacemacs-editing-style 'vim + dotspacemacs-verbose-loading nil + dotspacemacs-startup-banner 'official + ;; List of items to show in startup buffer or an association list of + ;; the form `(list-type . list-size)`. If nil then it is disabled. + ;; Possible values for list-type are: + ;; `recents' `bookmarks' `projects' `agenda' `todos'." + ;; List sizes may be nil, in which case + ;; `spacemacs-buffer-startup-lists-length' takes effect. + dotspacemacs-startup-lists '((recents . 5) + (projects . 7)) + dotspacemacs-startup-buffer-responsive t + dotspacemacs-scratch-mode 'text-mode + dotspacemacs-themes '(sanityinc-solarized-dark + sanityinc-solarized-light + spacemacs-dark + spacemacs-light) + dotspacemacs-colorize-cursor-according-to-state t + dotspacemacs-default-font '("DejaVu Sans Mono" + :size 15 + :weight normal + :width normal + :powerline-scale 1.1) + dotspacemacs-leader-key "SPC" + dotspacemacs-emacs-command-key "SPC" + dotspacemacs-ex-command-key ":" + dotspacemacs-emacs-leader-key "M-m" + dotspacemacs-major-mode-leader-key "," + dotspacemacs-major-mode-emacs-leader-key "C-M-m" + dotspacemacs-distinguish-gui-tab nil + dotspacemacs-remap-Y-to-y$ nil + dotspacemacs-retain-visual-state-on-shift t + dotspacemacs-visual-line-move-text nil + dotspacemacs-ex-substitute-global nil + dotspacemacs-default-layout-name "Default" + dotspacemacs-display-default-layout nil + dotspacemacs-auto-resume-layouts nil + dotspacemacs-large-file-size 1 + dotspacemacs-auto-save-file-location 'cache + dotspacemacs-max-rollback-slots 5 + dotspacemacs-helm-resize nil + dotspacemacs-helm-no-header nil + dotspacemacs-helm-position 'bottom + dotspacemacs-helm-use-fuzzy 'always + dotspacemacs-enable-paste-transient-state nil + dotspacemacs-which-key-delay 0.4 + dotspacemacs-which-key-position 'bottom + dotspacemacs-loading-progress-bar t + dotspacemacs-fullscreen-at-startup nil + dotspacemacs-fullscreen-use-non-native nil + dotspacemacs-maximized-at-startup t + dotspacemacs-active-transparency 90 + dotspacemacs-inactive-transparency 90 + dotspacemacs-show-transient-state-title t + dotspacemacs-show-transient-state-color-guide t + dotspacemacs-mode-line-unicode-symbols t + dotspacemacs-smooth-scrolling t + ;; Control line numbers activation. + ;; If set to `t' or `relative' line numbers are turned on in all `prog-mode' and + ;; `text-mode' derivatives. If set to `relative', line numbers are relative. + ;; This variable can also be set to a property list for finer control: + '(:relative nil + :disabled-for-modes dired-mode + doc-view-mode + markdown-mode + org-mode + pdf-view-mode + text-mode + :size-limit-kb 1000) + (default nil) + dotspacemacs-line-numbers 'relative + dotspacemacs-folding-method 'evil + dotspacemacs-smartparens-strict-mode nil + dotspacemacs-smart-closing-parenthesis nil + dotspacemacs-highlight-delimiters 'all + dotspacemacs-persistent-server nil + dotspacemacs-search-tools '("ag" "pt" "ack" "grep") + dotspacemacs-default-package-repository nil + dotspacemacs-whitespace-cleanup trailing + )) + +(defun dotspacemacs/user-init () + + ) + +(defun dotspacemacs/user-config () + (with-eval-after-load 'org (setq org-agenda-files + '("~/drive/org/"))) + (setq-default dotspacemacs-configuration-layers '(pdf-tools)) + (setq powerline-default-separator nil + spaceline-org-clock-p t) + (setq org-ref-default-bibliography '("~/drive/literature/database.bib") + org-ref-pdf-directory '"~/drive/literature/" + org-ref-bibliography-notes '"~/drive/literature/literature.org" + org-ellipsis " ⟶" + org-todo-keywords '((sequence "IDEA(i)" "TODO(t)" "WAITING(w)" "|" "DONE(d)" "DELEGATED" "CANCELED(c)")) + org-todo-keyword-faces '(("IDEA" . (:foreground "#2aa198", :weight bold)) + ("TODO" . (:foreground "#dc322f", :weight bold)) + ("WAITING" . (:foreground "#b58900", :weight bold)) + ("DONE" . (:foreground "#859900", :weight bold)) + ("DELEGATED" . (:foreground "#859900", :weight bold)) + ("CANCELED" . (:foreground "#268bd2", :weight bold)))) + ) + +;; Do not write anything past this comment. This is where Emacs will +;; auto-generate custom variable definitions. +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(doc-view-continuous t)) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) diff --git a/link.sh b/link.sh index 74b4653..86b22e4 100755 --- a/link.sh +++ b/link.sh @@ -1,27 +1,16 @@ #!/bin/bash -########## define - -dir=~/dotfiles # dotfiles directory -olddir=~/dotfiles_old # old dotfiles backup directory -files="spacemacs" # list of files/folders to symlink in homedir - -########## do - # create dotfiles_old in homedir -echo -n "Creating $olddir for backup of any existing dotfiles in ~ ..." +olddir=~/dotfiles_old mkdir -p $olddir -echo "done" # change to the dotfiles directory -echo -n "Changing to the $dir directory ..." +dir=~/dotfiles/dotfiles cd $dir -echo "done" -# move any existing dotfiles in homedir to dotfiles_old directory, then create symlinks from the homedir to any files in the ~/dotfiles directory specified in $files -for file in $files; do - echo "Moving any existing dotfiles from ~ to $olddir" - mv ~/.$file ~/dotfiles_old/ - echo "Creating symlink to $file in home directory." - ln -s $dir/$file ~/.$file +# move current files and link contained files +files=$(ls $dir) +for name in $files; do + mv ~/.$name ~/dotfiles_old/ + ln -s $dir/$name ~/.$name done diff --git a/spacemacs b/spacemacs deleted file mode 100644 index 9a32532..0000000 --- a/spacemacs +++ /dev/null @@ -1,160 +0,0 @@ -;; -*- mode: emacs-lisp -*- - -(defun dotspacemacs/layers () - (setq-default - dotspacemacs-distribution 'spacemacs - dotspacemacs-enable-lazy-installation 'unused - dotspacemacs-ask-for-lazy-installation t - dotspacemacs-configuration-layer-path '() - dotspacemacs-configuration-layers - '( - yamlauto-completion - better-defaults - bibtex - emacs-lisp - games - git - helm - markdown - org - pdf-tools - python - ranger - shell - (shell :variables - shell-default-height 30 - shell-default-position 'bottom - shell-default-shell 'term) - spell-checking - syntax-checking - version-control - ) - dotspacemacs-additional-packages '() - dotspacemacs-frozen-packages '() - dotspacemacs-excluded-packages '() - dotspacemacs-install-packages 'used-only)) - -(defun dotspacemacs/init () - (setq-default - dotspacemacs-elpa-https t - dotspacemacs-elpa-timeout 5 - dotspacemacs-check-for-update t - dotspacemacs-elpa-subdirectory nil - dotspacemacs-editing-style 'vim - dotspacemacs-verbose-loading nil - dotspacemacs-startup-banner 'official - ;; List of items to show in startup buffer or an association list of - ;; the form `(list-type . list-size)`. If nil then it is disabled. - ;; Possible values for list-type are: - ;; `recents' `bookmarks' `projects' `agenda' `todos'." - ;; List sizes may be nil, in which case - ;; `spacemacs-buffer-startup-lists-length' takes effect. - dotspacemacs-startup-lists '((recents . 5) - (projects . 7)) - dotspacemacs-startup-buffer-responsive t - dotspacemacs-scratch-mode 'text-mode - dotspacemacs-themes '(sanityinc-solarized-dark - sanityinc-solarized-light - spacemacs-dark - spacemacs-light) - dotspacemacs-colorize-cursor-according-to-state t - dotspacemacs-default-font '("DejaVu Sans Mono" - :size 15 - :weight normal - :width normal - :powerline-scale 1.1) - dotspacemacs-leader-key "SPC" - dotspacemacs-emacs-command-key "SPC" - dotspacemacs-ex-command-key ":" - dotspacemacs-emacs-leader-key "M-m" - dotspacemacs-major-mode-leader-key "," - dotspacemacs-major-mode-emacs-leader-key "C-M-m" - dotspacemacs-distinguish-gui-tab nil - dotspacemacs-remap-Y-to-y$ nil - dotspacemacs-retain-visual-state-on-shift t - dotspacemacs-visual-line-move-text nil - dotspacemacs-ex-substitute-global nil - dotspacemacs-default-layout-name "Default" - dotspacemacs-display-default-layout nil - dotspacemacs-auto-resume-layouts nil - dotspacemacs-large-file-size 1 - dotspacemacs-auto-save-file-location 'cache - dotspacemacs-max-rollback-slots 5 - dotspacemacs-helm-resize nil - dotspacemacs-helm-no-header nil - dotspacemacs-helm-position 'bottom - dotspacemacs-helm-use-fuzzy 'always - dotspacemacs-enable-paste-transient-state nil - dotspacemacs-which-key-delay 0.4 - dotspacemacs-which-key-position 'bottom - dotspacemacs-loading-progress-bar t - dotspacemacs-fullscreen-at-startup nil - dotspacemacs-fullscreen-use-non-native nil - dotspacemacs-maximized-at-startup t - dotspacemacs-active-transparency 90 - dotspacemacs-inactive-transparency 90 - dotspacemacs-show-transient-state-title t - dotspacemacs-show-transient-state-color-guide t - dotspacemacs-mode-line-unicode-symbols t - dotspacemacs-smooth-scrolling t - ;; Control line numbers activation. - ;; If set to `t' or `relative' line numbers are turned on in all `prog-mode' and - ;; `text-mode' derivatives. If set to `relative', line numbers are relative. - ;; This variable can also be set to a property list for finer control: - '(:relative nil - :disabled-for-modes dired-mode - doc-view-mode - markdown-mode - org-mode - pdf-view-mode - text-mode - :size-limit-kb 1000) - (default nil) - dotspacemacs-line-numbers 'relative - dotspacemacs-folding-method 'evil - dotspacemacs-smartparens-strict-mode nil - dotspacemacs-smart-closing-parenthesis nil - dotspacemacs-highlight-delimiters 'all - dotspacemacs-persistent-server nil - dotspacemacs-search-tools '("ag" "pt" "ack" "grep") - dotspacemacs-default-package-repository nil - dotspacemacs-whitespace-cleanup trailing - )) - -(defun dotspacemacs/user-init () - - ) - -(defun dotspacemacs/user-config () - (with-eval-after-load 'org (setq org-agenda-files - '("~/drive/org/"))) - (setq-default dotspacemacs-configuration-layers '(pdf-tools)) - (setq powerline-default-separator nil - spaceline-org-clock-p t) - (setq org-ref-default-bibliography '("~/drive/literature/database.bib") - org-ref-pdf-directory '"~/drive/literature/" - org-ref-bibliography-notes '"~/drive/literature/literature.org" - org-ellipsis " ⟶" - org-todo-keywords '((sequence "IDEA(i)" "TODO(t)" "WAITING(w)" "|" "DONE(d)" "DELEGATED" "CANCELED(c)")) - org-todo-keyword-faces '(("IDEA" . (:foreground "#2aa198", :weight bold)) - ("TODO" . (:foreground "#dc322f", :weight bold)) - ("WAITING" . (:foreground "#b58900", :weight bold)) - ("DONE" . (:foreground "#859900", :weight bold)) - ("DELEGATED" . (:foreground "#859900", :weight bold)) - ("CANCELED" . (:foreground "#268bd2", :weight bold)))) - ) - -;; Do not write anything past this comment. This is where Emacs will -;; auto-generate custom variable definitions. -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(doc-view-continuous t)) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) -- cgit v1.2.3