diff --git a/apps/aarch64-darwin/build-switch b/apps/aarch64-darwin/build-switch
index a46497c..387904d 100755
--- a/apps/aarch64-darwin/build-switch
+++ b/apps/aarch64-darwin/build-switch
@@ -5,15 +5,13 @@ YELLOW='\033[1;33m'
 RED='\033[1;31m'
 NC='\033[0m'
 
-# Determine machine name from first argument or hostname
 if [ $# -gt 0 ]; then
     MACHINE_NAME="$1"
-    shift  # Remove machine name from arguments
+    shift
 else
     MACHINE_NAME=$(hostname | cut -d'.' -f1)
 fi
 
-# Validate machine name
 if [ ! -d "hosts/darwin/$MACHINE_NAME" ]; then
     echo "${RED}Error: Machine configuration '$MACHINE_NAME' not found in hosts/darwin/${NC}"
     echo "${YELLOW}Available machines:${NC}"
@@ -26,13 +24,12 @@ fi
 
 FLAKE_SYSTEM="darwinConfigurations.${MACHINE_NAME}.system"
 
-export NIXPKGS_ALLOW_UNFREE=1
 
 echo "${YELLOW}Building configuration for machine: ${MACHINE_NAME}${NC}"
-nix --extra-experimental-features 'nix-command flakes' build .#$FLAKE_SYSTEM "$@"
+NIXPKGS_ALLOW_UNFREE=1 nix --extra-experimental-features 'nix-command flakes' build --impure .#$FLAKE_SYSTEM "$@"
 
 echo "${YELLOW}Switching to new generation...${NC}"
-sudo ./result/sw/bin/darwin-rebuild switch --flake .#${MACHINE_NAME}
+sudo NIXPKGS_ALLOW_UNFREE=1 ./result/sw/bin/darwin-rebuild switch --impure --flake .#${MACHINE_NAME}
 
 echo "${YELLOW}Cleaning up...${NC}"
 unlink ./result
diff --git a/profiles/base/default.nix b/profiles/base/default.nix
index 6d23b80..28d93e9 100644
--- a/profiles/base/default.nix
+++ b/profiles/base/default.nix
@@ -9,13 +9,6 @@
   ];
 
   nixpkgs = {
-    config = {
-      allowUnfree = true;
-      allowBroken = false;
-      allowInsecure = false;
-      allowUnsupportedSystem = false;
-    };
-
     overlays = let
       path = ../../overlays;
     in
diff --git a/profiles/base/home-manager/mise.nix b/profiles/base/home-manager/mise.nix
index bff6693..e33e454 100644
--- a/profiles/base/home-manager/mise.nix
+++ b/profiles/base/home-manager/mise.nix
@@ -1,15 +1,7 @@
-{pkgs, ...}: {
+{
   programs.mise = {
     enable = true;
     enableFishIntegration = true;
     enableZshIntegration = true;
-    globalConfig = {
-      env = {
-        KERL_CONFIGURE_OPTIONS = "--with-termcap --with-ssl=${pkgs.openssl.out}";
-        CPPFLAGS = "-I${pkgs.ncurses.dev}/include -I${pkgs.openssl.dev}/include";
-        LDFLAGS = "-L${pkgs.ncurses.out}/lib -L${pkgs.openssl.out}/lib";
-        PKG_CONFIG_PATH = "${pkgs.ncurses.dev}/lib/pkgconfig:${pkgs.openssl.dev}/lib/pkgconfig";
-      };
-    };
   };
 }
diff --git a/profiles/base/home-manager/zellij.nix b/profiles/base/home-manager/zellij.nix
index 99bc72f..52c3442 100644
--- a/profiles/base/home-manager/zellij.nix
+++ b/profiles/base/home-manager/zellij.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   programs.zellij = {
     enable = true;
-    enableFishIntegration = true;
+    enableFishIntegration = false;
     settings = {
       theme = "catppuccin-latte";
       default_layout = "compact";
diff --git a/profiles/nixos/default.nix b/profiles/nixos/default.nix
index 9af5a5f..27ece93 100644
--- a/profiles/nixos/default.nix
+++ b/profiles/nixos/default.nix
@@ -91,6 +91,7 @@ in {
       imports = [
         nixvim.homeModules.nixvim
         ../base/home-manager
+        ./home-manager/zellij.nix
       ];
       home = {
         packages = pkgs.callPackage ../base/packages.nix {} ++ pkgs.callPackage ./packages.nix {};
diff --git a/profiles/nixos/home-manager/zellij.nix b/profiles/nixos/home-manager/zellij.nix
new file mode 100644
index 0000000..d444437
--- /dev/null
+++ b/profiles/nixos/home-manager/zellij.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  programs.zellij = {
+    enableFishIntegration = true;
+  };
+}
\ No newline at end of file