From 184ccd8e65dabe21f2280db7255889e59bbf25fb Mon Sep 17 00:00:00 2001 From: steveokard Date: Tue, 21 Jan 2020 15:08:19 -0500 Subject: [PATCH 1/9] removed redundant set term statement --- tmux/.tmux.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 5835b79..adc6a39 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -4,10 +4,6 @@ unbind C-b bind C-a send-prefix set -sg escape-time 0 -# Ensure terminal starts with its own colour scheme (helps Vim/Neovim themes to not break) -set-option -g default-terminal "screen-256color" -set -g default-terminal "screen-256color" - #Mouse/Scrollback Tweaks set -g history-limit 100000 #setw -g mode-keys vi From b3f914bd08916c5481782102fffac21f7e8e072c Mon Sep 17 00:00:00 2001 From: steveokard Date: Tue, 21 Jan 2020 15:09:53 -0500 Subject: [PATCH 2/9] initial layout for emacs doom --- emacs_doom.zsh | 6 ++++++ udeps.sh | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 emacs_doom.zsh diff --git a/emacs_doom.zsh b/emacs_doom.zsh new file mode 100644 index 0000000..22722a4 --- /dev/null +++ b/emacs_doom.zsh @@ -0,0 +1,6 @@ +#!/bin/zsh +#This will install Doom for Emacs +git clone https://github.com/hlissner/doom-emacs ~/.emacs.d +#Test for emacs and ripgrep + +~/.emacs.d/bin/doom install diff --git a/udeps.sh b/udeps.sh index b9847a3..6870245 100755 --- a/udeps.sh +++ b/udeps.sh @@ -14,7 +14,8 @@ sudo apt-get -my install git \ curl \ aptitude \ nnn \ - ack + ack \ + ripgrep read -n1 -p $'Does this system need ssh access?\n' REPLY if [[ $REPLY == [Yy] ]]; then From 59b7e1b5c4a9350f377a436d651d5fb886d0d1bb Mon Sep 17 00:00:00 2001 From: steveokard Date: Tue, 21 Jan 2020 15:37:55 -0500 Subject: [PATCH 3/9] added test cases for installation --- emacs_doom.zsh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/emacs_doom.zsh b/emacs_doom.zsh index 22722a4..9352132 100644 --- a/emacs_doom.zsh +++ b/emacs_doom.zsh @@ -1,6 +1,17 @@ #!/bin/zsh #This will install Doom for Emacs -git clone https://github.com/hlissner/doom-emacs ~/.emacs.d -#Test for emacs and ripgrep -~/.emacs.d/bin/doom install +if [ -e ~/.emacs.d/spacemacs.mk ] +#cleanup old spacemacs + mv ~/.emacs.d ~/spacemacs.d +else + git clone https://github.com/hlissner/doom-emacs ~/.emacs.d +fi +#Test for ripgrep +if [ -e /usr/bin/rg ] + ~/.emacs.d/bin/doom install +else + echo "Ripgrep not detected, attempting to install!" + sudo apt install ripgrep +fi + From 7152a7b202d1d785c0638837fe766551bf63d288 Mon Sep 17 00:00:00 2001 From: steveokard Date: Tue, 21 Jan 2020 15:43:45 -0500 Subject: [PATCH 4/9] cleaned up spacemacs --- config/.config/systemd/user/emacs.service | 12 - emacs/.spacemacs | 330 ---------------------- emacs_doom.zsh | 0 init.sh | 19 +- 4 files changed, 7 insertions(+), 354 deletions(-) delete mode 100644 config/.config/systemd/user/emacs.service delete mode 100644 emacs/.spacemacs mode change 100644 => 100755 emacs_doom.zsh diff --git a/config/.config/systemd/user/emacs.service b/config/.config/systemd/user/emacs.service deleted file mode 100644 index 9568201..0000000 --- a/config/.config/systemd/user/emacs.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Emacs text editor -Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/ - -[Service] -Type=forking -ExecStart=/usr/bin/emacs --daemon=instance1 -ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)" -Restart=on-failure - -[Install] -WantedBy=default.target \ No newline at end of file diff --git a/emacs/.spacemacs b/emacs/.spacemacs deleted file mode 100644 index 5979fae..0000000 --- a/emacs/.spacemacs +++ /dev/null @@ -1,330 +0,0 @@ -;; -*- mode: emacs-lisp -*- -;; This file is loaded by Spacemacs at startup. -;; It must be stored in your home directory. - -(defun dotspacemacs/layers () - "Configuration Layers declaration. -You should not put any user code in this function besides modifying the variable -values." - (setq-default - ;; Base distribution to use. This is a layer contained in the directory - ;; `+distribution'. For now available distributions are `spacemacs-base' - ;; or `spacemacs'. (default 'spacemacs) - dotspacemacs-distribution 'spacemacs - ;; Lazy installation of layers (i.e. layers are installed only when a file - ;; with a supported type is opened). Possible values are `all', `unused' - ;; and `nil'. `unused' will lazy install only unused layers (i.e. layers - ;; not listed in variable `dotspacemacs-configuration-layers'), `all' will - ;; lazy install any layer that support lazy installation even the layers - ;; listed in `dotspacemacs-configuration-layers'. `nil' disable the lazy - ;; installation feature and you have to explicitly list a layer in the - ;; variable `dotspacemacs-configuration-layers' to install it. - ;; (default 'unused) - dotspacemacs-enable-lazy-installation 'unused - ;; If non-nil then Spacemacs will ask for confirmation before installing - ;; a layer lazily. (default t) - dotspacemacs-ask-for-lazy-installation t - ;; If non-nil layers with lazy install support are lazy installed. - ;; List of additional paths where to look for configuration layers. - ;; Paths must have a trailing slash (i.e. `~/.mycontribs/') - dotspacemacs-configuration-layer-path '() - ;; List of configuration layers to load. - dotspacemacs-configuration-layers - '( - ;; ---------------------------------------------------------------- - ;; Example of useful layers you may want to use right away. - ;; Uncomment some layer names and press (Vim style) or - ;; (Emacs style) to install them. - ;; ---------------------------------------------------------------- - helm - auto-completion - better-defaults - emacs-lisp - git - markdown - org - (shell :variables - shell-default-height 30 - shell-default-position 'bottom) - spell-checking - syntax-checking - themes-megapack - ;; version-control - ) - ;; List of additional packages that will be installed without being - ;; wrapped in a layer. If you need some configuration for these - ;; packages, then consider creating a layer. You can also put the - ;; configuration in `dotspacemacs/user-config'. - dotspacemacs-additional-packages '() - ;; A list of packages that cannot be updated. - dotspacemacs-frozen-packages '() - ;; A list of packages that will not be installed and loaded. - dotspacemacs-excluded-packages '() - ;; Defines the behaviour of Spacemacs when installing packages. - ;; Possible values are `used-only', `used-but-keep-unused' and `all'. - ;; `used-only' installs only explicitly used packages and uninstall any - ;; unused packages as well as their unused dependencies. - ;; `used-but-keep-unused' installs only the used packages but won't uninstall - ;; them if they become unused. `all' installs *all* packages supported by - ;; Spacemacs and never uninstall them. (default is `used-only') - dotspacemacs-install-packages 'used-only)) - -(defun dotspacemacs/init () - "Initialization function. -This function is called at the very startup of Spacemacs initialization -before layers configuration. -You should not put any user code in there besides modifying the variable -values." - ;; This setq-default sexp is an exhaustive list of all the supported - ;; spacemacs settings. - (setq-default - ;; If non nil ELPA repositories are contacted via HTTPS whenever it's - ;; possible. Set it to nil if you have no way to use HTTPS in your - ;; environment, otherwise it is strongly recommended to let it set to t. - ;; This variable has no effect if Emacs is launched with the parameter - ;; `--insecure' which forces the value of this variable to nil. - ;; (default t) - dotspacemacs-elpa-https t - ;; Maximum allowed time in seconds to contact an ELPA repository. - dotspacemacs-elpa-timeout 5 - ;; If non nil then spacemacs will check for updates at startup - ;; when the current branch is not `develop'. Note that checking for - ;; new versions works via git commands, thus it calls GitHub services - ;; whenever you start Emacs. (default nil) - dotspacemacs-check-for-update nil - ;; If non-nil, a form that evaluates to a package directory. For example, to - ;; use different package directories for different Emacs versions, set this - ;; to `emacs-version'. - dotspacemacs-elpa-subdirectory nil - ;; One of `vim', `emacs' or `hybrid'. - ;; `hybrid' is like `vim' except that `insert state' is replaced by the - ;; `hybrid state' with `emacs' key bindings. The value can also be a list - ;; with `:variables' keyword (similar to layers). Check the editing styles - ;; section of the documentation for details on available variables. - ;; (default 'vim) - dotspacemacs-editing-style 'vim - ;; If non nil output loading progress in `*Messages*' buffer. (default nil) - dotspacemacs-verbose-loading nil - ;; Specify the startup banner. Default value is `official', it displays - ;; the official spacemacs logo. An integer value is the index of text - ;; banner, `random' chooses a random text banner in `core/banners' - ;; directory. A string value must be a path to an image format supported - ;; by your Emacs build. - ;; If the value is nil then no banner is displayed. (default 'official) - 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)) - ;; True if the home buffer should respond to resize events. - dotspacemacs-startup-buffer-responsive t - ;; Default major mode of the scratch buffer (default `text-mode') - dotspacemacs-scratch-mode 'text-mode - ;; List of themes, the first of the list is loaded when spacemacs starts. - ;; Press T n to cycle to the next theme in the list (works great - ;; with 2 themes variants, one dark and one light) - dotspacemacs-themes '(spacemacs-dark - spacemacs-light) - ;; If non nil the cursor color matches the state color in GUI Emacs. - dotspacemacs-colorize-cursor-according-to-state t - ;; Default font, or prioritized list of fonts. `powerline-scale' allows to - ;; quickly tweak the mode-line size to make separators look not too crappy. - dotspacemacs-default-font '("Source Code Pro" - :size 13 - :weight normal - :width normal - :powerline-scale 1.1) - ;; The leader key - dotspacemacs-leader-key "SPC" - ;; The key used for Emacs commands (M-x) (after pressing on the leader key). - ;; (default "SPC") - dotspacemacs-emacs-command-key "SPC" - ;; The key used for Vim Ex commands (default ":") - dotspacemacs-ex-command-key ":" - ;; The leader key accessible in `emacs state' and `insert state' - ;; (default "M-m") - dotspacemacs-emacs-leader-key "M-m" - ;; Major mode leader key is a shortcut key which is the equivalent of - ;; pressing ` m`. Set it to `nil` to disable it. (default ",") - dotspacemacs-major-mode-leader-key "," - ;; Major mode leader key accessible in `emacs state' and `insert state'. - ;; (default "C-M-m") - dotspacemacs-major-mode-emacs-leader-key "C-M-m" - ;; These variables control whether separate commands are bound in the GUI to - ;; the key pairs C-i, TAB and C-m, RET. - ;; Setting it to a non-nil value, allows for separate commands under - ;; and TAB or and RET. - ;; In the terminal, these pairs are generally indistinguishable, so this only - ;; works in the GUI. (default nil) - dotspacemacs-distinguish-gui-tab nil - ;; If non nil `Y' is remapped to `y$' in Evil states. (default nil) - dotspacemacs-remap-Y-to-y$ nil - ;; If non-nil, the shift mappings `<' and `>' retain visual state if used - ;; there. (default t) - dotspacemacs-retain-visual-state-on-shift t - ;; If non-nil, J and K move lines up and down when in visual mode. - ;; (default nil) - dotspacemacs-visual-line-move-text nil - ;; If non nil, inverse the meaning of `g' in `:substitute' Evil ex-command. - ;; (default nil) - dotspacemacs-ex-substitute-global nil - ;; Name of the default layout (default "Default") - dotspacemacs-default-layout-name "Default" - ;; If non nil the default layout name is displayed in the mode-line. - ;; (default nil) - dotspacemacs-display-default-layout nil - ;; If non nil then the last auto saved layouts are resume automatically upon - ;; start. (default nil) - dotspacemacs-auto-resume-layouts nil - ;; Size (in MB) above which spacemacs will prompt to open the large file - ;; literally to avoid performance issues. Opening a file literally means that - ;; no major mode or minor modes are active. (default is 1) - dotspacemacs-large-file-size 1 - ;; Location where to auto-save files. Possible values are `original' to - ;; auto-save the file in-place, `cache' to auto-save the file to another - ;; file stored in the cache directory and `nil' to disable auto-saving. - ;; (default 'cache) - dotspacemacs-auto-save-file-location 'cache - ;; Maximum number of rollback slots to keep in the cache. (default 5) - dotspacemacs-max-rollback-slots 5 - ;; If non nil, `helm' will try to minimize the space it uses. (default nil) - dotspacemacs-helm-resize nil - ;; if non nil, the helm header is hidden when there is only one source. - ;; (default nil) - dotspacemacs-helm-no-header nil - ;; define the position to display `helm', options are `bottom', `top', - ;; `left', or `right'. (default 'bottom) - dotspacemacs-helm-position 'bottom - ;; Controls fuzzy matching in helm. If set to `always', force fuzzy matching - ;; in all non-asynchronous sources. If set to `source', preserve individual - ;; source settings. Else, disable fuzzy matching in all sources. - ;; (default 'always) - dotspacemacs-helm-use-fuzzy 'always - ;; If non nil the paste micro-state is enabled. When enabled pressing `p` - ;; several times cycle between the kill ring content. (default nil) - dotspacemacs-enable-paste-transient-state nil - ;; Which-key delay in seconds. The which-key buffer is the popup listing - ;; the commands bound to the current keystroke sequence. (default 0.4) - dotspacemacs-which-key-delay 0.4 - ;; Which-key frame position. Possible values are `right', `bottom' and - ;; `right-then-bottom'. right-then-bottom tries to display the frame to the - ;; right; if there is insufficient space it displays it at the bottom. - ;; (default 'bottom) - dotspacemacs-which-key-position 'bottom - ;; If non nil a progress bar is displayed when spacemacs is loading. This - ;; may increase the boot time on some systems and emacs builds, set it to - ;; nil to boost the loading time. (default t) - dotspacemacs-loading-progress-bar t - ;; If non nil the frame is fullscreen when Emacs starts up. (default nil) - ;; (Emacs 24.4+ only) - dotspacemacs-fullscreen-at-startup nil - ;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen. - ;; Use to disable fullscreen animations in OSX. (default nil) - dotspacemacs-fullscreen-use-non-native nil - ;; If non nil the frame is maximized when Emacs starts up. - ;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil. - ;; (default nil) (Emacs 24.4+ only) - dotspacemacs-maximized-at-startup nil - ;; A value from the range (0..100), in increasing opacity, which describes - ;; the transparency level of a frame when it's active or selected. - ;; Transparency can be toggled through `toggle-transparency'. (default 90) - dotspacemacs-active-transparency 90 - ;; A value from the range (0..100), in increasing opacity, which describes - ;; the transparency level of a frame when it's inactive or deselected. - ;; Transparency can be toggled through `toggle-transparency'. (default 90) - dotspacemacs-inactive-transparency 90 - ;; If non nil show the titles of transient states. (default t) - dotspacemacs-show-transient-state-title t - ;; If non nil show the color guide hint for transient state keys. (default t) - dotspacemacs-show-transient-state-color-guide t - ;; If non nil unicode symbols are displayed in the mode line. (default t) - dotspacemacs-mode-line-unicode-symbols t - ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth - ;; scrolling overrides the default behavior of Emacs which recenters point - ;; when it reaches the top or bottom of the screen. (default 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 t - ;; Code folding method. Possible values are `evil' and `origami'. - ;; (default 'evil) - dotspacemacs-folding-method 'evil - ;; If non-nil smartparens-strict-mode will be enabled in programming modes. - ;; (default nil) - dotspacemacs-smartparens-strict-mode nil - ;; If non-nil pressing the closing parenthesis `)' key in insert mode passes - ;; over any automatically added closing parenthesis, bracket, quote, etc… - ;; This can be temporary disabled by pressing `C-q' before `)'. (default nil) - dotspacemacs-smart-closing-parenthesis nil - ;; Select a scope to highlight delimiters. Possible values are `any', - ;; `current', `all' or `nil'. Default is `all' (highlight any scope and - ;; emphasis the current one). (default 'all) - dotspacemacs-highlight-delimiters 'all - ;; If non nil, advise quit functions to keep server open when quitting. - ;; (default nil) - dotspacemacs-persistent-server nil - ;; List of search tool executable names. Spacemacs uses the first installed - ;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'. - ;; (default '("ag" "pt" "ack" "grep")) - dotspacemacs-search-tools '("ag" "pt" "ack" "grep") - ;; The default package repository used if no explicit repository has been - ;; specified with an installed package. - ;; Not used for now. (default nil) - dotspacemacs-default-package-repository nil - ;; Delete whitespace while saving buffer. Possible values are `all' - ;; to aggressively delete empty line and long sequences of whitespace, - ;; `trailing' to delete only the whitespace at end of lines, `changed'to - ;; delete only whitespace for changed lines or `nil' to disable cleanup. - ;; (default nil) - dotspacemacs-whitespace-cleanup nil - )) - -(defun dotspacemacs/user-init () - "Initialization function for user code. -It is called immediately after `dotspacemacs/init', before layer configuration -executes. - This function is mostly useful for variables that need to be set -before packages are loaded. If you are unsure, you should try in setting them in -`dotspacemacs/user-config' first." - ) - -(defun dotspacemacs/user-config () - "Configuration function for user code. -This function is called at the very end of Spacemacs initialization after -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." - ) - -;; 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. - '(package-selected-packages - (quote - (lv transient zenburn-theme zen-and-art-theme xterm-color ws-butler winum white-sand-theme which-key volatile-highlights vi-tilde-fringe uuidgen use-package unfill underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme toxi-theme toc-org tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spaceline powerline spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smeargle shell-pop seti-theme reverse-theme restart-emacs rebecca-theme rainbow-delimiters railscasts-theme purple-haze-theme professional-theme popwin planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme persp-mode pcre2el paradox spinner orgit organic-green-theme org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-plus-contrib org-mime org-download org-bullets open-junk-file omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme neotree naquadah-theme mwim mustang-theme multi-term move-text monokai-theme monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme material-theme markdown-toc markdown-mode majapahit-theme magit-gitflow madhat2r-theme macrostep lush-theme lorem-ipsum linum-relative link-hint light-soap-theme jbeans-theme jazz-theme ir-black-theme inkpot-theme indent-guide hydra hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation heroku-theme hemisu-theme helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile helm-gitignore request helm-flx helm-descbinds helm-company helm-c-yasnippet helm-ag hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gh-md gandalf-theme fuzzy flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck pkg-info epl flx-ido flx flatui-theme flatland-theme fill-column-indicator farmhouse-theme fancy-battery eyebrowse expand-region exotica-theme exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist highlight evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit magit magit-popup git-commit with-editor evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu espresso-theme eshell-z eshell-prompt-extras esh-help elisp-slime-nav dumb-jump f s dracula-theme django-theme diminish define-word darktooth-theme autothemer dash darkokai-theme darkmine-theme darkburn-theme dakrone-theme cyberpunk-theme company-statistics company column-enforce-mode color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme clean-aindent-mode cherry-blossom-theme busybee-theme bubbleberry-theme birds-of-paradise-plus-theme bind-map bind-key badwolf-theme auto-yasnippet yasnippet auto-highlight-symbol auto-dictionary auto-compile packed apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core async ac-ispell auto-complete popup)))) -(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/emacs_doom.zsh b/emacs_doom.zsh old mode 100644 new mode 100755 diff --git a/init.sh b/init.sh index 8261151..5186ec2 100755 --- a/init.sh +++ b/init.sh @@ -12,7 +12,7 @@ fi #setup prezto echo "Initializing Prezto" -zsh prezto.zsh +(zsh prezto.zsh) #fix permissions to avoid compaudit flag chmod -R go-w ~/.zprezto @@ -22,7 +22,6 @@ mkdir ~/.config/systemd/user/ echo "Stowing Configs" stow tmux stow vim -stow emacs stow prezto stow config chmod 0700 ~/.ssh @@ -38,20 +37,16 @@ fi #install spacevim echo "Installing Space VIM!" -if [ ! -d ~/.space-vim ] +if [ ! -e ~/.space-vim ] then - mv "$HOME/.vim" "$HOME/.vim_bk" - mv "$HOME/.vimrc" "$HOME/.vimrc_bk" + mv "$HOME/.vim" "$HOME/vim_bk" + mv "$HOME/.vimrc" "$HOME/vimrc_bk" curl -sLf https://spacevim.org/install.sh | bash fi -#init spacemacs in the background -echo "Installing Spacemacs!" -if [ ! -d ~/.emacs.d ] -then - ln -s "$HOME/stevset/emacs/.spacemacs" "$HOME/.spacemacs" - git clone https://github.com/syl20bnr/spacemacs "$HOME/.emacs.d" -fi +#install Emacs Doom +echo "Installing Emacs DOOM! (might take awhile)" +(zsh emacs_doom.zsh) echo -n "Would you like to configure your git name and email? (y/n) => "; read answer if [[ $answer = "Y" ]] || [[ $answer = "y" ]]; then From 51b50d14003baa18c91486cf9b1fecfc25db260a Mon Sep 17 00:00:00 2001 From: steveokard Date: Tue, 21 Jan 2020 15:53:23 -0500 Subject: [PATCH 5/9] transition to emacs doom --- update.zsh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/update.zsh b/update.zsh index e762c29..2a49aa4 100755 --- a/update.zsh +++ b/update.zsh @@ -1,9 +1,4 @@ #!/bin/zsh -rm ~/.ssh/config -stow config -sudo systemctl daemon-reload -systemctl --user enable emacs -systemctl --user start emacs -systemctl --user status emacs -echo "you should start emacs and update all the packages!" +sudo apt install ripgrep +(zsh emacs_doom.zsh) From e368527ec5ef736d7ca67b1bf72cf0c620bce7ca Mon Sep 17 00:00:00 2001 From: steveokard Date: Tue, 21 Jan 2020 15:54:30 -0500 Subject: [PATCH 6/9] new themes --- scripts/xfce_term_themes.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 scripts/xfce_term_themes.sh diff --git a/scripts/xfce_term_themes.sh b/scripts/xfce_term_themes.sh new file mode 100755 index 0000000..87a0aff --- /dev/null +++ b/scripts/xfce_term_themes.sh @@ -0,0 +1,2 @@ +git clone https://github.com/afq984/base16-xfce4-terminal /tmp/base16 +cp /tmp/base16/colorschemes/*.theme ~/.local/share/xfce4/terminal/colorschemes/ From 4363faa5824f6dc98032812b454a66abafd79e4b Mon Sep 17 00:00:00 2001 From: steveokard Date: Tue, 21 Jan 2020 16:00:39 -0500 Subject: [PATCH 7/9] subshell optimization --- init.sh | 5 +---- prezto.zsh | 8 +++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/init.sh b/init.sh index 5186ec2..ae8f299 100755 --- a/init.sh +++ b/init.sh @@ -13,12 +13,9 @@ fi #setup prezto echo "Initializing Prezto" (zsh prezto.zsh) -#fix permissions to avoid compaudit flag -chmod -R go-w ~/.zprezto #create symlinks using stow mkdir ~/.ssh -mkdir ~/.config/systemd/user/ echo "Stowing Configs" stow tmux stow vim @@ -41,7 +38,7 @@ if [ ! -e ~/.space-vim ] then mv "$HOME/.vim" "$HOME/vim_bk" mv "$HOME/.vimrc" "$HOME/vimrc_bk" - curl -sLf https://spacevim.org/install.sh | bash + (curl -sLf https://spacevim.org/install.sh | bash) fi #install Emacs Doom diff --git a/prezto.zsh b/prezto.zsh index 6eb89bb..b6f268c 100755 --- a/prezto.zsh +++ b/prezto.zsh @@ -24,8 +24,10 @@ fi #extra setup for powerlevel10k theme echo "....configuring theme" -#cd && curl -fsSLO https://raw.githubusercontent.com/romkatv/dotfiles-public/master/.purepower ln -s $HOME/stevset/.p10k.zsh $HOME/ -rm $HOME/.zprezto/modules/prompt/functions/prompt_powerlevel10k_setup -ln -s $HOME/.zprezto/modules/prompt/external/powerlevel10k/prompt_powerlevel10k_setup $HOME/.zprezto/modules/prompt/functions/prompt_powerlevel10k_setup +#rm $HOME/.zprezto/modules/prompt/functions/prompt_powerlevel10k_setup +#ln -s $HOME/.zprezto/modules/prompt/external/powerlevel10k/prompt_powerlevel10k_setup $HOME/.zprezto/modules/prompt/functions/prompt_powerlevel10k_setup + +#finally, fix permissions to avoid compaudit flag +chmod -R go-w ~/.zprezto From 4698fb8ac63ab5c8383b3434974174d21122052d Mon Sep 17 00:00:00 2001 From: steveokard Date: Wed, 22 Jan 2020 11:29:54 -0500 Subject: [PATCH 8/9] more testing cases --- emacs_doom.zsh | 18 ++++++++++++------ init.sh | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/emacs_doom.zsh b/emacs_doom.zsh index 9352132..41cf630 100755 --- a/emacs_doom.zsh +++ b/emacs_doom.zsh @@ -1,17 +1,23 @@ #!/bin/zsh #This will install Doom for Emacs - -if [ -e ~/.emacs.d/spacemacs.mk ] -#cleanup old spacemacs - mv ~/.emacs.d ~/spacemacs.d -else - git clone https://github.com/hlissner/doom-emacs ~/.emacs.d +#which version of ubuntu are we on? +if [ `lsb_release -rs` -lt 19 ] #needs to be an int vs int + echo "Forget it! You'll have to install an updated version of emacs" + exit 1 fi +#cleanup old spacemacs +if [ -e ~/.emacs.d/spacemacs.mk ] + mv ~/.emacs.d ~/spacemacs.d +fi + +git clone https://github.com/hlissner/doom-emacs ~/.emacs.d + #Test for ripgrep if [ -e /usr/bin/rg ] ~/.emacs.d/bin/doom install else echo "Ripgrep not detected, attempting to install!" sudo apt install ripgrep + echo "if successful, install emacs doom via script ~/.emacs.d/bin/doom install" fi diff --git a/init.sh b/init.sh index ae8f299..53d34f5 100755 --- a/init.sh +++ b/init.sh @@ -19,7 +19,9 @@ mkdir ~/.ssh echo "Stowing Configs" stow tmux stow vim +#Defer until prezto.zsh completes? stow prezto +# stow config chmod 0700 ~/.ssh chmod -R 0600 ~/.ssh/* From d2dc3bc91cbd3f6a9c48d15bde40860e48a0d3aa Mon Sep 17 00:00:00 2001 From: steveokard Date: Thu, 23 Jan 2020 22:18:26 -0500 Subject: [PATCH 9/9] will be easier to just ask --- emacs_doom.zsh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/emacs_doom.zsh b/emacs_doom.zsh index 41cf630..8f75a78 100755 --- a/emacs_doom.zsh +++ b/emacs_doom.zsh @@ -1,19 +1,17 @@ #!/bin/zsh #This will install Doom for Emacs -#which version of ubuntu are we on? -if [ `lsb_release -rs` -lt 19 ] #needs to be an int vs int - echo "Forget it! You'll have to install an updated version of emacs" - exit 1 -fi +#sudo add-apt-repository ppa:kelleyk/emacs #cleanup old spacemacs if [ -e ~/.emacs.d/spacemacs.mk ] - mv ~/.emacs.d ~/spacemacs.d + then + mv ~/.emacs.d ~/spacemacs.d fi git clone https://github.com/hlissner/doom-emacs ~/.emacs.d #Test for ripgrep if [ -e /usr/bin/rg ] +then ~/.emacs.d/bin/doom install else echo "Ripgrep not detected, attempting to install!"