diff --git a/emacs/init.el b/emacs/init.el index f1d876a..1f03d1a 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -5,6 +5,7 @@ (scroll-bar-mode -1) (setq ring-bell-function 'ignore) (add-to-list 'default-frame-alist '(fullscreen . maximized)) +(setq make-backup-files nil) (global-display-line-numbers-mode 1) @@ -14,8 +15,12 @@ eshell-mode-hook)) (add-hook mode (lambda () (display-line-numbers-mode 0)))) -(set-face-attribute 'default nil :font "JetBrains Mono" :height 130) -(load-theme 'leuven-dark) +(cond + ((eq system-type 'darwin) + (set-face-attribute 'default nil :font "Fira Code" :height 165)) + ((eq system-type 'gnu/linux) + +(set-face-attribute 'default nil :font "JetBrains Mono" :height 130))) (global-set-key (kbd "") 'keyboard-escape-quit) @@ -59,10 +64,7 @@ ;; 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. - '(package-selected-packages - '(all-the-icons counsel counsel-projectile doom-modeline doom-themes - evil evil-collection general helpful ivy ivy-rich - projectile swiper))) + '(package-selected-packages nil)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -120,18 +122,22 @@ (rune/leader-keys "f" '(:ignore t :which-key "find") "ff" '(counsel-find-file :which-key "find file") - "fF" '(counsel-git :which-key "find file git") + "fg" '(counsel-git :which-key "find file git") "fb" '(counsel-switch-buffer :which-key "find buffers") - "fg" '(counsel-ag :which-key "grep") - "fG" '(counsel-git-grep :which-key "git grep") + "gf" '(counsel-ag :which-key "grep") + "gF" '(counsel-git-grep :which-key "git grep") "t" '(:ignore t :which-key "toggles") "tt" '(counsel-load-theme :which-key "choose theme") - "p" '(projectile-command-map :which-key "projectile"))) + "p" '(projectile-command-map :which-key "projectile") + "b" '(:ignore b :which-key "buffers") + "bf" '(counsel-switch-buffer :which-key "find buffers") + "bn" '(next-buffer :which-key "next buffer") + "be" '(eval-buffer :which-key "eval buffer") + "bp" '(previous-buffer :which-key "previous buffer"))) (general-define-key "C-s" 'counsel-grep-or-swiper) - (use-package evil :init (setq evil-want-integration t)