diff --git a/flake.lock b/flake.lock
index 9c1271a..f1b33a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "dotfiles": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725956275,
+        "narHash": "sha256-4tHKP+PLpJKnFfOT6MY3p/NDBr/3NDyWljB8/iELVZs=",
+        "ref": "refs/heads/master",
+        "rev": "b1393f4b54b8e908b770450ccc49400713d8e457",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://code.m3tam3re.com/m3tam3re/dotfiles-flake-demo.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://code.m3tam3re.com/m3tam3re/dotfiles-flake-demo.git"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -54,6 +70,7 @@
     },
     "root": {
       "inputs": {
+        "dotfiles": "dotfiles",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable"
diff --git a/flake.nix b/flake.nix
index 4f8e669..ca08d39 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,10 +17,16 @@
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
+
+    dotfiles = {
+      url = "git+https://code.m3tam3re.com/m3tam3re/dotfiles-flake-demo.git";
+      flake = false;
+    };
   };
 
   outputs = {
     self,
+    dotfiles,
     home-manager,
     nixpkgs,
     ...
diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix
index b50ae0a..3d4924b 100644
--- a/home/features/desktop/default.nix
+++ b/home/features/desktop/default.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   imports = [
+    ./fonts.nix
     ./hyprland.nix
     ./wayland.nix
   ];
diff --git a/home/features/desktop/fonts.nix b/home/features/desktop/fonts.nix
new file mode 100644
index 0000000..5953cf0
--- /dev/null
+++ b/home/features/desktop/fonts.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.features.desktop.fonts;
+in {
+  options.features.desktop.fonts.enable =
+    mkEnableOption "install additional fonts for desktop apps";
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      fira-code
+      fira-code-symbols
+      fira-code-nerdfont
+      font-manager
+      font-awesome_5
+      noto-fonts
+    ];
+  };
+}
diff --git a/home/m3tam3re/dotfiles/bat.nix b/home/m3tam3re/dotfiles/bat.nix
new file mode 100644
index 0000000..c2ae65a
--- /dev/null
+++ b/home/m3tam3re/dotfiles/bat.nix
@@ -0,0 +1,8 @@
+{
+  home.file.".config/bat/config".text = ''
+    --theme="Dracula"
+
+    # Show line numbers, Git modifications and file header (but no grid)
+    --style="numbers,changes,header"
+  '';
+}
diff --git a/home/m3tam3re/dotfiles/default.nix b/home/m3tam3re/dotfiles/default.nix
new file mode 100644
index 0000000..c8e93e5
--- /dev/null
+++ b/home/m3tam3re/dotfiles/default.nix
@@ -0,0 +1,10 @@
+{inputs, ...}: {
+  imports = [
+    ./bat.nix
+  ];
+
+  home.file.".config/nvim" = {
+    source = "${inputs.dotfiles}/nvim";
+    recursive = true;
+  };
+}
diff --git a/home/m3tam3re/m3-kratos.nix b/home/m3tam3re/m3-kratos.nix
index 6fde27e..a378032 100644
--- a/home/m3tam3re/m3-kratos.nix
+++ b/home/m3tam3re/m3-kratos.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ../common
+    ./dotfiles
     ../features/cli
     ../features/desktop
     ./home.nix
@@ -13,6 +14,7 @@
       neofetch.enable = true;
     };
     desktop = {
+      fonts.enable = true;
       hyprland.enable = true;
       wayland.enable = true;
     };