diff --git a/.emacs.d/config/c.el b/.emacs.d/config/c.el
deleted file mode 100644
index 7605df6..0000000
--- a/.emacs.d/config/c.el
+++ /dev/null
@@ -1,6 +0,0 @@
-(setq c-default-style "linux"
-      c-basic-offset 2)
-
-(add-hook 'c-mode-hook
-          (lambda ()
-            (set-fill-column 100)))
diff --git a/.emacs.d/config/dev.el b/.emacs.d/config/dev.el
index f48f857..c3cae81 100644
--- a/.emacs.d/config/dev.el
+++ b/.emacs.d/config/dev.el
@@ -19,20 +19,34 @@
 
 ;; use ripgrep in emacs
 (use-package deadgrep
-             :ensure t
-             :bind ("M-s d" . deadgrep))
+  :ensure t
+  :bind ("M-s d" . deadgrep))
+
+;; rust
+(use-package cargo :ensure t)
+(use-package cargo-mode :ensure t)
+(use-package rust-mode :ensure t)
+(use-package flycheck-rust :ensure t)
+
+;; start cargo
+(add-hook 'rust-mode-hook 'cargo-minor-mode)
+
+;; format code when saving
+(setq rust-format-on-save t)
+
+;; yaml
+(use-package yaml-mode :ensure t)
+(use-package flycheck-yamllint :ensure t)
 
 ;; paredit
-(use-package paredit
-             :ensure t
-             :config
-             (autoload 'enable-paredit-mode "paredit" "Turn on pseudo-structural editing of Lisp code." t)
-             (add-hook 'emacs-lisp-mode-hook       #'enable-paredit-mode)
-             (add-hook 'eval-expression-minibuffer-setup-hook #'enable-paredit-mode)
-             (add-hook 'ielm-mode-hook             #'enable-paredit-mode)
-             (add-hook 'lisp-mode-hook             #'enable-paredit-mode)
-             (add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode)
-             (add-hook 'scheme-mode-hook           #'enable-paredit-mode))
+(use-package paredit :ensure t)
+(autoload 'enable-paredit-mode "paredit" "Turn on pseudo-structural editing of Lisp code." t)
+(add-hook 'emacs-lisp-mode-hook       #'enable-paredit-mode)
+(add-hook 'eval-expression-minibuffer-setup-hook #'enable-paredit-mode)
+(add-hook 'ielm-mode-hook             #'enable-paredit-mode)
+(add-hook 'lisp-mode-hook             #'enable-paredit-mode)
+(add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode)
+(add-hook 'scheme-mode-hook           #'enable-paredit-mode)
 
 ;; Hack to show only files known to git inside dired; needs the
 ;; `git-find' shell script shim (taken from :open https://r0tty.org/git/dotfiles/emacs/tree/.emacs.d/config/development.el)
@@ -41,18 +55,13 @@
   (let ((find-program "git-find"))
     (find-dired dir "")))
 
-;; python
-;; (defun my-shell-mode-hook ()
-;;   (add-hook
-;;    'comint-output-filter-functions
-;;    'python-pdbtrack-comint-output-filter-function t))
-;; (add-hook 'shell-mode-hook 'my-shell-mode-hook)
+;; c
+(setq c-default-style "linux"
+      c-basic-offset 2)
+
+(add-hook 'c-mode-hook
+          (lambda ()
+            (set-fill-column 100)))
 
 ;; enable flyspell checks for comments in code
 (add-hook 'prog-mode-hook #'flyspell-prog-mode)
-
-;; language server
-(use-package lsp-mode
-             :ensure t
-             :config
-             (add-hook 'rust-mode-hook 'lsp-deferred))
diff --git a/.emacs.d/config/org.el b/.emacs.d/config/org.el
index 5b92c32..585189d 100644
--- a/.emacs.d/config/org.el
+++ b/.emacs.d/config/org.el
@@ -1,5 +1,7 @@
 (use-package org
              :ensure t
-             :init (setq org-export-backends '(ascii html icalendar latex odt beamer)))
+             :init (setq org-export-backends '(ascii html icalendar latex odt beamer))
+             :mode ("\\.org\\'" . org-mode)
+             :bind (("C-c a" . org-agenda)))
 
 (setq org-directory "~/org")
diff --git a/.emacs.d/config/rust.el b/.emacs.d/config/rust.el
deleted file mode 100644
index bf43397..0000000
--- a/.emacs.d/config/rust.el
+++ /dev/null
@@ -1,13 +0,0 @@
-(use-package cargo
-             :ensure t
-             :config
-             ;; enable cargo keybindings
-             (add-hook 'rust-mode-hook 'cargo-minor-mode))
-
-(use-package rust-mode
-             :ensure t
-             :config
-             ;; format code when saving
-             (setq rust-format-on-save t))
-
-(use-package flycheck-rust :ensure t)
diff --git a/.emacs.d/config/yaml.el b/.emacs.d/config/yaml.el
deleted file mode 100644
index 45cdb62..0000000
--- a/.emacs.d/config/yaml.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(use-package yaml-mode :ensure t)
-(use-package flycheck-yamllint :ensure t)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 1d7e835..56e56c9 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -57,7 +57,7 @@ symbols, which are converted to strings, and suffixed with \".el\"."
   :group 'config-snippets
   :type '(repeat directory))
 
-(setq config-snippets '(base backups c calendar dev functions gpg matrix org pass rust wl yaml))
+(setq config-snippets '(base backups calendar dev functions gpg matrix org pass wl))
 
 (message "Loading\nconfig-snippets: %s\nconfig-snippets-path: %s" config-snippets config-snippet-path)
 (dolist (snippet config-snippets)
diff --git a/.gitignore.d/emacs b/.gitignore.d/emacs
index d8d62c3..59b399c 100644
--- a/.gitignore.d/emacs
+++ b/.gitignore.d/emacs
@@ -2,16 +2,13 @@
 !/.emacs.d/config/backups.el
 !/.emacs.d/config/base.el
 !/.emacs.d/config/calendar.el
-!/.emacs.d/config/c.el
 !/.emacs.d/config/dev.el
 !/.emacs.d/config/functions.el
 !/.emacs.d/config/gpg.el
 !/.emacs.d/config/matrix.el
 !/.emacs.d/config/org.el
 !/.emacs.d/config/pass.el
-!/.emacs.d/config/rust.el
 !/.emacs.d/config/tramp.el
-!/.emacs.d/config/yaml.el
 !/.emacs.d/init.el
 !/.gitignore.d/emacs
 !/.local/bin/em