Skip to content
This repository has been archived by the owner on Jan 22, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:matthewscottgordon/emacs.d
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewscottgordon committed Jan 3, 2022
2 parents 9b69068 + ebddb79 commit 0a5fc75
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ tramp
/elpa
/url
/recentf
/transient
/transient
customize.el
13 changes: 8 additions & 5 deletions init.el
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
(require 'package)

(setq package-archives
'(("org" . "https://orgmode.org/elpa/")
("gnu" . "https://elpa.gnu.org/packages/")
("melpa" . "https://melpa.org/packages/")))
'(("melpa" . "https://melpa.org/packages/")))

(package-initialize)
;;(package-refresh-contents)
Expand Down Expand Up @@ -103,15 +101,15 @@
;; Rust
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(require 'rust-mode)
(use-package rust-mode)
(add-hook 'rust-mode-hook
(lambda () (setq indent-tabs-mode nil)))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Svelte
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(require 'svelte-mode)
(use-package svelte-mode)

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; C, C++, CMake and Qt
Expand Down Expand Up @@ -240,9 +238,14 @@
(global-set-key (kbd "C-c u c")
(lambda () (interactive) (insert ""))) ;;Mac command symbol


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Local settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(let ((local-settings "~/.emacs.d/local.el"))
(when (file-exists-p local-settings)
(load local-settings)))

(setq custom-file "~/.emacs.d/customize.el")
(load custom-file :noerror)

0 comments on commit 0a5fc75

Please sign in to comment.