Various things
- Disable local file loading for now until I have a solution for the DBus problem - Emacs daemon implicitly starts server
This commit is contained in:
		
							parent
							
								
									05d10fae2a
								
							
						
					
					
						commit
						bdbc18d285
					
				
					 3 changed files with 8 additions and 8 deletions
				
			
		| 
						 | 
					@ -6,9 +6,6 @@
 | 
				
			||||||
;; Hide banner message ...
 | 
					;; Hide banner message ...
 | 
				
			||||||
(setq eshell-banner-message "")
 | 
					(setq eshell-banner-message "")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(defvar home-dir)
 | 
					 | 
				
			||||||
(setq home-dir (expand-file-name "~"))
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
(defun eshell-mode-hook-setup ()
 | 
					(defun eshell-mode-hook-setup ()
 | 
				
			||||||
  "Sets up EShell when it is loaded"
 | 
					  "Sets up EShell when it is loaded"
 | 
				
			||||||
  (setq eshell-path-env (concat
 | 
					  (setq eshell-path-env (concat
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -116,8 +116,6 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(set-default-font "Source Code Pro 12")
 | 
					(set-default-font "Source Code Pro 12")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(add-to-list 'after-make-frame-functions 'set-font)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
;; Don't make the nyan cat too long ... I have other stuff in the mode
 | 
					;; Don't make the nyan cat too long ... I have other stuff in the mode
 | 
				
			||||||
;; bar as well!
 | 
					;; bar as well!
 | 
				
			||||||
(set-variable 'nyan-bar-length 15)
 | 
					(set-variable 'nyan-bar-length 15)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										11
									
								
								init.el
									
										
									
									
									
								
							
							
						
						
									
										11
									
								
								init.el
									
										
									
									
									
								
							| 
						 | 
					@ -72,6 +72,10 @@
 | 
				
			||||||
;; Is this being used by a vim user?
 | 
					;; Is this being used by a vim user?
 | 
				
			||||||
(setq is-vim-mode nil)
 | 
					(setq is-vim-mode nil)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					;; What's the home folder?
 | 
				
			||||||
 | 
					(defvar home-dir)
 | 
				
			||||||
 | 
					(setq home-dir (expand-file-name "~"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(when is-vim-mode
 | 
					(when is-vim-mode
 | 
				
			||||||
  (dolist (p evil-pkgs)
 | 
					  (dolist (p evil-pkgs)
 | 
				
			||||||
    (when (not (package-installed-p p))
 | 
					    (when (not (package-installed-p p))
 | 
				
			||||||
| 
						 | 
					@ -94,11 +98,11 @@
 | 
				
			||||||
(load custom-file)
 | 
					(load custom-file)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;; A file with machine specific settings.
 | 
					;; A file with machine specific settings.
 | 
				
			||||||
(load-file-if-exists "~/.emacs.d/init-local.el")
 | 
					;(load-file-if-exists (concat home-dir "/.emacs.d/init-local.el"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;; IRC configuration
 | 
					;; IRC configuration
 | 
				
			||||||
;; Actual servers and such are loaded from irc.el
 | 
					;; Actual servers and such are loaded from irc.el
 | 
				
			||||||
(load-file-if-exists "~/.emacs.d/init-irc.el")
 | 
					; (load-file-if-exists (concat home-dir "/.emacs.d/init-irc.el"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;; Load magnars' string manipulation library
 | 
					;; Load magnars' string manipulation library
 | 
				
			||||||
(require 's)
 | 
					(require 's)
 | 
				
			||||||
| 
						 | 
					@ -107,4 +111,5 @@
 | 
				
			||||||
(random t)
 | 
					(random t)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;; Start server for emacsclient
 | 
					;; Start server for emacsclient
 | 
				
			||||||
(server-start)
 | 
					;; (server-start)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue