aboutsummaryrefslogtreecommitdiff
path: root/modules/workstation/emacs
diff options
context:
space:
mode:
authorKatharina Fey <kookie@spacekookie.de>2019-11-27 20:34:12 +0100
committerKatharina Fey <kookie@spacekookie.de>2019-11-27 20:34:12 +0100
commit172bcdfa38143b9955b5ccd34bc50491835d259e (patch)
tree9a511713ae62b7823afff3e58532fa888f42a3b4 /modules/workstation/emacs
parentab3a26c261f3735936fa31eac9aac0bcb1c381f0 (diff)
ws/emacs: Fixing save and execute commands bindings
Diffstat (limited to 'modules/workstation/emacs')
-rw-r--r--modules/workstation/emacs/default.nix2
-rw-r--r--modules/workstation/emacs/init.el15
2 files changed, 5 insertions, 12 deletions
diff --git a/modules/workstation/emacs/default.nix b/modules/workstation/emacs/default.nix
index f6fbb9b89c7..bb524ad04f0 100644
--- a/modules/workstation/emacs/default.nix
+++ b/modules/workstation/emacs/default.nix
@@ -18,6 +18,7 @@ let
rust-mode
color-theme-sanityinc-tomorrow
+ company
company-lsp
direnv
fzf
@@ -32,7 +33,6 @@ let
undo-tree
visual-fill-column
yasnippet
- company
]));
in
{
diff --git a/modules/workstation/emacs/init.el b/modules/workstation/emacs/init.el
index 1a696f79ed2..5d70a650ce2 100644
--- a/modules/workstation/emacs/init.el
+++ b/modules/workstation/emacs/init.el
@@ -56,13 +56,6 @@
(require 'sublimity)
(require 'sublimity-attractive)
-;; (setq sublimity-map-size 10)
-;; (setq sublimity-map-fraction 0.5)
-;; (setq sublimity-map-text-scale -7)
-
-;; ;; Display minimap without delay
-;; (sublimity-map-set-delay nil)
-
;; This is require for lsp-mode
(require 'yasnippet)
@@ -123,7 +116,7 @@
(next-buffer)
(let ((i 0))
(while (< i 20)
- (if (not (xah-user-buffer-q))
+ (if (not (user-buffer-q))
(progn (next-buffer)
(setq i (1+ i)))
(progn (setq i 100))))))
@@ -134,7 +127,7 @@
(previous-buffer)
(let ((i 0))
(while (< i 20)
- (if (not (xah-user-buffer-q))
+ (if (not (user-buffer-q))
(progn (previous-buffer)
(setq i (1+ i)))
(progn (setq i 100))))))
@@ -142,7 +135,7 @@
;;; Some stolen bindings from ergo-emacs
(global-set-key (kbd "C-x C-k") 'kill-current-buffer)
(global-set-key (kbd "C-x n") 'new-empty-buffer)
-(global-set-key (kbd "M-s M-s") 'savebuffer) ; It's like a quicksave
-(global-set-key (kbd "C-t") 'execute-extendedcommand) ; Not sure how this makes sense but voila!
(global-set-key (kbd "C-<next>") 'next-user-buffer)
(global-set-key (kbd "C-<prior>") 'previous-user-buffer)
+(global-set-key (kbd "M-s M-s") 'save-buffer)
+(global-set-key (kbd "C-t") 'execute-extended-command)