diff --git a/common/core-pc.nix b/common/core-pc.nix
index f44704c..bbe1d7a 100644
--- a/common/core-pc.nix
+++ b/common/core-pc.nix
@@ -6,6 +6,7 @@
     ./wifi.nix
     ./tailscale.nix
   ];
+  system.etc.overlay.enable = true;
   boot.initrd.systemd.enable = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.loader = {
@@ -24,6 +25,23 @@
     minipro.enable = true;
     adb.enable = true; #adbusers group
     yazi.enable = true;
+    nix-index.enable = true;
+    nix-index-database.comma.enable = true;
+  };
+  services = {
+    fwupd = {
+      enable = true;
+      extraRemotes = ["lvfs-testing"];
+    };
+    gvfs.enable = true;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      pulse.enable = true;
+      wireplumber.enable = true;
+    };
+    printing.enable = true;
+    udisks2.enable = true;
   };
   networking.bridges = {
     lan = {
@@ -33,23 +51,34 @@
     };
   };
   environment.systemPackages = with pkgs; [
+    btop
     dfu-util
+    expect
     fh
+    file
     gcc-arm-embedded
+    gnumake
     inotify-tools
+    jq
     just
     libnotify
+    lm_sensors
     localsend
+    lsb-release
     lurk
+    nix-du
+    nix-tree
     openvpn
     pv
     qmk-udev-rules
     quickemu
     quickgui
-    s5cmd
     sbctl
     spice
     spice-gtk
+    unzip
     update-systemd-resolved
+    zip
   ];
+  environment.pathsToLink = ["/libexec"];
 }
diff --git a/common/core.nix b/common/core.nix
index b4e2b34..fa706b6 100755
--- a/common/core.nix
+++ b/common/core.nix
@@ -65,7 +65,6 @@
   };
 
   security.sudo.wheelNeedsPassword = false;
-  environment.pathsToLink = ["/libexec"];
 
   time.timeZone = "Africa/Casablanca";
 
@@ -74,6 +73,8 @@
   console = {
     keyMap = "us";
   };
+  system.etc.overlay.enable = true;
+  boot.initrd.systemd.enable = true;
 
   # add user's shell into /etc/shells
   environment.shells = with pkgs; [
@@ -87,19 +88,10 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     inputs.ragenix.packages.x86_64-linux.default
-    btop
-    expect
-    file
-    gnumake
-    jq
-    lm_sensors
-    lsb-release
     nix-output-monitor
     nixpkgs-review
     parallel
     ripgrep
-    zip
-    unzip
     # FIXME next version wcurl
   ];
 
@@ -117,28 +109,13 @@
         userServices = true;
       };
     };
-    dbus.enable = true;
     fstrim.enable = true;
     dbus.implementation = "broker";
-    fwupd = {
-      enable = true;
-      extraRemotes = ["lvfs-testing"];
-    };
-    gvfs.enable = true;
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      pulse.enable = true;
-      wireplumber.enable = true;
-    };
-    printing.enable = true;
-    udisks2.enable = true;
+    dbus.enable = true;
   };
 
   programs = {
     command-not-found.enable = false;
-    nix-index.enable = true;
-    nix-index-database.comma.enable = true;
     fish.enable = true;
     neovim.enable = true;
     vim.defaultEditor = true;
diff --git a/common/desktops/default.nix b/common/desktops/default.nix
index 86b7f04..95c8824 100644
--- a/common/desktops/default.nix
+++ b/common/desktops/default.nix
@@ -29,6 +29,8 @@
   stylix.targets.plymouth.enable = true;
   stylix.targets.console.enable = true;
   stylix.autoEnable = true;
+  
+  stylix.targets.regreet.enable = false;
   programs.regreet = {
     enable = true;
     settings.background = {
diff --git a/common/minimal.nix b/common/minimal.nix
new file mode 100755
index 0000000..c12b3b5
--- /dev/null
+++ b/common/minimal.nix
@@ -0,0 +1,41 @@
+# This module defines a small NixOS configuration.  It does not
+# contain any graphical stuff.
+
+{ config, lib, ... }:
+
+with lib;
+
+{
+
+  documentation.enable = mkDefault false;
+
+  documentation.doc.enable = mkDefault false;
+
+  documentation.info.enable = mkDefault false;
+
+  documentation.man.enable = mkDefault false;
+
+  documentation.nixos.enable = mkDefault false;
+
+  # Perl is a default package.
+  environment.defaultPackages = mkDefault [ ];
+
+  environment.stub-ld.enable = false;
+
+  # The lessopen package pulls in Perl.
+  programs.less.lessopen = mkDefault null;
+
+  # This pulls in nixos-containers which depends on Perl.
+  boot.enableContainers = mkDefault false;
+
+  programs.command-not-found.enable = mkDefault false;
+
+  services.logrotate.enable = mkDefault false;
+
+  services.udisks2.enable = mkDefault false;
+
+  xdg.autostart.enable = mkDefault false;
+  xdg.icons.enable = mkDefault false;
+  xdg.mime.enable = mkDefault false;
+  xdg.sounds.enable = mkDefault false;
+}
diff --git a/flake.lock b/flake.lock
index 5c0784a..c9167ec 100755
--- a/flake.lock
+++ b/flake.lock
@@ -97,22 +97,6 @@
         "type": "github"
       }
     },
-    "base16-foot": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696725948,
-        "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
-        "owner": "tinted-theming",
-        "repo": "base16-foot",
-        "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-foot",
-        "type": "github"
-      }
-    },
     "base16-helix": {
       "flake": false,
       "locked": {
@@ -129,38 +113,6 @@
         "type": "github"
       }
     },
-    "base16-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1665001328,
-        "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
-        "owner": "kdrag0n",
-        "repo": "base16-kitty",
-        "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kdrag0n",
-        "repo": "base16-kitty",
-        "type": "github"
-      }
-    },
-    "base16-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696725902,
-        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
-        "owner": "tinted-theming",
-        "repo": "base16-tmux",
-        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-tmux",
-        "type": "github"
-      }
-    },
     "base16-vim": {
       "flake": false,
       "locked": {
@@ -220,11 +172,11 @@
     "catppuccin-foot": {
       "flake": false,
       "locked": {
-        "lastModified": 1721498839,
-        "narHash": "sha256-L5/HvBe4jGTHNSCxFL+xRh8CKYO3NLJ0ksVJIQxjsZA=",
+        "lastModified": 1727220871,
+        "narHash": "sha256-eVH3BY2fZe0/OjqucM/IZthV8PMsM9XeIijOg8cNE1Y=",
         "owner": "catppuccin",
         "repo": "foot",
-        "rev": "17e2bdc8a8d854e8d390919579f87ab7d5f86e38",
+        "rev": "962ff1a5b6387bc5419e9788a773a080eea5f1e1",
         "type": "github"
       },
       "original": {
@@ -508,11 +460,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1726153070,
-        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
         "type": "github"
       },
       "original": {
@@ -526,11 +478,11 @@
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1726153070,
-        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
         "type": "github"
       },
       "original": {
@@ -991,11 +943,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1725690722,
-        "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=",
+        "lastModified": 1727649413,
+        "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5",
+        "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e",
         "type": "github"
       },
       "original": {
@@ -1013,11 +965,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1726161490,
-        "narHash": "sha256-tzGcRRhhK5lAuBtlHl3D/TR2V3egPLV4BBcN2+4CyY0=",
+        "lastModified": 1727872811,
+        "narHash": "sha256-78hOotCZ/G8l4nyWPdMWSOojdJ5NwHTR0usBVVBNTtU=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "af604aa08ac9a4ae585beaf1a3482897a27ab67e",
+        "rev": "e832ffc16b09b1b5c7c1224532d03ed3ce68afd0",
         "type": "github"
       },
       "original": {
@@ -1037,11 +989,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1727332193,
-        "narHash": "sha256-XnjG+n42JjrIj2Ts33Xa+Udg1QDp9N8FHYbvAkYL9qg=",
+        "lastModified": 1727997983,
+        "narHash": "sha256-t085RwS6OzkTco7VBU8MJRPcV9cSFeVkeI8ecfrSFZg=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "524000b81ba52f9d5a7b2ac78504468014121ebe",
+        "rev": "5309bc679bdba91798076ed3676bff3d12db0d97",
         "type": "github"
       },
       "original": {
@@ -1070,11 +1022,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1726412705,
-        "narHash": "sha256-qRqGbvTpGRn3QhvjOyX0Sn/qPT1bLQUSSHz1vlW/7HE=",
+        "lastModified": 1727778508,
+        "narHash": "sha256-9oMBzXZZzEVZAqHA79aJSQmNJ75hQuCpq0POB0Lxt7Q=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "6ee5b5afa784c76b1c31c371b59177136e558fa6",
+        "rev": "0cca7a21163f0d4c1e99c12844da027a23e76003",
         "type": "github"
       },
       "original": {
@@ -1184,11 +1136,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726975622,
-        "narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=",
+        "lastModified": 1727658919,
+        "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417",
+        "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee",
         "type": "github"
       },
       "original": {
@@ -1246,11 +1198,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1726966855,
-        "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=",
+        "lastModified": 1727571693,
+        "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2",
+        "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1",
         "type": "github"
       },
       "original": {
@@ -1267,11 +1219,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727053438,
-        "narHash": "sha256-t/+z1Tf7hSaStU1pBYkY7i0/GkG+YIPSmfeRrK8eYUw=",
+        "lastModified": 1727917377,
+        "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "e8c1cd886cc17e31e424f915efd32e84d8af0ce9",
+        "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4",
         "type": "github"
       },
       "original": {
@@ -1282,11 +1234,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1727040444,
-        "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
+        "lastModified": 1728055241,
+        "narHash": "sha256-0Flr98Cw70nXPjREuPaq8ci6gNPPlN+GANINrfW3JeU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
+        "rev": "a46a7094ff6978a7cfa0d141f2925e566ca63536",
         "type": "github"
       },
       "original": {
@@ -1317,11 +1269,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1726849546,
-        "narHash": "sha256-MPimMTSp042RCPfrtj5Io4zWiByYAcRh4F5YnPNCw/Q=",
+        "lastModified": 1727886354,
+        "narHash": "sha256-qvLbVE8wggrwWVbpeiXAHrwo3DhV4bVP7zvcNj4lni0=",
         "owner": "nakato",
         "repo": "nixos-sbc",
-        "rev": "12f4718d301f97dae311a0a48449b187fbd43b4d",
+        "rev": "6adf0ee2057af1b54e927a380bc4d9109cf3f1cc",
         "type": "github"
       },
       "original": {
@@ -1333,11 +1285,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727122398,
-        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
+        "lastModified": 1727802920,
+        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
+        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
         "type": "github"
       },
       "original": {
@@ -1349,26 +1301,26 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1725233747,
-        "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
+        "lastModified": 1727825735,
+        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
       }
     },
     "nixpkgs-lib_2": {
       "locked": {
-        "lastModified": 1725233747,
-        "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
+        "lastModified": 1727825735,
+        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
       }
     },
     "nixpkgs-lib_3": {
@@ -1409,11 +1361,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1727264057,
-        "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
+        "lastModified": 1727907660,
+        "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
+        "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
         "type": "github"
       },
       "original": {
@@ -1441,11 +1393,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1726937504,
-        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+        "lastModified": 1727802920,
+        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
+        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
         "type": "github"
       },
       "original": {
@@ -1489,11 +1441,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1726755586,
-        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+        "lastModified": 1727802920,
+        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
         "type": "github"
       },
       "original": {
@@ -1505,11 +1457,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1726969270,
-        "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
+        "lastModified": 1727907660,
+        "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
+        "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
         "type": "github"
       },
       "original": {
@@ -1803,24 +1755,24 @@
       "inputs": {
         "base16": "base16_2",
         "base16-fish": "base16-fish",
-        "base16-foot": "base16-foot",
         "base16-helix": "base16-helix",
-        "base16-kitty": "base16-kitty",
-        "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
         "flake-compat": "flake-compat_5",
         "flake-utils": "flake-utils_6",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_4",
         "nixpkgs": "nixpkgs_6",
-        "systems": "systems_8"
+        "systems": "systems_8",
+        "tinted-foot": "tinted-foot",
+        "tinted-kitty": "tinted-kitty",
+        "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1727093531,
-        "narHash": "sha256-hsb1bcUvpMecFHOP5F3LEyOnXiZ+5MikR92irJ8o7iE=",
+        "lastModified": 1727723275,
+        "narHash": "sha256-k4HrG8TJQ0RqDS1tlDz71kvWFBNQ7qZI9T5Z0qLR85Y=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "eccb9f2d63f4582b1c1ffe97d806156147aeee5f",
+        "rev": "e7e97059776da7e34b739415a7bc8f80f606b803",
         "type": "github"
       },
       "original": {
@@ -2016,6 +1968,54 @@
         "type": "github"
       }
     },
+    "tinted-foot": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696725948,
+        "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "type": "github"
+      }
+    },
+    "tinted-kitty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1665001328,
+        "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "type": "github"
+      }
+    },
+    "tinted-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696725902,
+        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index dd9243b..90d6363 100755
--- a/flake.nix
+++ b/flake.nix
@@ -182,19 +182,22 @@
         ];
       };
       router = mkNixosConfiguration {
-        extraModules = [
+        baseModules = [
           ./common/secrets.nix
           ragenix.nixosModules.default
           nix-topology.nixosModules.default
           impermanence.nixosModules.impermanence
           nixos-sbc.nixosModules.default
           nixos-sbc.nixosModules.boards.bananapi.bpir4
+          (nixpkgs.outPath + "/nixos/modules/profiles/headless.nix")
+          (nixpkgs.outPath + "/nixos/modules/profiles/perlless.nix")
+          ./common/minimal.nix
           ./hosts/router
         ];
         system = "aarch64-linux";
       };
       nas = mkNixosConfiguration {
-        extraModules = [
+        baseModules = [
           ./common/secrets.nix
           ragenix.nixosModules.default
           nix-topology.nixosModules.default
@@ -202,6 +205,9 @@
           impermanence.nixosModules.impermanence
           nixos-sbc.nixosModules.default
           nixos-sbc.nixosModules.boards.raspberrypi.rpi4
+          (nixpkgs.outPath + "/nixos/modules/profiles/headless.nix")
+          (nixpkgs.outPath + "/nixos/modules/profiles/perlless.nix")
+          ./common/minimal.nix
           ./hosts/nas
         ];
         system = "aarch64-linux";
diff --git a/home-manager/common.nix b/home-manager/common.nix
index f318c92..4ac2129 100755
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -8,6 +8,7 @@
     ./dev
   ];
 
+  stylix.enable = true;
   home = {
     # This value determines the Home Manager release that your
     # configuration is compatible with. This helps avoid breakage
diff --git a/home-manager/desktop/sway.nix b/home-manager/desktop/sway.nix
index f8f6185..8e4c4de 100644
--- a/home-manager/desktop/sway.nix
+++ b/home-manager/desktop/sway.nix
@@ -8,9 +8,14 @@
   ];
   #Global theming off
   stylix.targets.sway.enable = false;
-  #Theme file
-  home.file.".config/sway/themes/".source = "${inputs.catppuccin-i3}/themes";
 
+  #stylix.targets.fuzzel.enable = true;
+  programs.fuzzel.enable = true;
+  programs.fuzzel.settings = {
+    main = {
+      terminal = "${pkgs.foot}/bin/foot";
+    };
+  };
   programs.i3status-rust.enable = true;
   programs.i3status-rust.bars = {
     default = {
@@ -157,9 +162,6 @@
     wrapperFeatures.gtk = true;
     swaynag.enable = true;
     #systemd.xdgAutostart = true;
-    extraConfigEarly = ''
-      include themes/catppuccin-mocha
-    '';
 
     config = {
       output = {
@@ -169,7 +171,7 @@
       };
       modifier = "Mod4";
       terminal = "foot";
-      menu = "anyrun";
+      menu = "${pkgs.fuzzel}/bin/fuzzel";
       input = {
         "type:pointer" = {
           natural_scroll = "enabled";
@@ -196,44 +198,73 @@
         }
       ];
 
-      /*
-      colors.focused = {
-        border = "$lavender";
-        childBorder = "$mauve";
-        background = "$red";
-        text = "$crust";
-        indicator = "$rosewater";
-      };
-      colors.unfocused = {
-        border = "$overlay0";
-        childBorder = "$overlay0";
-        background = "$mauve";
-        text = "$crust";
-        indicator = "$rosewater";
-      };
-      colors.focusedInactive = {
-        border = "$overlay0";
-        childBorder = "$overlay0";
-        background = "$peach";
-        text = "$crust";
-        indicator = "$rosewater";
-      };
-      colors.urgent = {
-        border = "$peach";
-        childBorder = "$peach";
-        background = "$red";
-        text = "$crust";
-        indicator = "$overlay0";
-      };
-      colors.placeholder = {
-        border = "$overlay0";
-        childBorder = "$overlay0";
-        background = "$mauve";
-        text = "$crust";
-        indicator = "$overlay0";
+      colors = let
+        # https://github.com/catppuccin/i3/blob/main/themes/catppuccin-mocha
+        rosewater = "#f5e0dc";
+        flamingo = "#f2cdcd";
+        pink = "#f5c2e7";
+        mauve = "#cba6f7";
+        red = "#f38ba8";
+        maroon = "#eba0ac";
+        peach = "#fab387";
+        yellow = "#f9e2af";
+        green = "#a6e3a1";
+        teal = "#94e2d5";
+        sky = "#89dceb";
+        sapphire = "#74c7ec";
+        blue = "#89b4fa";
+        lavender = "#b4befe";
+        text = "#cdd6f4";
+        subtext1 = "#bac2de";
+        subtext0 = "#a6adc8";
+        overlay2 = "#9399b2";
+        overlay1 = "#7f849c";
+        overlay0 = "#6c7086";
+        surface2 = "#585b70";
+        surface1 = "#45475a";
+        surface0 = "#313244";
+        base = "#1e1e2e";
+        mantle = "#181825";
+        crust = "#11111b";
+      in {
+        focused = {
+          border = "${lavender}";
+          childBorder = "${mauve}";
+          background = "${red}";
+          text = "${crust}";
+          indicator = "${rosewater}";
+        };
+        unfocused = {
+          border = "${overlay0}";
+          childBorder = "${overlay0}";
+          background = "${mauve}";
+          text = "${crust}";
+          indicator = "${rosewater}";
+        };
+        focusedInactive = {
+          border = "${overlay0}";
+          childBorder = "${overlay0}";
+          background = "${peach}";
+          text = "${crust}";
+          indicator = "${rosewater}";
+        };
+        urgent = {
+          border = "${peach}";
+          childBorder = "${peach}";
+          background = "${red}";
+          text = "${crust}";
+          indicator = "${overlay0}";
+        };
+        placeholder = {
+          border = "${overlay0}";
+          childBorder = "${overlay0}";
+          background = "${mauve}";
+          text = "${crust}";
+          indicator = "${overlay0}";
+        };
+        background = "${sapphire}";
       };
-      colors.background = "$sapphire";
-      */
+
       keybindings = let
         terminal = config.wayland.windowManager.sway.config.terminal;
         menu = config.wayland.windowManager.sway.config.menu;
@@ -418,7 +449,6 @@
       };
       startup = [
         #        {command = "nwg-panel";}
-        # {command = "waybar";}
         {command = "nm-applet";}
         {command = "solaar -w hide";}
         {command = "polychromatic-tray-applet";}
diff --git a/home-manager/dev/shell.nix b/home-manager/dev/shell.nix
index 8816b9f..e0bb9d0 100644
--- a/home-manager/dev/shell.nix
+++ b/home-manager/dev/shell.nix
@@ -7,13 +7,13 @@
       plugins = {
         efmls-configs.setup = let
           shellTools = {
-            formatter = "shfmt";
+            #formatter = "shfmt";
             linter = "shellcheck";
           };
         in {
           bash = shellTools;
           sh = shellTools;
-          fish .formatter = "fish_indent";
+          fish.formatter = "fish_indent";
           fish.linter = "fish";
         };
 
diff --git a/home-manager/programs/default.nix b/home-manager/programs/default.nix
index bcd88e0..86fe2df 100644
--- a/home-manager/programs/default.nix
+++ b/home-manager/programs/default.nix
@@ -29,7 +29,8 @@
   };
 
   home.packages = with pkgs; [
-    devour
+    croc
+    # FIXME  still in  unstable wush
   ];
 
   xdg.mimeApps.enable = true;
diff --git a/hosts/nas/default.nix b/hosts/nas/default.nix
index 0e9af43..4c1f121 100755
--- a/hosts/nas/default.nix
+++ b/hosts/nas/default.nix
@@ -12,10 +12,8 @@
     };
   };
 
-  documentation.enable = false;
-  documentation.man.enable = false;
   services.openssh.enable = true;
-  boot.initrd.systemd.enable = false;
+
   nixarr = {
     enable = true;
     # These two values are also the default, but you can set them to whatever
diff --git a/hosts/router/default.nix b/hosts/router/default.nix
index 6300867..ff1361b 100644
--- a/hosts/router/default.nix
+++ b/hosts/router/default.nix
@@ -1,13 +1,17 @@
 {
   pkgs,
   config,
+  lib,
   ...
 }: {
   imports = [
-    ../../common/core.nix
+     ../../common/core.nix
     ./hardware.nix
   ];
 
+  system.etc.overlay.enable = lib.mkForce false;
+  boot.initrd.systemd.enable = lib.mkForce false;
+
   topology.self = {
     name = "router";
     hardware.info = "BananaPi R4";