diff --git a/flake.nix b/flake.nix
index 40353fd..18ce4d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,8 +44,16 @@
     vault-unseal.url = "git+https://git.0x76.dev/v/vault-unseal.git";
   };
 
-  outputs = { self, nixpkgs, nixpkgs_22-11, vault-secrets, colmena
-    , nixos-generators, nur, ... }@inputs:
+  outputs =
+    { self
+    , nixpkgs
+    , nixpkgs_22-11
+    , vault-secrets
+    , colmena
+    , nixos-generators
+    , nur
+    , ...
+    }@inputs:
     let
       inherit (nixpkgs) lib;
 
@@ -79,7 +87,8 @@
         source /etc/set-environment
         nix repl --file "${./.}/repl.nix" $@
       '';
-    in {
+    in
+    {
       # Make the nixosConfigurations for compat reasons (e.g. vault)
       nixosConfigurations =
         (import (inputs.colmena + "/src/nix/hive/eval.nix") {
@@ -91,12 +100,14 @@
         }).nodes;
 
       # Make the colmena configuration
-      colmena = lib.foldr (el: acc: acc // util.mkColmenaHost el) {
-        meta = {
-          inherit specialArgs;
-          nixpkgs = pkgs;
-        };
-      } nixHosts;
+      colmena = lib.foldr (el: acc: acc // util.mkColmenaHost el)
+        {
+          meta = {
+            inherit specialArgs;
+            nixpkgs = pkgs;
+          };
+        }
+        nixHosts;
 
       packages.${system} = {
         inherit apply-local;
diff --git a/nixos/common/common.nix b/nixos/common/common.nix
index 7a34a8a..a61ac68 100644
--- a/nixos/common/common.nix
+++ b/nixos/common/common.nix
@@ -57,12 +57,8 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  nixpkgs.config.permittedInsecurePackages = [
-                 "nodejs-14.21.3"
-                 "openssl-1.1.1t"
-                 "nodejs-16.20.0"
-               ];
-
+  nixpkgs.config.permittedInsecurePackages =
+    [ "nodejs-14.21.3" "openssl-1.1.1t" "nodejs-16.20.0" ];
 
   # Limit the systemd journal to 100 MB of disk or the
   # last 7 days of logs, whichever happens first.
diff --git a/nixos/common/desktop/default.nix b/nixos/common/desktop/default.nix
index af704c1..e9bf197 100644
--- a/nixos/common/desktop/default.nix
+++ b/nixos/common/desktop/default.nix
@@ -3,7 +3,7 @@
   boot = {
     kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
     loader = {
-      systemd-boot.enable = true;
+      systemd-boot.enable = lib.mkDefault true;
       efi.canTouchEfiVariables = true;
       efi.efiSysMountPoint = "/boot/efi";
     };
@@ -38,7 +38,9 @@
   services.printing.enable = true;
 
   # Global Packages
-  environment.systemPackages = with pkgs; [ wireguard-tools sbctl ];
+  environment = {
+    systemPackages = with pkgs; [ wireguard-tools sbctl ];
+  };
 
   # Enable sound with pipewire.
   sound.enable = true;
@@ -83,6 +85,18 @@
     remotePlay.openFirewall = true;
   };
 
+  programs.adb.enable = true;
+
+  # Debloat
+  documentation = {
+    enable = false;
+    doc.enable = false;
+    man.enable = false;
+    info.enable = false;
+    nixos.enable = false;
+  };
+  system.disableInstallerTools = true;
+
   # Networking
   networking.networkmanager.enable = true;
   networking.firewall.checkReversePath = false;
diff --git a/nixos/common/desktop/home.nix b/nixos/common/desktop/home.nix
index c575b57..7a64942 100644
--- a/nixos/common/desktop/home.nix
+++ b/nixos/common/desktop/home.nix
@@ -59,6 +59,8 @@ in {
       push.autoSetupRemote = true;
       init.defaultBranch = "main";
     };
+
+    difftastic.enable = true;
   };
 
   programs.tmux = {
diff --git a/nixos/common/hm-modules/nvim.nix b/nixos/common/hm-modules/nvim.nix
index b2a96e3..4818d83 100644
--- a/nixos/common/hm-modules/nvim.nix
+++ b/nixos/common/hm-modules/nvim.nix
@@ -11,11 +11,16 @@ in {
 
       globals = { mapleader = " "; };
 
+      options = { number = true; };
+
       maps.normal = {
         "<leader>ff" = "<cmd>lua require('telescope.builtin').find_files()<cr>";
         "<leader>fg" = "<cmd>lua require('telescope.builtin').live_grep()<cr>";
+
         "<C-_>" =
           "<cmd>lua require('Comment.api').toggle.linewise.current()<cr>"; # map ctrl+/ to commenting code
+
+        "g=" = "<cmd>lua vim.lsp.buf.format{async=true}<cr>";
       };
 
       extraPlugins = with pkgs.vimPlugins; [ catppuccin-nvim luasnip ];
@@ -26,6 +31,19 @@ in {
 
       plugins = {
         bufferline.enable = true;
+        null-ls = {
+          enable = true;
+          sources = {
+            formatting.nixpkgs_fmt.enable = true;
+            code_actions.shellcheck.enable = true;
+            code_actions.statix.enable = true;
+            diagnostics = {
+              statix.enable = true;
+              deadnix.enable = true;
+              shellcheck.enable = true;
+            };
+          };
+        };
         nix.enable = true;
         treesitter = {
           enable = true;
@@ -47,8 +65,8 @@ in {
         comment-nvim = { enable = true; };
         lsp = {
           enable = true;
+          servers.nil_ls.enable = true;
           servers.rust-analyzer.enable = true;
-          servers.rnix-lsp.enable = true;
           servers.pyright.enable = true;
           servers.elixirls.enable = true;
           servers.clangd.enable = true;
diff --git a/nixos/common/users/default.nix b/nixos/common/users/default.nix
index 674a6d7..bf0253f 100644
--- a/nixos/common/users/default.nix
+++ b/nixos/common/users/default.nix
@@ -23,6 +23,8 @@
   programs.neovim = {
     enable = true;
     viAlias = true;
+    vimAlias = true;
+    defaultEditor = true;
   };
 
   # Disable sudo prompt for `wheel` users.
diff --git a/nixos/hosts/olympus/eevee/hardware.nix b/nixos/hosts/olympus/eevee/hardware.nix
index 561c570..6efe1de 100644
--- a/nixos/hosts/olympus/eevee/hardware.nix
+++ b/nixos/hosts/olympus/eevee/hardware.nix
@@ -22,6 +22,11 @@
     driSupport = true;
   };
 
+  hardware.logitech.wireless = {
+    enable = true;
+    enableGraphical = true;
+  };
+
   # udev
   services.udev.packages = with pkgs; [
     android-udev-rules
diff --git a/nixos/pkgs/dnd-5e-latex-template/default.nix b/nixos/pkgs/dnd-5e-latex-template/default.nix
index ef5ffca..c295de6 100644
--- a/nixos/pkgs/dnd-5e-latex-template/default.nix
+++ b/nixos/pkgs/dnd-5e-latex-template/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchFromGitHub }:
+{ lib, stdenvNoCC, fetchFromGitHub }:
 stdenvNoCC.mkDerivation rec {
   pname = "dnd-5e-latex-template";
   version = "0.8.0";
@@ -23,5 +23,8 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = { description = "DnD 5e latex template"; };
+  meta = {
+    description = "DnD 5e latex template";
+    license = lib.licenses.mit;
+  };
 }
diff --git a/nixos/pkgs/gitea-agatheme/default.nix b/nixos/pkgs/gitea-agatheme/default.nix
index ec5fdf7..0901a05 100644
--- a/nixos/pkgs/gitea-agatheme/default.nix
+++ b/nixos/pkgs/gitea-agatheme/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchurl }:
+{ stdenvNoCC, fetchurl, lib }:
 stdenvNoCC.mkDerivation {
   pname = "gitea-agatheme";
   version = "1.2";
@@ -14,4 +14,8 @@ stdenvNoCC.mkDerivation {
   installPhase = ''
     cp $src $out
   '';
+
+  meta = with lib; {
+    description = "Gitea/Forgejo purple theme";
+  };
 }