diff --git a/flake.lock b/flake.lock
index da4e7ed..7dde609 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -100,6 +118,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1759036355,
+        "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
@@ -107,7 +141,8 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "vicinae": "vicinae"
       }
     },
     "sops-nix": {
@@ -127,6 +162,40 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "vicinae": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1761455154,
+        "narHash": "sha256-cUsZjD4YIFaqW68yTEJ1SY2LBmFRsIiER0MrP1n1U9M=",
+        "owner": "vicinaehq",
+        "repo": "vicinae",
+        "rev": "92a572d68406d41f6cfca6ddb8cc59fc85a38227",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vicinaehq",
+        "repo": "vicinae",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 3dc0eec..8d998fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,9 +10,11 @@
         
         sops-nix.url         = "github:Mic92/sops-nix";
         impermanence.url     = "github:nix-community/impermanence";
+
+        vicinae.url          = "github:vicinaehq/vicinae";
     };
     
-    outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, sops-nix, impermanence, ...}:
+    outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, sops-nix, impermanence, vicinae, ...}:
     let
         mkSystem = { host, system, extraModules ? [ ] }:
             let 
diff --git a/hosts/x1g9/default.nix b/hosts/x1g9/default.nix
index 6b77d4e..d6bf91e 100644
--- a/hosts/x1g9/default.nix
+++ b/hosts/x1g9/default.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
 {
   imports =
@@ -23,6 +23,8 @@
       ../../home-manager/moons/default.nix
       ../../modules/hm/gui.nix
       ../../home-manager/hosts/x1g9.nix
+      inputs.vicinae.homeManagerModules.default
+      ../../modules/hm/vicinae.nix
     ];
   };
 }
diff --git a/modules/hm/niri/config.kdl b/modules/hm/niri/config.kdl
index ac115f6..39fd909 100644
--- a/modules/hm/niri/config.kdl
+++ b/modules/hm/niri/config.kdl
@@ -366,7 +366,7 @@ binds {
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
     Mod+T hotkey-overlay-title="Open a Terminal: alacritty" { spawn "alacritty"; }
-    Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
+    Mod+D hotkey-overlay-title="Run an Application: vicinae" { spawn "vicinae"; }
     Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
 
     // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc.
diff --git a/modules/hm/vicinae.nix b/modules/hm/vicinae.nix
new file mode 100644
index 0000000..c3670e9
--- /dev/null
+++ b/modules/hm/vicinae.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+{
+    services.vicinae = {
+        enable = true;
+        autoStart = true;
+        settings = {
+            faviconService = "twenty";
+            font.size = 11;
+            popToRootOnClose = false;
+            rootSearch.searchFiles = false;
+            theme.name = "vicinae-dark";
+            window = {
+                csd = true;
+                opacity = 0.95;
+                rounding = 10;
+            };
+        };
+    };
+}
\ No newline at end of file
diff --git a/modules/nixos/base.nix b/modules/nixos/base.nix
index 4f06774..ccb8665 100644
--- a/modules/nixos/base.nix
+++ b/modules/nixos/base.nix
@@ -20,4 +20,9 @@
     
     # basic network setting
     networking.networkmanager.enable = true;
+
+    nix.settings = {
+        extra-substituters = [ "https://vicinae.cachix.org" ];
+        extra-trusted-public-keys = [ "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ];
+    };
 }