diff --git a/modules/flake/colors.nix b/modules/flake/colors.nix
index b9ec88a..8de0daf 100644
--- a/modules/flake/colors.nix
+++ b/modules/flake/colors.nix
@@ -1,4 +1,5 @@
-{ lib, ... }:
+{ config, lib, ... }:
+
 {
   # srcery
   options.local.colors = lib.mkOption {
@@ -42,4 +43,34 @@
     };
   };
 
+  config.flake.modules.nixOnDroid.base.terminal.colors = with config.local.colors; {
+    foreground = brightWhite;
+    background = black;
+    cursor = yellow;
+    # Black
+    color0 = black;
+    color8 = brightBlack;
+    # Red
+    color1 = red;
+    color9 = brightRed;
+    # Green
+    color2 = green;
+    color10 = brightGreen;
+    # Yellow
+    color3 = yellow;
+    color11 = brightYellow;
+    # Blue
+    color4 = blue;
+    color12 = brightBlue;
+    # Magenta
+    color5 = magenta;
+    color13 = brightMagenta;
+    # Cyan
+    color6 = cyan;
+    color14 = brightCyan;
+    # White
+    color7 = white;
+    color15 = brightWhite;
+  };
+
 }
diff --git a/modules/hosts/arseille.nix b/modules/hosts/arseille.nix
new file mode 100644
index 0000000..e27a334
--- /dev/null
+++ b/modules/hosts/arseille.nix
@@ -0,0 +1,56 @@
+{ inputs, withSystem, ... }:
+{
+  flake.nixOnDroidConfigurations.default = withSystem "aarch64-linux" (
+    { system, pkgs, ... }:
+    inputs.nix-on-droid.lib.nixOnDroidConfiguration {
+      pkgs = import inputs.nixpkgs {
+        inherit system;
+        overlays = pkgs.overlays ++ [
+          inputs.nix-on-droid.overlays.default
+        ];
+      };
+      modules = [
+        inputs.self.modules.nixOnDroid.base
+        inputs.self.modules.nixOnDroid.arseille
+      ];
+    }
+  );
+
+  flake.modules.nixOnDroid.arseille =
+    { pkgs, ... }:
+    {
+      system.stateVersion = "24.05";
+      time.timeZone = "America/New_York";
+      user.shell = "${pkgs.fish}/bin/fish";
+
+      environment.packages = with pkgs; [
+        binutils
+        coreutils
+        curl
+        dnsutils
+        dosfstools
+        file
+        iputils
+        lsof
+        psmisc
+        util-linux
+
+        openssh
+        which
+        gnused
+        gawk
+        rsync
+
+        fd
+        ripgrep
+        git
+        jujutsu
+        helix
+        zellij
+        (ranger.override {
+          imagePreviewSupport = false;
+          sixelPreviewSupport = false;
+        })
+      ];
+    };
+}
diff --git a/modules/hosts/arseille/default.nix b/modules/hosts/arseille/default.nix
deleted file mode 100644
index d6ca90c..0000000
--- a/modules/hosts/arseille/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ inputs, withSystem, ... }:
-{
-  flake.nixOnDroidConfigurations.default = withSystem "aarch64-linux" (
-    { system, pkgs, ... }:
-    inputs.nix-on-droid.lib.nixOnDroidConfiguration {
-      pkgs = import inputs.nixpkgs {
-        inherit system;
-        overlays = pkgs.overlays ++ [
-          inputs.nix-on-droid.overlays.default
-        ];
-      };
-      modules = [ inputs.self.modules.nixOnDroid.arseille ];
-    }
-  );
-}
diff --git a/modules/hosts/arseille/system.nix b/modules/hosts/arseille/system.nix
deleted file mode 100644
index 6c97f47..0000000
--- a/modules/hosts/arseille/system.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  flake.modules.nixOnDroid.arseille =
-    { pkgs, ... }:
-    {
-      system.stateVersion = "24.05";
-      time.timeZone = "America/New_York";
-      user.shell = "${pkgs.fish}/bin/fish";
-
-      nix.extraOptions = ''
-        experimental-features = nix-command flakes pipe-operators
-      '';
-
-      environment.packages = with pkgs; [
-        binutils
-        coreutils
-        curl
-        dnsutils
-        dosfstools
-        file
-        iputils
-        lsof
-        psmisc
-        util-linux
-
-        openssh
-        which
-        gnused
-        gawk
-        rsync
-      ];
-    };
-}
diff --git a/modules/nixos/nix.nix b/modules/nixos/nix.nix
index 9f5c263..2c31bec 100644
--- a/modules/nixos/nix.nix
+++ b/modules/nixos/nix.nix
@@ -1,16 +1,16 @@
 { inputs, lib, ... }:
+let
+  registry = builtins.mapAttrs (_: flake: { flake = lib.mkDefault flake; }) inputs;
+in
 {
   flake.modules.nixos.base = {
-    nix.registry = builtins.mapAttrs (_: flake: { flake = lib.mkDefault flake; }) (
-      lib.filterAttrs (name: _: name != "nixpkgs") inputs
-    );
-
     environment.etc = lib.mapAttrs' (name: value: {
       name = "nix/inputs/${name}";
       value.source = value.outPath;
     }) inputs;
 
     nix = {
+      inherit registry;
       settings = {
         auto-optimise-store = true;
         sandbox = true;
@@ -24,4 +24,13 @@
       };
     };
   };
+
+  flake.modules.nixOnDroid.base = {
+    nix = {
+      inherit registry;
+      extraOptions = ''
+        experimental-features = nix-command flakes pipe-operators
+      '';
+    };
+  };
 }