diff --git a/modules/home/caem/development/emacs/emacs.d/core/completions.el b/modules/home/caem/development/emacs/emacs.d/core/completions.el
new file mode 100644
index 0000000..773308c
--- /dev/null
+++ b/modules/home/caem/development/emacs/emacs.d/core/completions.el
@@ -0,0 +1,24 @@
+(use-package lsp-mode
+  :ensure t
+  :init
+  (setq lsp-keymap-prefix "C-c l")
+  :hook
+  (prog-mode . lsp)
+  :commands lsp)
+
+(use-package lsp-ui
+  :ensure t
+  :commands lsp-ui-mode)
+
+(use-package company
+  :ensure t
+  :hook
+  (after-init-hook . global-company-mode))
+
+(use-package flycheck
+  :ensure t
+  :hook
+  (after-init-hook . global-flycheck-mode)
+  :init
+  (setq flycheck-emacs-lisp-load-path 'inherit
+        flycheck-emacs-lisp-initialize-packages t))
diff --git a/modules/home/caem/development/emacs/emacs.d/core/init.el b/modules/home/caem/development/emacs/emacs.d/core/init.el
index c7fdc53..af063ea 100644
--- a/modules/home/caem/development/emacs/emacs.d/core/init.el
+++ b/modules/home/caem/development/emacs/emacs.d/core/init.el
@@ -4,3 +4,5 @@
 (rei/load "appearance.el")
 (rei/load "tree-sitter.el")
 (rei/load "ido.el")
+(rei/load "completions.el")
+(rei/load "misc.el")
diff --git a/modules/home/caem/development/emacs/emacs.d/core/litter.el b/modules/home/caem/development/emacs/emacs.d/core/litter.el
index e5622c1..b774e71 100644
--- a/modules/home/caem/development/emacs/emacs.d/core/litter.el
+++ b/modules/home/caem/development/emacs/emacs.d/core/litter.el
@@ -8,3 +8,8 @@
   (setq no-littering-etc-directory (file-name-concat (xdg-data-home) "emacs")
         no-littering-var-directory (file-name-concat (xdg-data-home) "emacs"))
   (no-littering-theme-backups))
+
+;; Not the perfect place for this but it needs to be called after
+;; no littering is set up.
+(use-package gnu-elpa-keyring-update
+  :ensure t)
diff --git a/modules/home/caem/development/emacs/emacs.d/core/misc.el b/modules/home/caem/development/emacs/emacs.d/core/misc.el
new file mode 100644
index 0000000..f1c301f
--- /dev/null
+++ b/modules/home/caem/development/emacs/emacs.d/core/misc.el
@@ -0,0 +1,2 @@
+(setq scroll-step 1
+      scroll-margin 8)
diff --git a/modules/home/caem/development/emacs/emacs.d/core/repositories.el b/modules/home/caem/development/emacs/emacs.d/core/repositories.el
index e47f362..d3effb5 100644
--- a/modules/home/caem/development/emacs/emacs.d/core/repositories.el
+++ b/modules/home/caem/development/emacs/emacs.d/core/repositories.el
@@ -1,6 +1,7 @@
-(require 'package)
 (setq package-user-dir (file-name-concat (xdg-data-home) "emacs" "elpa"))
+(setq package-gnupghome-dir (file-name-concat package-user-dir "gnupg"))
 
+(require 'package)
 (if using-nix
     (progn
       (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
diff --git a/modules/home/caem/development/emacs/emacs.d/modes/init.el b/modules/home/caem/development/emacs/emacs.d/modes/init.el
index 0ba22b8..b746b5c 100644
--- a/modules/home/caem/development/emacs/emacs.d/modes/init.el
+++ b/modules/home/caem/development/emacs/emacs.d/modes/init.el
@@ -10,3 +10,4 @@
 (rei/load "c-mode.el")
 (rei/load "lisp")
 (rei/load "meson-mode.el")
+(rei/load "term-mode.el")
diff --git a/modules/home/caem/development/emacs/emacs.d/modes/term-mode.el b/modules/home/caem/development/emacs/emacs.d/modes/term-mode.el
new file mode 100644
index 0000000..0fe3251
--- /dev/null
+++ b/modules/home/caem/development/emacs/emacs.d/modes/term-mode.el
@@ -0,0 +1,4 @@
+(defun reset-scroll-config ()
+  (setq-local scroll-margin 0))
+
+(add-hook 'term-mode-hook #'reset-scroll-config)
diff --git a/modules/nixos/multimedia/web/default.nix b/modules/nixos/multimedia/web/default.nix
index e4fb51f..d0996d2 100644
--- a/modules/nixos/multimedia/web/default.nix
+++ b/modules/nixos/multimedia/web/default.nix
@@ -1,5 +1,13 @@
-{ lib, ... }:
+{ lib, pkgs, username, ... }:
 
 {
   imports = lib.getModuleImports ./.;
+  environment = {
+    persistence."/nix/persist".users."${username}".directories = [
+      ".config/chromium"
+    ];
+    systemPackages = with pkgs; [
+      unstable.cromite
+    ];
+  };
 }