diff --git a/home/default.nix b/home/default.nix index e6440b3..3b75824 100644 --- a/home/default.nix +++ b/home/default.nix @@ -325,50 +325,6 @@ in { }; - emacs = { - enable = true; - extraPackages = epkgs: - (with epkgs; [ - all-the-icons - centaur-tabs - doom-modeline - doom-themes - evil - evil-collection - evil-commentary - evil-matchit - evil-numbers - evil-surround - evil-tutor - evil-visualstar - flycheck - go-mode - groovy-mode - highlight-parentheses - htmlize - hydra - lsp-mode - magit - magithub - markdown-mode - markdown-toc - nix-mode - nix-sandbox - nix-update - org-bullets - org-superstar - ox-pandoc - rainbow-delimiters - ripgrep - rust-mode - spinner - terraform-mode - treemacs - web-mode - xclip - ]); - }; - vscode = { enable = true; extensions = with pkgs.vscode-extensions; [ ms-vsliveshare.vsliveshare ]; @@ -376,7 +332,6 @@ in { }; - home.file.".emacs.d/init.el".source = ./init.el; home.file.".config/nvim/statusline.vim".source = ./nvim/statusline.vim; } diff --git a/home/init.el b/home/init.el deleted file mode 100644 index 37d32c2..0000000 --- a/home/init.el +++ /dev/null @@ -1,90 +0,0 @@ -;; Enable Mouse -(xterm-mouse-mode) - -;; Enable xclip -(require 'xclip) -(define-globalized-minor-mode global-xclip-mode - xclip-mode xclip-mode) -(global-xclip-mode 1) - -;; Set up fonts early. -(set-face-attribute 'default - nil - :height 80 - :family "Fira Code Mono") -(set-face-attribute 'variable-pitch - nil - :family "Fira CodeSans") - -;; Fix clipboard -(setq select-enable-clipboard t) - -;; Enable Line Numbers -(global-display-line-numbers-mode 1) - -;; Disable lock files -(setq create-lockfiles nil) - -;; Enable Evil -(require 'evil) -(evil-mode 1) - -;; Set Theme -(load-theme 'doom-gruvbox t) - -;; Disable startup message. -(setq inhibit-startup-message t - inhibit-startup-echo-area-message (user-login-name)) - -;; Accept 'y' and 'n' rather than 'yes' and 'no'. -(defalias 'yes-or-no-p 'y-or-n-p) - -;; Centaur Tabs -(require 'centaur-tabs) -(centaur-tabs-mode t) -(global-set-key (kbd "C-") 'centaur-tabs-backward) -(global-set-key (kbd "C-") 'centaur-tabs-forward) -(setq centaur-tabs-style "bar" - centaur-tabs-height 32 - centaur-tabs-set-icons t - centaur-tabs-set-modified-marker t - centaur-tabs-show-navigation-buttons t - centaur-tabs-set-bar 'under - x-underline-at-descent-line t) - -;; Trailing white space -(setq-default show-trailing-whitespace t) - -;; Prefer UTF-8. -(prefer-coding-system 'utf-8) - -;; Disable some GUI distractions. -(tool-bar-mode -1) -(menu-bar-mode -1) -(blink-cursor-mode 0) - -;; Enable highlighting of current line. -(global-hl-line-mode 1) - -;; Always show line and column number in the mode line. -(line-number-mode) -(column-number-mode) - -;; Increment and decrement numbers easily -(global-set-key (kbd "C-c +") 'evil-numbers/inc-at-pt) -(global-set-key (kbd "C-c -") 'evil-numbers/dec-at-pt) - -;; Enable Mouse scrolling -(unless (display-graphic-p) - ;; activate mouse-based scrolling - (xterm-mouse-mode 1) - (global-set-key (kbd "") 'scroll-down-line) - (global-set-key (kbd "") 'scroll-up-line) - ) - -;; Enable Flycheck -(global-flycheck-mode) -(setq-default flycheck-disabled-checkers '(emacs-lisp-checkdoc)) - -;; An easier way to toggle comments -(evil-commentary-mode)