diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/home/emacs/default.nix | 13 | ||||
| -rw-r--r-- | share/home/emacs/emacs.el | 132 | ||||
| -rw-r--r-- | share/home/hyprdesktop.nix | 1 | ||||
| -rw-r--r-- | share/nixos-modules/nix-config.nix | 11 |
4 files changed, 155 insertions, 2 deletions
diff --git a/share/home/emacs/default.nix b/share/home/emacs/default.nix new file mode 100644 index 0000000..6c40b78 --- /dev/null +++ b/share/home/emacs/default.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +let + my-emacs = pkgs.emacsWithPackagesFromUsePackage { + config = ./emacs.el; + defaultInitFile = true; + package = pkgs.emacs-pgtk; + alwaysEnsure = true; + alwaysTangle = true; + }; +in +{ + home.packages = [ my-emacs ]; +} diff --git a/share/home/emacs/emacs.el b/share/home/emacs/emacs.el new file mode 100644 index 0000000..bf786de --- /dev/null +++ b/share/home/emacs/emacs.el @@ -0,0 +1,132 @@ +;; -*- lexical-binding: t -*- +;;; emacs-config --- My emacs config +;;; Commentary: +;;; Code: +;; Lots of stuff copied from Sanemacs version 0.3.2 +;; https://sanemacs.com/ + +;;; For performance +(setq gc-cons-threshold 100000000) +(setq read-process-output-max (* 1024 1024)) ;; 1mb + + +(add-hook 'after-init-hook #'(lambda () + ;; restore after startup + (setq gc-cons-threshold 800000))) + +;;; Disable menu-bar, tool-bar, and scroll-bar. +(if (fboundp 'menu-bar-mode) + (menu-bar-mode -1)) +(if (fboundp 'tool-bar-mode) + (tool-bar-mode -1)) +(if (fboundp 'scroll-bar-mode) + (scroll-bar-mode -1)) + +;;; Fix this bug: +;;; https://www.reddit.com/r/emacs/comments/cueoug/the_failed_to_download_gnu_archive_is_a_pretty/ +(when (version< emacs-version "26.3") + (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")) + +;;; Setup package.el +(require 'package) +(setq package-enable-at-startup nil) +(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/")) +(unless package--initialized (package-initialize)) + +;;; Setup use-package +(unless (package-installed-p 'use-package) + (package-refresh-contents) + (package-install 'use-package)) +(eval-when-compile + (require 'use-package)) +(setq use-package-always-ensure t) + +;;; Useful Defaults +(setq-default cursor-type 'bar) ; Line-style cursor similar to other text editors +(setq inhibit-startup-screen t) ; Disable startup screen +(setq initial-scratch-message "") ; Make *scratch* buffer blank +(setq-default frame-title-format '("%b")) ; Make window title the buffer name +(setq ring-bell-function 'ignore) ; Disable bell sound +(fset 'yes-or-no-p 'y-or-n-p) ; y-or-n-p makes answering questions faster +(show-paren-mode 1) ; Show closing parens by default +(setq linum-format "%4d ") ; Line number format +(delete-selection-mode 1) ; Selected text will be overwritten when you start typing +(global-auto-revert-mode t) ; Auto-update buffer if file has changed on disk +(use-package undo-tree ; Enable undo-tree, sane undo/redo behavior + :init (global-undo-tree-mode) + :config (setq-default undo-tree-auto-save-history nil)) +(add-hook 'before-save-hook + 'delete-trailing-whitespace) ; Delete trailing whitespace on save +(add-hook 'prog-mode-hook ; Show line numbers in programming modes + (if (and (fboundp 'display-line-numbers-mode) (display-graphic-p)) + #'display-line-numbers-mode + #'linum-mode)) + +(defun sanemacs/backward-kill-word () + (interactive "*") + (push-mark) + (backward-word) + (delete-region (point) (mark))) + +;;; Keybindings +(global-set-key [mouse-3] 'mouse-popup-menubar-stuff) ; Gives right-click a context menu +(global-set-key (kbd "C->") 'indent-rigidly-right-to-tab-stop) ; Indent selection by one tab length +(global-set-key (kbd "C-<") 'indent-rigidly-left-to-tab-stop) ; De-indent selection by one tab length +(global-set-key (kbd "M-DEL") 'sanemacs/backward-kill-word) ; Kill word without copying it to your clipboard +(global-set-key (kbd "C-DEL") 'sanemacs/backward-kill-word) ; Kill word without copying it to your clipboard + +;;; Offload the custom-set-variables to a separate file +;;; This keeps your init.el neater and you have the option +;;; to gitignore your custom.el if you see fit. +(setq custom-file (expand-file-name "custom.el" user-emacs-directory)) +(unless (file-exists-p custom-file) + (write-region "" nil custom-file)) +;;; Load custom file. Don't hide errors. Hide success message +(load custom-file nil t) + +;;; Put Emacs auto-save and backup files to /tmp/ or C:/Temp/ +(defconst emacs-tmp-dir (expand-file-name (format "emacs%d" (user-uid)) temporary-file-directory)) +(setq + backup-by-copying t ; Avoid symlinks + delete-old-versions t + kept-new-versions 6 + kept-old-versions 2 + version-control t + auto-save-list-file-prefix emacs-tmp-dir + auto-save-file-name-transforms `((".*" ,emacs-tmp-dir t)) ; Change autosave dir to tmp + backup-directory-alist `((".*" . ,emacs-tmp-dir))) + +;;; Lockfiles unfortunately cause more pain than benefit +(setq create-lockfiles nil) + +;;; Load wheatgrass as the default theme if one is not loaded already + +(if (not custom-enabled-themes) + (load-theme 'wheatgrass t)) + +(defun reload-config () + (interactive) + (load-file (expand-file-name "init.el" user-emacs-directory))) + + +;; Autopairs +(electric-pair-mode 1) + +;; Set up vi keybinds +(use-package evil + :config + (evil-mode 1)) + +(use-package nix-mode + :mode "\\.nix\\'") + +;; Set up proof general for working with coq +(use-package proof-general + :mode ("\\.v\\'" . coq-mode)) + +(use-package flycheck + :init (global-flycheck-mode)) + +(use-package company + :init (global-company-mode)) +;;; emacs.el ends here diff --git a/share/home/hyprdesktop.nix b/share/home/hyprdesktop.nix index 0dd4add..b0a77af 100644 --- a/share/home/hyprdesktop.nix +++ b/share/home/hyprdesktop.nix @@ -16,6 +16,7 @@ ./kitty.nix ./offpunk.nix ./firefox + ./emacs ]; wayland.windowManager.hyprland = { diff --git a/share/nixos-modules/nix-config.nix b/share/nixos-modules/nix-config.nix index 2b190cf..8000871 100644 --- a/share/nixos-modules/nix-config.nix +++ b/share/nixos-modules/nix-config.nix @@ -3,10 +3,17 @@ experimental-features = [ "nix-command" "flakes" ]; auto-optimise-store = true; - extra-substituters = [ "https://hyprland.cachix.org" ]; + extra-substituters = [ + "https://hyprland.cachix.org" + "https://nix-community.cachix.org" + ]; extra-trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; }; - nixpkgs.overlays = [ inputs.hyprland.overlays.default ]; + nixpkgs.overlays = [ + inputs.hyprland.overlays.default + inputs.emacs-overlay.overlays.default + ]; } |