diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index c1088fc..151fd93 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -3,6 +3,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. + '(custom-enabled-themes '(modus-operandi-tinted)) '(custom-safe-themes '("fb83a50c80de36f23aea5919e50e1bccd565ca5bb646af95729dc8c5f926cbf3" "e7820b899036ae7e966dcaaec29fd6b87aef253748b7de09e74fdc54407a7a02" "1781e8bccbd8869472c09b744899ff4174d23e4f7517b8a6c721100288311fa5" default)) '(safe-local-variable-values diff --git a/.emacs.d/init.el b/.emacs.d/init.el index c7897a7..58a52cc 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,5 +1,5 @@ +;; Basic appearence and behaviour. (setq inhibit-startup-message t) -;; neccesary non-package related config (setq auto-save-default nil) (setq make-backup-files nil) (cond ((find-font (font-spec :name "Jetbrains Mono")) @@ -10,29 +10,29 @@ (set-fringe-mode 10) (setq column-number-mode t) (menu-bar-mode -1) -;; For Emacs 29. +;; For Emacs >=29. (pixel-scroll-precision-mode t) +;; Messes with the Terraform LSP, and I don't really need this myself. (setq create-lockfiles nil) -(load-theme 'modus-vivendi-tinted) - +;; Orgmode tweaks. (setq org-edit-src-content-indentation 0 org-src-tab-acts-natively t org-src-preserve-indentation t) (setq-default tab-width 4) -;; stupid hacks +;; WSL keybinds to work around some weirdness. (global-set-key (kbd "C-c y") 'clipboard-yank) (global-set-key (kbd "C-c x") 'kill-ring-save) ;; straight.el bootstrapping (defvar bootstrap-version) (let ((bootstrap-file - (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) + (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) (bootstrap-version 5)) (unless (file-exists-p bootstrap-file) (with-current-buffer - (url-retrieve-synchronously + (url-retrieve-synchronously "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el" 'silent 'inhibit-cookies) (goto-char (point-max)) @@ -40,8 +40,9 @@ (load bootstrap-file nil 'nomessage)) ;; package list we want installed -;; first grab use-package :3 +;; first use-package (straight-use-package 'use-package) +(use-package vterm :straight t) (use-package el-patch :straight t) (use-package doom-modeline :straight t @@ -64,8 +65,8 @@ :init (projectile-mode +1) :config (setq projectile-project-search-path '("~/Projects")) :bind (:map projectile-mode-map - ("s-p" . projectile-command-map) - ("C-c p" . projectile-command-map))) + ("s-p" . projectile-command-map) + ("C-c p" . projectile-command-map))) (use-package magit :straight t) (use-package hide-mode-line :straight t) (add-hook 'org-mode-hook #'hide-mode-line-mode) @@ -96,16 +97,16 @@ ;; Fancy tabs (use-package centaur-tabs :straight t :config - (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) - (centaur-tabs-headline-match) - (setq uniquify-separator "/") - (setq uniquify-buffer-name-style '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) + (centaur-tabs-headline-match) + (setq uniquify-separator "/") + (setq uniquify-buffer-name-style 'forward) :bind ("C-" . centaur-tabs-backward) ("C-" . centaur-tabs-forward)) @@ -166,12 +167,12 @@ ;; Adapted from https://github.com/Slackwise/dotfiles/blob/master/emacs/slackwise.el (setq-default - functions-file (concat (or (getenv "XDG_CONFIG_HOME") "~/.emacs.d/") "functions.el")) + functions-file (concat (or (getenv "XDG_CONFIG_HOME") "~/.emacs.d/") "functions.el")) (when (file-exists-p functions-file) (load functions-file)) ;; Keep the customize system from borking up this file. (setq-default - custom-file (concat (or (getenv "XDG_CONFIG_HOME") "~/.emacs.d/") "custom.el")) + custom-file (concat (or (getenv "XDG_CONFIG_HOME") "~/.emacs.d/") "custom.el")) (when (file-exists-p custom-file) (load custom-file))