summaryrefslogtreecommitdiffstats
path: root/jeschli
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-03-21 08:59:35 +0100
committerjeschli <jeschli@gmail.com>2018-03-21 08:59:35 +0100
commitffabb40b5ce8909d0c9858bd74975bf3d70e48a9 (patch)
tree577c42b631f55c332097f6b3fb5c39338ba51163 /jeschli
parent26a93afd0d5bdf3e63c059bef7deb0785ff49689 (diff)
j emacs: cosmetics
Diffstat (limited to 'jeschli')
-rw-r--r--jeschli/2configs/emacs.nix103
1 files changed, 54 insertions, 49 deletions
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index b616acf..05e9778 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -1,58 +1,63 @@
{ config, pkgs, ... }:
let
+ packageRepos = ''
+ (require 'package) ;; You might already have this line
+ (let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
+ (not (gnutls-available-p))))
+ (url (concat (if no-ssl "http" "https") "://melpa.org/packages/")))
+ (add-to-list 'package-archives (cons "melpa" url) t)
+ (add-to-list 'package-archives
+ '("org" . "http://orgmode.org/elpa/") t)
+ )
+ (when (< emacs-major-version 24)
+ ;; For important compatibility libraries like cl-lib
+ (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
+ (package-initialize)
+ '';
+ evilMode = ''
+ ;; Evil Mode
+ (add-to-list 'load-path "~/.emacs.d/evil")
+ (require 'evil)
+ (evil-mode 1)
+ (require 'evil-org)
+ '';
+ windowCosmetics = ''
+ (tool-bar-mode -1) ; Disable the button bar atop screen
+ (scroll-bar-mode -1) ; Disable scroll bar
+ (setq inhibit-startup-screen t) ; Disable startup screen with graphics
+ (setq-default indent-tabs-mode nil) ; Use spaces instead of tabs
+ (setq tab-width 2) ; Four spaces is a tab
+ (setq visible-bell nil) ; Disable annoying visual bell graphic
+ (setq ring-bell-function 'ignore) ; Disable super annoying audio bell
+ '';
emacsFile = ''
-(require 'package) ;; You might already have this line
-(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
- (not (gnutls-available-p))))
- (url (concat (if no-ssl "http" "https") "://melpa.org/packages/")))
- (add-to-list 'package-archives (cons "melpa" url) t)
- (add-to-list 'package-archives
- '("org" . "http://orgmode.org/elpa/") t)
-)
-(when (< emacs-major-version 24)
- ;; For important compatibility libraries like cl-lib
- (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
-
-(package-initialize)
-
-;; Evil Mode
-(add-to-list 'load-path "~/.emacs.d/evil")
-(require 'evil)
-(evil-mode 1)
-(require 'evil-org)
-
-
-
-(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.
- '(inhibit-startup-screen t)
- '(org-agenda-files nil)
- '(package-selected-packages
- (quote
- (smex ox-jira org-plus-contrib org-mime org-jira neotree molokai-theme let-alist helm-fuzzy-find go-guru go-autocomplete flymake-go exec-path-from-shell evil-org cl-lib-highlight bbdb atom-one-dark-theme))))
-(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.
- )
-
-(tool-bar-mode -1) ; Disable the button bar atop screen
-(scroll-bar-mode -1) ; Disable scroll bar
-(setq inhibit-startup-screen t) ; Disable startup screen with graphics
-(setq-default indent-tabs-mode nil) ; Use spaces instead of tabs
-(setq tab-width 2) ; Four spaces is a tab
-(setq visible-bell nil) ; Disable annoying visual bell graphic
-(setq ring-bell-function 'ignore) ; Disable super annoying audio bell
+ ${packageRepos}
+ ${evilMode}
+ ${windowCosmetics}
+ (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.
+ '(inhibit-startup-screen t)
+ '(org-agenda-files nil)
+ '(package-selected-packages
+ (quote
+ (smex ox-jira org-plus-contrib org-mime org-jira neotree molokai-theme let-alist helm-fuzzy-find go-guru go-autocomplete flymake-go exec-path-from-shell evil-org cl-lib-highlight bbdb atom-one-dark-theme))))
+ (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.
+ )
'';
dotEmacs = pkgs.writeText "dot-emacs" emacsFile;
- emacs = (pkgs.emacsPackagesNgGen pkgs.emacs).emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
- magit
- ]));
+ emacs = (pkgs.emacsPackagesNgGen pkgs.emacs).emacsWithPackages (epkgs: [
+ epkgs.melpaStablePackages.magit
+ epkgs.melpaPackages.mmm-mode
+ epkgs.melpaPackages.nix-mode
+ ]);
myEmacs = pkgs.writeDashBin "my-emacs" ''
exec ${emacs}/bin/emacs -q -l ${dotEmacs} "$@"
'';