diff --git a/config.el b/config.el
index 8a1eeaa..60cee69 100644
--- a/config.el
+++ b/config.el
@@ -20,21 +20,35 @@
   (setq minibuffer-prompt-properties
         '(read-only t cursor-intangible t face minibuffer-prompt))
   (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
-  :config
-  (menu-bar-mode -1)
-  (tool-bar-mode -1)
-  (scroll-bar-mode -1)
-  (setq enable-recursive-minibuffers t
-	read-extended-command-predicate #'command-completion-default-include-p
-	tab-always-indent 'complete)
+  :custom
+  (menu-bar-mode nil)
+  (tool-bar-mode nil)
+  (scroll-bar-mode nil)
+  (delete-selection-mode t)
+  (enable-recursive-buffer t)
+  (read-extended-command-predicate #'command-completion-default-include-p)
+  (tab-always-indent 'complete)
+  (mode-line-format nil)
   :hook (prog-mode . display-line-numbers-mode))
 
-(use-package mood-line
-  :hook after-init)
+(use-package nano-modeline
+  :hook ((prog-mode . nano-modeline-prog-mode)
+	 (text-mode . nano-modeline-text-mode)
+	 (org-mode . nano-modeline-org-mode)
+	 (pdf-view-mode . nano-modeline-pdf-mode)
+	 (mu4e-headers-mode . nano-modeline-mu4e-headers-mode)
+	 (mu4e-view-mode . nano-modeline-mu4e-message-mode)
+	 (elfeed-show-mode . nano-modeline-elfeed-entry-mode)
+	 (elfeed-search-mode . nano-modeline-elfeed-search-mode)
+	 (term-mode . nano-modeline-term-mode)
+	 (xwidget-webkit-mode . nano-modeline-xwidget-mode)
+	 (messages-buffer-mode . nano-modeline-message-mode)
+	 (org-capture-mode . nano-modeline-org-capture-mode)
+	 (org-agenda-mode . nano-modeline-org-agenda-mode)))
 
 (use-package ivy
-  :config
-  (setq ivy-use-virtual-buffers t)
+  :custom
+  (ivy-use-virtual-buffers t)
   :bind (("C-s" . swiper-isearch)
          ("C-c C-r" . ivy-resume)
          ("<f6>" . ivy-resume)
@@ -85,21 +99,21 @@
   :mode "\\.hs\\'")
 
 (use-package python
-  :config
-  (setq python-indent-offset 4))
+  :custom
+  (python-indent-offset 4))
 
 (use-package cc-mode
-  :config
-  (setq c-basic-offset 4))
+  :custom
+  (c-basic-offset 4))
 
 (use-package nushell-mode
   :mode "\\.nu\\'")
 
-(use-package spacious-padding
-  :config
-  (spacious-padding-mode))
-
 (use-package tuareg
   :mode "\\.ml\\'")
 
+(use-package nerd-icons
+  :custom
+  (nerd-icons-font-family "Symbols Nerd Font Mono"))
+
 (provide 'config)
diff --git a/flake.nix b/flake.nix
index 17bd0f6..574b6ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,23 +14,16 @@
       systems = [
         "x86_64-linux"
       ];
-      forAllSystems = lib.genAttrs systems;
-      pkgs = builtins.listToAttrs (
-        map (system: {
-          name = system;
-          value = import inputs.nixpkgs {
-            inherit system;
-          };
-        }) systems
-      );
+      pkgsFor = inputs.nixpkgs.legacyPackages;
+      forAllSystems = f: lib.genAttrs systems (system: f system pkgsFor.${system});
     in
     {
       lib = import ./lib.nix inputs;
-      formatter = forAllSystems (system: pkgs.${system}.nixfmt-rfc-style);
-      packages = forAllSystems (system: {
+      formatter = forAllSystems (_: pkgs: pkgs.nixfmt-rfc-style);
+      packages = forAllSystems (_: pkgs: {
         pgtk = inputs.self.lib.mkPankomacs {
-          pkgs = pkgs.${system};
-          emacs = pkgs.${system}.emacs30-pgtk;
+          inherit pkgs;
+          emacs = pkgs.emacs30-pgtk;
         };
       });
     };
diff --git a/lib.nix b/lib.nix
index 02be41f..9f5fb61 100644
--- a/lib.nix
+++ b/lib.nix
@@ -28,7 +28,7 @@ let
         builtins.attrValues {
           inherit (epkgs)
             spacious-padding
-            mood-line
+            nano-modeline
             ivy
             counsel
             swiper
@@ -40,6 +40,7 @@ let
             tuareg
             nushell-mode
             envrc
+            nerd-icons
             ;
           treesit-grammars = epkgs.treesit-grammars.with-all-grammars;
         };