Simon Watson 2 years ago
parent
commit
7ab8946618
1 changed files with 15 additions and 13 deletions
  1. 15 13
      emacs/.emacs-all

+ 15 - 13
emacs/.emacs-all

@@ -89,6 +89,7 @@
 (straight-use-package
  '(beacon :type git :host github
    :repo "Malabarba/beacon"))
+(beacon-mode)
 
 (global-set-key (kbd "C-c B") 'beacon-mode)
 
@@ -123,9 +124,6 @@
 (package-install 'symon)
 (symon-mode 1)
 
-;; Icicles
-(straight-use-package 'icicles)
-
 (straight-use-package
  '(telephone-line :type git :host github
 		  :repo "dbordak/telephone-line"))
@@ -148,6 +146,16 @@
 ;; tramp
 (setq tramp-default-method "ssh")
 
+;; Ivy
+;; (straight-use-package 'ivy)
+;; (ivy-mode)
+;; (setq ivy-use-virtual-buffers t)
+;; (setq enable-recursive-minibuffers t)
+
+;; (require 'ido)
+(ido-mode t)
+
+
 (require 'yasnippet)
 
 ;; Configure focus
@@ -171,10 +179,6 @@
 (require 'dimmer)
 (setq dimmer-fraction 0.4)
 
-;; always enable ido mode
-(require 'ido)
-(ido-mode t)
-
 (require 'evil)
 (evil-mode 1)
 
@@ -242,7 +246,10 @@
 (global-set-key (kbd "C-c C-q") #'mu-magit-kill-buffers)
 (global-set-key (kbd "C-c ;") 'comment-line)
 (global-set-key (kbd "C-c b") 'fzf-switch-buffer)
-(global-set-key (kbd "C-c z") 'fzf-find-file)
+(global-set-key (kbd "C-c z") '(lambda ()
+				 (interactive)
+				 (switch-to-buffer "*scratch*")
+				 (fzf-find-file)))
 (global-set-key (kbd "C-c e") '(lambda ()
 				 (interactive)
 				 (diff-hl-mode)
@@ -273,11 +280,6 @@
 				   (switch-to-buffer "*Messages*")))
 (global-set-key (kbd "C-c C-f") 'find-file-at-point)
 
-;;; Can probably be replaced with
-;;; a yasnippet
-(fset 'date-to-point
-   (kmacro-lambda-form [?\C-u ?\M-! ?d ?a ?t ?e return] 0 "%d"))
-
 ;;; Erc config
 (setq erc-nick "speskk")
 (setq erc-hide-list '("JOIN" "PART" "QUIT"))