This commit is contained in:
Henrik Lissner 2015-06-20 22:23:42 +02:00
parent d154409656
commit 3b79d71609
6 changed files with 13 additions and 10 deletions

View file

@ -5,9 +5,7 @@
(use-package company (use-package company
:diminish (company-mode . "=") :diminish (company-mode . "=")
:commands (company-complete-common company-files company-tags :commands global-company-mode
company-ispell company-yasnippet company-semantic
company-dabbrev-code)
:init :init
(after! abbrev (diminish 'abbrev-mode "A")) (after! abbrev (diminish 'abbrev-mode "A"))
(setq company-idle-delay nil (setq company-idle-delay nil
@ -24,9 +22,8 @@
company-echo-metadata-frontend company-echo-metadata-frontend
company-preview-if-just-one-frontend) company-preview-if-just-one-frontend)
company-dict-dir (concat narf-private-dir "dict/")) company-dict-dir (concat narf-private-dir "dict/"))
(add-hook! after-init 'global-company-mode)
:config :config
(global-company-mode +1)
;; (use-package company-dict :defer t) ;; (use-package company-dict :defer t)
;; (setq-default company-backends (append '(company-dict company-keywords) company-backends)) ;; (setq-default company-backends (append '(company-dict company-keywords) company-backends))

View file

@ -24,7 +24,7 @@
(add-to-list 'ido-ignore-files "\\`.DS_Store$") (add-to-list 'ido-ignore-files "\\`.DS_Store$")
(add-to-list 'ido-ignore-files "Icon\\?$") (add-to-list 'ido-ignore-files "Icon\\?$")
(add-hook! ido-setup (add-hook! ido-setup
(bind! :map (ido-completion-map ido-file-completion-map) (bind! :map (ido-common-completion-map ido-completion-map ido-file-completion-map)
"C-n" 'ido-next-match "C-n" 'ido-next-match
"C-p" 'ido-prev-match "C-p" 'ido-prev-match
"C-w" 'ido-delete-backward-word-updir)) "C-w" 'ido-delete-backward-word-updir))

View file

@ -122,8 +122,8 @@
sml/pre-modes-separator " : " sml/pre-modes-separator " : "
sml/pre-minor-modes-separator " " sml/pre-minor-modes-separator " "
sml/pos-minor-modes-separator ": " sml/pos-minor-modes-separator ": "
sml/replacer-regexp-list '(("^~/Dropbox/Projects/" "PROJECTS:") sml/replacer-regexp-list '(("^~/.emacs.d/" "EMACS.D:")
("^~/.emacs.d/" "EMACS.D:") ("^~/Dropbox/Projects/" "PROJECTS:")
("^~/Dropbox/notes/" "NOTES:") ("^~/Dropbox/notes/" "NOTES:")
("^/usr/local/Cellar/" "HOMEBREW:"))) ("^/usr/local/Cellar/" "HOMEBREW:")))
:config :config

View file

@ -34,7 +34,7 @@
(require 'dash) (require 'dash)
(require 'f) (require 'f)
(setq use-package-verbose narf-debug-mode) (defvar use-package-verbose narf-debug-mode)
;; (setq use-package-expand-minimally (not narf-debug-mode)) ;; (setq use-package-expand-minimally (not narf-debug-mode))
(require 'use-package) (require 'use-package)
@ -185,7 +185,11 @@
(use-package popwin :config (popwin-mode 1)) (use-package popwin :config (popwin-mode 1))
(use-package server :config (unless (server-running-p) (server-start))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(require 'server)
(unless (server-running-p)
(server-start))
(provide 'core) (provide 'core)
;;; core.el ends here ;;; core.el ends here

View file

@ -1,6 +1,7 @@
;;; defuns-quickrun.el ;;; defuns-quickrun.el
;;;; Code building ;;;;;;;;;;;;;;;;;;;;;; ;;;; Code building ;;;;;;;;;;;;;;;;;;;;;;
;;;###autoload
(defvar narf--build-command '("make %s" . "Makefile")) (defvar narf--build-command '("make %s" . "Makefile"))
(make-variable-buffer-local 'narf--build-command) (make-variable-buffer-local 'narf--build-command)

View file

@ -9,6 +9,7 @@
(defconst narf-private-dir (! (concat narf-emacs-dir "private/"))) (defconst narf-private-dir (! (concat narf-emacs-dir "private/")))
(defconst narf-elpa-dir (! (concat narf-emacs-dir ".cask/" emacs-version "/elpa/"))) (defconst narf-elpa-dir (! (concat narf-emacs-dir ".cask/" emacs-version "/elpa/")))
(defconst narf-temp-dir (! (concat narf-private-dir "cache/" (system-name) "/"))) (defconst narf-temp-dir (! (concat narf-private-dir "cache/" (system-name) "/")))
(defconst narf-script-dir (! (concat narf-emacs-dir "scripts/")))
(defconst narf-snippet-dirs (! (list (concat narf-private-dir "snippets/") (defconst narf-snippet-dirs (! (list (concat narf-private-dir "snippets/")
(concat narf-private-dir "templates/")))) (concat narf-private-dir "templates/"))))