diff --git a/config/common.nix b/config/common.nix
index 5f142c2..82eed67 100644
--- a/config/common.nix
+++ b/config/common.nix
@@ -90,6 +90,18 @@
     man-pages-posix
   ];
 
+
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-color-emoji
+    corefonts
+    fira-mono
+    font-awesome_5
+  ];
+
+
+
   environment.shellAliases = {
     "server" = "ssh admin@192.168.0.30";
     "desktop" = "ssh admin@192.168.30.40";
diff --git a/config/desktop.nix b/config/desktop.nix
index 655619d..2a8793f 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -168,13 +168,6 @@
     keepassxc
   ];
 
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk-sans
-    noto-fonts-color-emoji
-    corefonts
-    fira-mono
-  ];
   fonts.fontconfig = {
     antialias = true;
     cache32Bit = true;
diff --git a/hosts/macbook/settings.nix b/hosts/macbook/settings.nix
index 0a11673..8e5bb90 100644
--- a/hosts/macbook/settings.nix
+++ b/hosts/macbook/settings.nix
@@ -58,8 +58,8 @@ system.stateVersion = 6;
       "tor-browser"
       "monero-wallet"
       "element"
-#      "veracrypt-fuse-t"
-#      "fuse-t"
+      "veracrypt-fuse-t"
+      "fuse-t"
       "nextcloud"
     ];
   };
@@ -104,7 +104,7 @@ system.stateVersion = 6;
   services.yabai = {
     enable = true;
     config = {
-      layout         = "bsp";
+      layout         = "float";
       top_padding    = "15";
       bottom_padding = "15";
       left_padding   = "15";
@@ -115,29 +115,27 @@ system.stateVersion = 6;
 
   services.skhd = {
     enable = true;
-    skhdConfig = "alt + return : open -na /System/Applications/Utilities/Terminal.app";
-  };
-
-  services.sketchybar = {
-    enable = true;
-    config = ''
-      export COLOR_BLACK="0xff181926"
-      export COLOR_WHITE="0xffcad3f5"
-
-      # Configure bar
-      sketchybar --bar height=32 \
-                      position=top \
-                      padding_left=10 \
-                      padding_right=10 \
-                      color=$COLOR_BLACK
-      # Configure default values
-      sketchybar --default icon.font="SF Pro:Bold:14.0" \
-                          icon.color=$COLOR_WHITE \
-                          label.font="SF Pro:Bold:14.0" \
-                          label.color=$COLOR_WHITE
-      sketchybar --add item clock right --set clock script="date '+%H:%M'" update_freq=10
-      sketchybar --update
+    skhdConfig = ''
+      cmd - return : open -na /System/Applications/Utilities/Terminal.app
+      cmd - 1 : yabai -m space --focus 1
+      cmd - 2 : yabai -m space --focus 2
+      cmd - 3 : yabai -m space --focus 3
+      cmd - 4 : yabai -m space --focus 4
+      cmd - 5 : yabai -m space --focus 5
     '';
   };
 
+  services.spacebar = {
+    enable = true;
+    package = pkgs.spacebar;
+    config = {
+      height = "38";
+      clock_format = "\'%a %b %-d %H:%M\'";
+      #text_font = ''"Menlo:Regular:14.0"'';
+      icon_font = ''"Font Awesome 5 Free:Solid:12.0"'';
+      power_icon_strip = " ";
+      title = "off"; # notch....
+    };
+  };
+
 }