diff --git a/dot_doom.d/config.el b/dot_config/doom/config.el similarity index 100% rename from dot_doom.d/config.el rename to dot_config/doom/config.el diff --git a/dot_doom.d/init.el b/dot_config/doom/init.el similarity index 98% rename from dot_doom.d/init.el rename to dot_config/doom/init.el index 3b36494..2fb46d9 100644 --- a/dot_doom.d/init.el +++ b/dot_config/doom/init.el @@ -46,8 +46,8 @@ ;;tabs ; a tab bar for Emacs ;;treemacs ; a project drawer, like neotree but cooler ;;unicode ; extended unicode support for various languages - vc-gutter ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB + (vc-gutter +pretty) ; vcs diff in the fringe ;;window-select ; visually switch windows workspaces ; tab emulation, persistence & separate workspaces ;;zen ; distraction-free coding or writing @@ -105,6 +105,7 @@ ;;taskrunner ; taskrunner for all your projects terraform ; infrastructure as code ;;tmux ; an API for interacting with tmux + tree-sitter ; syntax and parsing, sitting in a tree... ;;upload ; map local to remote projects via ssh/ftp :os @@ -163,7 +164,7 @@ ;;rest ; Emacs as a REST client ;;rst ; ReST in peace ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;(rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;(scheme +guile) ; a fully conniving family of lisps sh ; she sells {ba,z,fi}sh shells on the C xor diff --git a/dot_doom.d/packages.el b/dot_config/doom/packages.el similarity index 94% rename from dot_doom.d/packages.el rename to dot_config/doom/packages.el index 20b0049..ec470e8 100644 --- a/dot_doom.d/packages.el +++ b/dot_config/doom/packages.el @@ -11,7 +11,7 @@ ;; To install a package directly from a remote git repo, you must specify a ;; `:recipe'. You'll find documentation on what `:recipe' accepts here: -;; https://github.com/raxod502/straight.el#the-recipe-format +;; https://github.com/radian-software/straight.el#the-recipe-format ;(package! another-package ; :recipe (:host github :repo "username/repo")) @@ -34,7 +34,7 @@ ;; Specify a `:branch' to install a package from a particular branch or tag. ;; This is required for some packages whose default branch isn't 'master' (which -;; our package manager can't deal with; see raxod502/straight.el#279) +;; our package manager can't deal with; see radian-software/straight.el#279) ;(package! builtin-package :recipe (:branch "develop")) ;; Use `:pin' to specify a particular commit to install. diff --git a/dot_config/oh-my-zsh/custom/01_variables.zsh b/dot_config/oh-my-zsh/custom/01_variables.zsh index 646ffb7..752c6e3 100644 --- a/dot_config/oh-my-zsh/custom/01_variables.zsh +++ b/dot_config/oh-my-zsh/custom/01_variables.zsh @@ -36,7 +36,8 @@ export MANPATH="/usr/local/man:$MANPATH" [ -d "$HOME/bin" ] && export PATH="$HOME/bin:$PATH" # add doom emacs to the path -export PATH=$HOME/.emacs.d/bin:$PATH +#export PATH=$HOME/.emacs.d/bin:$PATH +export PATH=$HOME/.config/emacs/bin:$PATH # add my own scripts to the path export PATH=$HOME/scripts:$PATH diff --git a/dot_config/oh-my-zsh/custom/02_zgenom.zsh b/dot_config/oh-my-zsh/custom/02_zgenom.zsh index c156890..8efc073 100644 --- a/dot_config/oh-my-zsh/custom/02_zgenom.zsh +++ b/dot_config/oh-my-zsh/custom/02_zgenom.zsh @@ -85,10 +85,10 @@ if ! zgenom saved; then zgenom load zsh-users/zsh-history-substring-search # Additional completion definitions for Zsh. - zgenom load zsh-users/zsh-completions + # zgenom load zsh-users/zsh-completions # Suggests commands as you type based on history and completions. - zgenom load zsh-users/zsh-autosuggestions + # zgenom load zsh-users/zsh-autosuggestions # zsh-syntax-highlighting must be loaded after executing compinit command and sourcing other plugins zgenom load zsh-users/zsh-syntax-highlighting