diff --git a/flake.lock b/flake.lock
index d1b8ed9..288ec25 100644
--- a/flake.lock
+++ b/flake.lock
@@ -686,6 +686,23 @@
         "type": "indirect"
       }
     },
+    "magit-file-icons": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1719343259,
+        "narHash": "sha256-yE11UXM49emqnCBqJvf2ck4BwmHmhIhuJUPvxEBaQr8=",
+        "owner": "librephoenix",
+        "repo": "magit-file-icons",
+        "rev": "d2fae0b97e7499e6b20d1af3dc6e098d4182cfdb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "librephoenix",
+        "ref": "all-the-icons",
+        "repo": "magit-file-icons",
+        "type": "github"
+      }
+    },
     "mini-frame": {
       "flake": false,
       "locked": {
@@ -748,6 +765,57 @@
         "type": "github"
       }
     },
+    "nix-formatter-pack": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt"
+      },
+      "locked": {
+        "lastModified": 1705252799,
+        "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "type": "github"
+      }
+    },
+    "nix-on-droid": {
+      "inputs": {
+        "home-manager": [
+          "home-manager-unstable"
+        ],
+        "nix-formatter-pack": "nix-formatter-pack",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-docs": "nixpkgs-docs",
+        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
+        "nmd": "nmd_2"
+      },
+      "locked": {
+        "lastModified": 1710434231,
+        "narHash": "sha256-yrWnsG28518tbIapJWiluweHORuuIwAQrA8lga0Sqlw=",
+        "owner": "nix-community",
+        "repo": "nix-on-droid",
+        "rev": "2d93311c4f3f300154d2085e4b4b1d550237da92",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "nix-on-droid",
+        "type": "github"
+      }
+    },
     "nix-straight": {
       "flake": false,
       "locked": {
@@ -780,6 +848,38 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-docs": {
+      "locked": {
+        "lastModified": 1705957679,
+        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-for-bootstrap": {
+      "locked": {
+        "lastModified": 1708105575,
+        "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1718811006,
@@ -827,6 +927,60 @@
         "type": "github"
       }
     },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1666190571,
+        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
+      }
+    },
+    "nmd_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs-docs"
+        ],
+        "scss-reset": "scss-reset"
+      },
+      "locked": {
+        "lastModified": 1705050560,
+        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
+        "owner": "~rycee",
+        "repo": "nmd",
+        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
+        "type": "sourcehut"
+      },
+      "original": {
+        "owner": "~rycee",
+        "repo": "nmd",
+        "type": "sourcehut"
+      }
+    },
+    "nmt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648075362,
+        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
+        "owner": "rycee",
+        "repo": "nmt",
+        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmt",
+        "type": "gitlab"
+      }
+    },
     "nose": {
       "flake": false,
       "locked": {
@@ -1094,8 +1248,10 @@
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs",
+        "magit-file-icons": "magit-file-icons",
         "mini-frame": "mini-frame",
         "nix-doom-emacs": "nix-doom-emacs",
+        "nix-on-droid": "nix-on-droid",
         "nix-straight": "nix-straight",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
@@ -1146,6 +1302,22 @@
         "type": "github"
       }
     },
+    "scss-reset": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1631450058,
+        "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
+        "type": "github"
+      },
+      "original": {
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "type": "github"
+      }
+    },
     "sln-mode": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 73817bc..4ed61c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -266,6 +266,10 @@
       url = "github:jcfk/org-sliced-images";
       flake = false;
     };
+    magit-file-icons = {
+      url = "github:librephoenix/magit-file-icons/all-the-icons";
+      flake = false;
+    };
     phscroll = {
       url = "github:misohena/phscroll";
       flake = false;
diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index 1184955..91849f2 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -1262,6 +1262,10 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 (setq magit-todos-keywords-list '("TODO" "FIXME" "HACK" "REVIEW" "DEPRECATED" "BUG"))
 (magit-todos-mode 1)
 
+(add-load-path! "~/.emacs.d/magit-file-icons")
+(require 'magit-file-icons)
+(magit-file-icons-mode 1)
+
 (require 'all-the-icons-ibuffer)
 (add-hook 'ibuffer-mode-hook #'all-the-icons-ibuffer-mode)
 (setq all-the-icons-ibuffer-color-icon t)
diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix
index d18ceab..b1544f4 100644
--- a/user/app/doom-emacs/doom.nix
+++ b/user/app/doom-emacs/doom.nix
@@ -109,6 +109,10 @@ in
     source = "${inputs.org-sliced-images}";
   };
 
+  home.file.".emacs.d/magit-file-icons" = {
+    source = "${inputs.magit-file-icons}";
+  };
+
   home.file.".emacs.d/dashboard-logo.webp".source = dashboardLogo;
   home.file.".emacs.d/scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh" = {
     source = ./scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh;
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index 5d18868..ccb32bc 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -1477,6 +1477,10 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 (setq magit-todos-keywords-list '("TODO" "FIXME" "HACK" "REVIEW" "DEPRECATED" "BUG"))
 (magit-todos-mode 1)
 
+(add-load-path! "~/.emacs.d/magit-file-icons")
+(require 'magit-file-icons)
+(magit-file-icons-mode 1)
+
 #+END_SRC
 ** Ibuffer Configuration
 #+BEGIN_SRC emacs-lisp :tangle config.el
@@ -2091,6 +2095,7 @@ Any git package can be configured for a particular commit or branch:
 (package! persist)
 (package! sudo-edit)
 (package! solaire-mode :disable t)
+(package! el-patch)
 #+END_SRC
 * Nix Integration
 In order to have Nix load my Doom Emacs configuration [[./doom.nix][doom.nix]], which I source in the =imports= block of my [[../../../profiles/work/home.nix][home.nix]].
@@ -2206,6 +2211,10 @@ in
     source = "${inputs.org-sliced-images}";
   };
 
+  home.file.".emacs.d/magit-file-icons" = {
+    source = "${inputs.magit-file-icons}";
+  };
+
   home.file.".emacs.d/dashboard-logo.webp".source = dashboardLogo;
   home.file.".emacs.d/scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh" = {
     source = ./scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh;
diff --git a/user/app/doom-emacs/packages.el b/user/app/doom-emacs/packages.el
index dfb2472..e1297da 100644
--- a/user/app/doom-emacs/packages.el
+++ b/user/app/doom-emacs/packages.el
@@ -33,3 +33,4 @@
 (package! persist)
 (package! sudo-edit)
 (package! solaire-mode :disable t)
+(package! el-patch)