diff --git a/config.el b/config.el
index cf0e263..2fa6beb 100644
--- a/config.el
+++ b/config.el
@@ -31,7 +31,9 @@
   (tab-always-indent 'complete)
   :hook (prog-mode . display-line-numbers-mode))
 
-(use-package ivy
+(use-package counsel
+  :defer t
+  :commands (ivy-mode counsel-mode swiper)
   :custom
   (ivy-use-virtual-buffers t)
   :bind (("C-s" . swiper-isearch)
@@ -55,52 +57,82 @@
   :hook after-init)
 
 (use-package savehist
+  :defer t
+  :commands (savehist-mode)
   :hook after-init)
 
 (use-package which-key
+  :defer t
+  :commands (which-key-mode)
   :hook after-init)
 
 (use-package base16-theme
   :config
   (load-theme 'base16-tokyo-night-dark t))
 
-(use-package nix-mode
+(use-package nix-ts-mode
+  :defer t
+  :commands (nix-ts-mode)
   :mode "\\.nix\\'")
 
 (use-package rust-mode
+  :defer t
+  :commands (rust-mode)
   :mode "\\.rs\\'")
 
-(when (executable-find "direnv")
-  (use-package envrc
-    :hook after-init))
+(use-package envrc
+  :defer t
+  :commands (envrc-mode)
+  :hook after-init)
 
 (use-package eglot
+  :defer t
+  :commands (eglot eglot-ensure)
   :hook (prog-mode . eglot-ensure))
 
 (use-package qml-mode
+  :defer t
+  :commands (qml-mode)
   :mode "\\.qml\\'")
 
 (use-package haskell-mode
+  :defer t
+  :commands (haskell-mode)
   :mode "\\.hs\\'")
 
 (use-package python
+  :defer t
+  :commands (python-ts-mode python-mode)
   :custom
   (python-indent-offset 4))
 
 (use-package cc-mode
+  :defer t
+  :commands (c-ts-mode
+	     c++-ts-mode
+	     c++-mode
+	     c-mode)
   :custom
   (c-basic-offset 4))
 
 (use-package nushell-mode
+  :defer t
+  :commands (nushell-mode)
   :mode "\\.nu\\'")
 
 (use-package tuareg
+  :defer t
+  :commands (tuareg-mode tuareg-opam-mode)
   :mode "\\.ml\\'")
 
 (use-package nim-mode
+  :defer t
+  :commands (nim-mode)
   :mode "\\.nim\\'")
 
 (use-package doom-modeline
+  :defer t
+  :commands (doom-modeline-mode)
   :hook after-init)
 
 (provide 'config)
diff --git a/flake.lock b/flake.lock
index 81d9512..4c4e4c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1741485571,
-        "narHash": "sha256-fpm1ZTfGfMG36c4G3HSwmbd09zU3egmM0dfgDxkT3h4=",
+        "lastModified": 1743991507,
+        "narHash": "sha256-sRyA1LOsRSeF8W2drXEuGU2U+actcYEKdk1f+2kDKb8=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "db37ae9cd947031ad83288dec514233ffd262ffd",
+        "rev": "ac8af15c5f586879c08cd257b69749f791d94e68",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741379970,
-        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
+        "lastModified": 1743827369,
+        "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
+        "rev": "42a1c966be226125b48c384171c44c651c236c22",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1741332913,
-        "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
+        "lastModified": 1743813633,
+        "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
+        "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
         "type": "github"
       },
       "original": {
diff --git a/lib.nix b/lib.nix
index 87e1e86..67be8de 100644
--- a/lib.nix
+++ b/lib.nix
@@ -21,7 +21,7 @@ let
             counsel
             swiper
             base16-theme
-            nix-mode
+            nix-ts-mode
             rust-mode
             haskell-mode
             qml-mode