diff --git a/flake.lock b/flake.lock
index e20bd7d..f7f634a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -78,6 +78,26 @@
         "type": "github"
       }
     },
+    "encore": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732622350,
+        "narHash": "sha256-bvVhpwiFvF5bUi2ibXWSOC+KjTnYjMKC8KWEGaKfmD8=",
+        "owner": "encoredev",
+        "repo": "encore-flake",
+        "rev": "b84e86d318fed699aaa9a5d57c4a626e8a335555",
+        "type": "github"
+      },
+      "original": {
+        "owner": "encoredev",
+        "repo": "encore-flake",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -143,24 +163,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "fmpkgs": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -405,27 +407,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-extra": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730130037,
-        "narHash": "sha256-SY8XTuX4E4Up/AYt54y6w4WT2xYtsGrgfk6F5YH7gR8=",
-        "owner": "luisnquin",
-        "repo": "nixpkgs-extra",
-        "rev": "80a7962e35edbf8a8f5737f42b8e53e74a6d8efd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "luisnquin",
-        "repo": "nixpkgs-extra",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1730504152,
@@ -538,6 +519,7 @@
         "catppuccin": "catppuccin",
         "chaotic": "chaotic",
         "disko": "disko",
+        "encore": "encore",
         "flake-parts": "flake-parts",
         "fmpkgs": "fmpkgs",
         "fmway-nix": "fmway-nix",
@@ -548,7 +530,6 @@
         "nixpkgs": "nixpkgs_6",
         "nixpkgs-24_05": "nixpkgs-24_05",
         "nixpkgs-24_11": "nixpkgs-24_11",
-        "nixpkgs-extra": "nixpkgs-extra",
         "nur": "nur"
       }
     },
@@ -581,21 +562,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 5f5fc6a..5d7ac93 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,11 +22,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     fmpkgs.url = "github:fmway/fmpkgs/master";
-    nixpkgs-extra = {
-      url = "github:luisnquin/nixpkgs-extra";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    encore.url = "github:encoredev/encore-flake";
+    encore.inputs.nixpkgs.follows = "nixpkgs";
     # TODO
     # nix-colors.url = "github:misterio77/nix-colors";
     home-manager.url = "github:nix-community/home-manager/master";
diff --git a/programs/cli/default.nix b/programs/cli/default.nix
index b6d15ed..d8f93a0 100644
--- a/programs/cli/default.nix
+++ b/programs/cli/default.nix
@@ -41,7 +41,7 @@
     # aerc # neomutt alternative
     # frogmouth # tui markdown viewer. awesome but, very lag
     # manix # nix options search
-    extra.encore # awesome tools for developing go and typescript
+    encore # awesome tools for developing go and typescript
     nix-init # automate builder nix derivation
     # nurl # ?
     rclone
diff --git a/programs/extra/encore.nix b/programs/extra/encore.nix
new file mode 100644
index 0000000..0dbf1c7
--- /dev/null
+++ b/programs/extra/encore.nix
@@ -0,0 +1,2 @@
+{ inputs, self, ... }:
+inputs.encore.packages.${self.system}.encore
diff --git a/programs/overlays.nix b/programs/overlays.nix
index 12b7c62..f9f6dda 100644
--- a/programs/overlays.nix
+++ b/programs/overlays.nix
@@ -12,7 +12,6 @@
   ;
   inherit (builtins) 
     foldl'
-    getAttr
     ;
   nixpkgs-overlay = self: super: let
     overlayNixpkgs = arr: obj: foldl' (acc: curr: let
@@ -31,7 +30,6 @@
     fmpkgs = import inputs.fmpkgs {
       inherit system pkgs lib;
     };
-    extra = inputs.nixpkgs-extra.packages.${system};
   };
 
   package-overlay = self: super: treeImport {
diff --git a/systems/nix.nix b/systems/nix.nix
index 7a1e825..325d0c1 100644
--- a/systems/nix.nix
+++ b/systems/nix.nix
@@ -33,7 +33,6 @@
     |> builtins.listToAttrs;
 
   nixPath = builtins.attrNames inputs
-    |> builtins.filter (x: x != "nixpkgs")
     |> map (name: "${name}=${inputs.${name}.outPath}");
 
   gc = {