Browse Source

Removed many packages, small visual changes

* Removed several unused packages and reformatted the emacsPackages.txt list
* Add org files for agenda
* ivy-xref for better xref selection
* Extra indent in adaptive-wrap so it looks better
* Removed old autocompletion attempts
* Add space to desktop ivy prompts (looks more consistent)
* Fringe foreground colors come from theme comment color for lower contrast
master
macoymadson@gmail.com 4 years ago
parent
commit
84223403e2
  1. 55
      Emacs/emacsConfig.txt
  2. 60
      Emacs/emacsPackages.txt

55
Emacs/emacsConfig.txt

@ -18,7 +18,7 @@
;; - [Done] Workspaces ("desktops" by emacs terminology)
;; - [WIP] Build systems
;; - [Done] One keypress builds
;; - [WIP] Quick jump to compilation error
;; - [Done] Quick jump to compilation error
;; - Easy add build system
;; - [Done] Fuzzy file opening
;; - [Done] Fuzzy editor command execution
@ -55,21 +55,20 @@
;; - Ido jump to file anywhere does more harm than good (especially when creating new files)
;; - Python indentation is godawful
;; - Multiple cursors copy and cut when whole line selected
;; - TAGS for Python projects
;; - Make C-g quit selection and multiple cursors if mc is active
;; - Auto-install packages just by loading .emacs (use-package?)
;; - Auto-install packages just by loading .emacs (use-package? https://github.com/jwiegley/use-package)
;; - Shortcuts:
;; Toggle whitespace mode
;; Swap windows
;; - Indent-tabs-mode only in C/C++
;; - Auto-select actual struct definition when multiple xref results
;; - Make sure when I say xref-other it ends up in the other window (even after multiple results)
;; - If use-region, C-k should delete region instead of line
;; - Make git-commit-mode and with-editor-mode not use C-c (somehow raise priority of my-keys? Or rebind?)
;; - Powerline: Make mode colors comments so they aren't as bright (same color as percent complete)
;; - tags-query-replace use marked for tag to replace
;; - Recover from commit failed backup command
;; - Reopen recently closed file (like C-S-w in Sublime)
;; - Reopen recently closed file (like C-S-t in Sublime)
;; - Fix windows OpenSSL/TLS support
;; Emacs Notes
;; C-h k <the keybind> to find what a key does
@ -125,6 +124,12 @@
;; Org: indent nested things
(setq org-startup-indented t)
;; My org files
(when (string-equal (user-login-name) "mmadson")
(setq org-agenda-files (list "C:/Users/mmadson/Dropbox/Org/1_Calendar.org"
"C:/Users/mmadson/Dropbox/Org/0_Dump.org"))
)
;; Smex: Smart M-x completion
(smex-initialize)
(global-set-key (kbd "M-x") 'smex)
@ -191,6 +196,7 @@
(define-globalized-minor-mode my-global-adaptive-wrap-mode adaptive-wrap-prefix-mode
(lambda () (adaptive-wrap-prefix-mode 1)))
(my-global-adaptive-wrap-mode 1)
(setq-default adaptive-wrap-extra-indent 1)
;; C indentation settings
;; bsd AKA Allman https://www.emacswiki.org/emacs/IndentingC
@ -371,6 +377,10 @@
(visit-tags-table my-tags-file)))
)
;; Use Ivy to select xref results
(require 'ivy-xref)
(setq xref-show-xrefs-function 'ivy-xref-show-xrefs)
;; This isn't really necessary because attempting a goto definition will automatically do this
;;(global-set-key (kbd "C-<f5>") (lambda () (interactive) (loadTagsFromParent)))
(global-set-key (kbd "C-<f5>") (lambda () (interactive) (generateTags)))
@ -389,25 +399,6 @@
;; See https://github.com/auto-complete/auto-complete/blob/master/doc/manual.md
(setq ac-auto-start 3)
;; Auto-complete using etags
;; Doesn't work because codebase is too big :(
;;(custom-set-variables
;; '(ac-etags-requires 1))
;;
;;(eval-after-load "etags"
;; '(progn
;; (ac-etags-setup)))
;;
;;(add-hook 'c-mode-common-hook 'ac-etags-ac-setup)
;; Auto complete using company
;; Doesn't work because codebase is too big
;;(global-company-mode)
;;'(company-global-modes '(not company-clang))
;;(add-hook 'c-mode-common-hook
;; (lambda ()
;; (setq company-backends '(company-etags))))
;; Custom fuzzy completion stuff
(defun macoy-ido-example ()
"Test ido custom"
@ -506,7 +497,7 @@
(defun macoy-save-desktop (new-desktop-name)
"Save a desktop to the desktop registry for easy switching"
(interactive "sNew desktop name:")
(interactive "sNew desktop name: ")
(let ((new-desktop (concat macoy-desktop-dir new-desktop-name)))
(make-directory new-desktop)
(desktop-save new-desktop)
@ -518,7 +509,7 @@
(interactive)
(desktop-change-dir
(concat macoy-desktop-dir
(ido-completing-read "Switch Desktop:"
(ido-completing-read "Switch Desktop: "
(remove "."
(remove ".."
(directory-files macoy-desktop-dir)))))))
@ -916,10 +907,6 @@
'(back-button-local-keystrokes (quote ("C-S-x <C-SPC>")))
'(back-button-smartrep-prefix "C-S-x")
'(custom-enabled-themes (quote (base16-ashes)))
'(desktop-registry-registry
(quote
((".emacs.d" . "c:/Users/mmadson/AppData/Roaming/.emacs.d")
("starterSrc" . "c:/SublimeProjects/emacsDesktops/starterSrc"))))
'(diary-entry-marker (quote font-lock-variable-name-face))
'(ediff-split-window-function (quote split-window-horizontally))
'(emms-mode-line-icon-image-cache
@ -978,7 +965,7 @@ static char *gnus-pointer[] = {
("melpa" . "http://melpa.org/packages/"))))
'(package-selected-packages
(quote
(magit dsvn delight adaptive-wrap web-beautify etags-select desktop-registry simpleclip yasnippet swiper company ac-etags auto-complete clang-format avy ace-jump-mode ag xah-find dtrt-indent flx-ido ido-vertical-mode sublime-themes smooth-scrolling alect-themes base16-theme powerline darktooth-theme dumb-jump projectile smex fiplr helm-dash better-defaults multiple-cursors zenburn-theme marmalade-demo)))
(ivy-xref everything magit dsvn delight adaptive-wrap web-beautify etags-select simpleclip yasnippet swiper auto-complete clang-format avy ag xah-find flx-ido ido-vertical-mode sublime-themes smooth-scrolling alect-themes base16-theme powerline darktooth-theme projectile smex helm-dash better-defaults multiple-cursors zenburn-theme marmalade-demo)))
'(pos-tip-background-color "#36473A")
'(pos-tip-foreground-color "#FFFFC8")
'(projectile-globally-ignored-directories
@ -1029,8 +1016,10 @@ static char *gnus-pointer[] = {
;; Make the fringe indicators a little more subdued. This might be too much if I start
;; using the fringe for anything more than wrapping indicators, but for now it is fine
;; Commented because it's a little too tough to see the indicators on many themes
;; (set-face-foreground 'fringe (face-background 'fringe))
;; We'll use the comment colors because comments are usually high enough contrast to read
;; but still more subdued than regular text (and regular fringe foreground)
;; See base16-theme.el for faces and colors and stuff
(set-face-foreground 'fringe (face-foreground 'font-lock-comment-face))
;; Make fringe same color as background. We still want fringe for wrap indicators
;; If you change your theme you should run this code again

60
Emacs/emacsPackages.txt

@ -1,33 +1,27 @@
ac-etags 20161001.807 installed etags/ctags completion source for auto-complete
ace-jump-mode 2.0.0.0 installed a quick cursor location minor mode for emacs
ag 20180225.240 installed A front-end for ag ('the silver searcher'), the C ack replacement.
alect-themes 20180322.1408 installed Configurable light, dark and black themes for Emacs 24 or later
auto-complete 20170124.1845 installed Auto Completion for GNU Emacs
avy 20180415.1259 installed Jump to arbitrary positions in visible text and select text quickly.
base16-theme 20180320.2254 installed Collection of themes built on combinations of 16 base colors
better-defaults 0.1.2 installed Fixing weird quirks and poor defaults
clang-format 20180406.814 installed Format code using clang-format
company 20180501.11 installed Modular text completion framework
darktooth-theme 20171206.639 installed From the darkness... it watches
desktop-registry 1.2.0 installed Keep a central registry of desktop files
dtrt-indent 0.2.0 installed Adapt to foreign indentation offsets
dumb-jump 20180323.1942 installed jump to definition for multiple languages without configuration.
fiplr 0.1.3 installed Fuzzy finder for files in a project.
flx-ido 20180117.719 installed flx integration for ido
ido-vertical-mode 0.1.1 installed Makes ido-mode display vertically.
marmalade-demo 0.0.5 installed a demonstration elpa package
multiple-cursors 20180406.1350 installed Multiple cursors for Emacs.
powerline 20180321.1948 installed Rewrite of Powerline
projectile 20180324.2226 installed Manage and navigate projects in Emacs easily
simpleclip 20170803.540 installed Simplified access to the system clipboard
smex 3.0 installed M-x interface with Ido-style fuzzy matching.
smooth-scrolling 20161002.1249 installed Make emacs scroll smoothly
sublime-themes 20170606.1144 installed A collection of themes based on Sublime Text
swiper 20180402.1857 installed Isearch with an overview. Oh, man!
xah-find 20180310.450 installed find replace in pure emacs lisp. Purpose similar to grep/sed.
yasnippet 20180412.1548 installed Yet another snippet extension for Emacs.
zenburn-theme 2.1 installed A low contrast color theme for Emacs.
adaptive-wrap
delight
dsvn
magit
adaptive-wrap
ag 20180225.240 A front-end for ag ('the silver searcher'), the C ack replacement.
alect-themes 20180322.1408 Configurable light, dark and black themes for Emacs 24 or later
auto-complete 20170124.1845 Auto Completion for GNU Emacs
avy 20180415.1259 Jump to arbitrary positions in visible text and select text quickly.
base16-theme 20180320.2254 Collection of themes built on combinations of 16 base colors
better-defaults 0.1.2 Fixing weird quirks and poor defaults
clang-format 20180406.814 Format code using clang-format
darktooth-theme 20171206.639 From the darkness... it watches
delight
dsvn
flx-ido 20180117.719 flx integration for ido
ido-vertical-mode 0.1.1 Makes ido-mode display vertically.
ivy-xref
magit
marmalade-demo 0.0.5 a demonstration elpa package
multiple-cursors 20180406.1350 Multiple cursors for Emacs.
powerline 20180321.1948 Rewrite of Powerline
projectile 20180324.2226 Manage and navigate projects in Emacs easily
simpleclip 20170803.540 Simplified access to the system clipboard
smex 3.0 M-x interface with Ido-style fuzzy matching.
smooth-scrolling 20161002.1249 Make emacs scroll smoothly
sublime-themes 20170606.1144 A collection of themes based on Sublime Text
swiper 20180402.1857 Isearch with an overview. Oh, man!
xah-find 20180310.450 find replace in pure emacs lisp. Purpose similar to grep/sed.
yasnippet 20180412.1548 Yet another snippet extension for Emacs.
zenburn-theme 2.1 A low contrast color theme for Emacs.

Loading…
Cancel
Save