diff --git a/flake.lock b/flake.lock
index 8999b03..5f11eb3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,22 +19,6 @@
         "type": "github"
       }
     },
-    "base16-schemes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1680729003,
-        "narHash": "sha256-M9LHTL24/W4oqgbYRkz0B2qpNrkefTs98pfj3MxIXnU=",
-        "owner": "tinted-theming",
-        "repo": "base16-schemes",
-        "rev": "dc048afa066287a719ddbab62b3e19e4b5110cf0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-schemes",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -156,25 +140,6 @@
         "type": "github"
       }
     },
-    "nix-colors": {
-      "inputs": {
-        "base16-schemes": "base16-schemes",
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1680875144,
-        "narHash": "sha256-Ub/Y+/zoAoji+E7WCLbTykcTmfRiyzLJ5QEyR3NbHgY=",
-        "owner": "misterio77",
-        "repo": "nix-colors",
-        "rev": "41cc6c1086a4d26509f9fc80a538131d03a11234",
-        "type": "github"
-      },
-      "original": {
-        "owner": "misterio77",
-        "repo": "nix-colors",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1677676435,
@@ -191,21 +156,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1680397293,
-        "narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1671417167,
@@ -260,7 +210,6 @@
         "deploy-rs": "deploy-rs",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "nix-colors": "nix-colors",
         "nixpkgs": "nixpkgs_4"
       }
     },
diff --git a/flake.nix b/flake.nix
index 29864f2..ec089c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,17 +12,18 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     deploy-rs.url = "github:serokell/deploy-rs";
     hyprland.url = "github:hyprwm/Hyprland";
-    nix-colors.url = "github:misterio77/nix-colors";
   };
 
-  outputs = { self, nix-colors, nixpkgs, home-manager, hyprland
+  outputs = { self, nixpkgs, home-manager, hyprland
     , agenix, deploy-rs, ... }@inputs:
     let
       inherit (self) outputs;
       lib = nixpkgs.lib;
       allowUnfree = { nixpkgs.config.allowUnfree = true; };
-      system = "x86_64-linux";
+      forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ];
+      forEachPkgs = f: forEachSystem (sys: f nixpkgs.legacyPackages.${sys});
     in {
+      packages = forEachPkgs (pkgs: import ./pkgs { inherit pkgs; });
       nixosConfigurations = {
         lkk-nix-1 = lib.nixosSystem {
           specialArgs = { inherit inputs; };
@@ -48,7 +49,7 @@
         # Laptop
         "m3tam3re@m3-nix" = home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages."x86_64-linux";
-          extraSpecialArgs = { inherit inputs nix-colors; };
+          extraSpecialArgs = { inherit inputs; };
           modules = [ ./home/users/m3tam3re/m3-nix.nix allowUnfree ];
         };
         "m3tam3re@lkk-nix-1" = home-manager.lib.homeManagerConfiguration {
diff --git a/home/features/desktop/wofi.nix b/home/features/desktop/wofi.nix
index 7b6eb97..6b9e889 100644
--- a/home/features/desktop/wofi.nix
+++ b/home/features/desktop/wofi.nix
@@ -1,8 +1,11 @@
-{ pkgs, ...}:
+{ pkgs, outputs, ...}:
+let
+  wofi-pass = outputs.packages.x86_64-linux.wofi-pass;
+in
 {
-
-  home.packages = with pkgs; [
-    wofi
-    wofi-emoji
+  home.packages = [
+    pkgs.wofi
+    pkgs.wofi-emoji
+    wofi-pass
   ];
 }
diff --git a/home/users/m3tam3re/dotfiles/hyprland.nix b/home/users/m3tam3re/dotfiles/hyprland.nix
index 6b3e539..09301db 100644
--- a/home/users/m3tam3re/dotfiles/hyprland.nix
+++ b/home/users/m3tam3re/dotfiles/hyprland.nix
@@ -156,9 +156,10 @@
     bind = $mainMod, q, killactive, 
     bind = $mainMod, M, exit, 
     bind=  $mainMod, F, fullscreen
-    bind = $mainMod, E, exec, thunar
     bind = $mainMod, V, togglefloating, 
     bind = $mainMod, D, exec, wofi --show drun --allow-images
+    bind = $mainMod SHIFT, S, exec, wofi-emoji
+    bind = $mainMod, P, exec, wofi-pass
     bind = $mainMod SHIFT, P, pseudo, # dwindle
     bind = $mainMod, J, togglesplit, # dwindle
 
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 57fa452..1193e12 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs ? import <nixpkgs> { } }: {
 
-  imports = [ ./wofi-pass ];
+  wofi-pass = pkgs.callPackage ./wofi-pass { };
 }
diff --git a/pkgs/wofi-pass/default.nix b/pkgs/wofi-pass/default.nix
index 0be2344..ce212ec 100644
--- a/pkgs/wofi-pass/default.nix
+++ b/pkgs/wofi-pass/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
     sha256 = "gcfW8E/3/dqv0P3S4z9fDv8k4R7czcIKwpo/OHFFWj0=";
   };
   buildInputs = [ bash ];
+  
   nativeBuildInputs = [ makeWrapper ];
   installPhase = ''
     mkdir -p $out/bin