summaryrefslogtreecommitdiff
path: root/.emacs.d
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/init.el3
-rw-r--r--.emacs.d/init.el~5
-rw-r--r--.emacs.d/lisp/init-evil.el3
-rw-r--r--.emacs.d/lisp/init-evil.el~5
-rw-r--r--.emacs.d/lisp/init-expand-region.el10
-rw-r--r--.emacs.d/lisp/init-expand-region.el~8
6 files changed, 29 insertions, 5 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 6ce7dee..2331575 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -39,7 +39,7 @@
'(inhibit-startup-screen t)
'(package-selected-packages
(quote
- (window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
+ (expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
@@ -59,6 +59,7 @@
(require 'init-program-basic)
(require 'init-company)
(require 'init-flycheck)
+ (require 'init-expand-region)
(require 'init-window-numbering))
(provide 'init)
diff --git a/.emacs.d/init.el~ b/.emacs.d/init.el~
index 3261777..a58575a 100644
--- a/.emacs.d/init.el~
+++ b/.emacs.d/init.el~
@@ -39,7 +39,7 @@
'(inhibit-startup-screen t)
'(package-selected-packages
(quote
- (window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
+ (expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
@@ -58,7 +58,8 @@
(require 'init-org)
(require 'init-program-basic)
(require 'init-company)
- (require 'init-flycheck))
+ (require 'init-flycheck)
+ (require 'init-window-numbering))
(provide 'init)
;;; init.el ends here
diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el
index 0c25450..06e8236 100644
--- a/.emacs.d/lisp/init-evil.el
+++ b/.emacs.d/lisp/init-evil.el
@@ -18,7 +18,8 @@
"c" 'execute-c-program
"e" 'find-file
"b" 'switch-to-buffer
- "q" 'kill-buffer
+ "q" 'quit-window
+ "e" 'er/expand-region
;; switch window
"0" 'select-window-0
diff --git a/.emacs.d/lisp/init-evil.el~ b/.emacs.d/lisp/init-evil.el~
index 375f5cc..234d620 100644
--- a/.emacs.d/lisp/init-evil.el~
+++ b/.emacs.d/lisp/init-evil.el~
@@ -8,6 +8,8 @@
(require 'evil)
(evil-mode 1)
+;; todo function and keybinding to open file in new window
+
;; Evil leader, more evil
(global-evil-leader-mode)
(evil-leader/set-leader ";")
@@ -16,7 +18,8 @@
"c" 'execute-c-program
"e" 'find-file
"b" 'switch-to-buffer
- "q" 'kill-buffer
+ "q" 'quit-window
+ "f" 'er/expand-region
;; switch window
"0" 'select-window-0
diff --git a/.emacs.d/lisp/init-expand-region.el b/.emacs.d/lisp/init-expand-region.el
new file mode 100644
index 0000000..05b3ac0
--- /dev/null
+++ b/.emacs.d/lisp/init-expand-region.el
@@ -0,0 +1,10 @@
+;;; expand-region --- Configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'expand-region)
+
+(provide 'init-expand-region)
+;;; init-expand-region ends here
diff --git a/.emacs.d/lisp/init-expand-region.el~ b/.emacs.d/lisp/init-expand-region.el~
new file mode 100644
index 0000000..fffd943
--- /dev/null
+++ b/.emacs.d/lisp/init-expand-region.el~
@@ -0,0 +1,8 @@
+;;; expand-region --- Configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(provide 'init-expand-region)
+;;; init-expand-region ends here