uh? heu heu heu

libx/default.nix

@@ -18,18 +18,18 @@
   ...
 }:
 let
-  # OTHER
+  # inherits and pkgs/lib
   pkgs = nixpkgs.legacyPackages.${sys.platform};
   inherit (inputs) home-manager nixpkgs;
   inherit (nixpkgs) lib;
-  # NEEDS
+  # base, foundament
   args = { inherit x inputs; };
   x =
-    import ./options.nix { inherit inputs pkgs lib; }
-    // import ./mkOpt.nix { inherit lib; }
-    // {
+    {
       inherit path sys styl;
-    };
+    }
+    // import ./options.nix { inherit inputs pkgs lib; }
+    // import ./mkOpt.nix { inherit lib; };
 
   mk =
     n:

machines/default.nix

@@ -2,6 +2,5 @@
   imports = [
     ./embrace
     ./jetpure
-    ./nixtended
   ];
 }

machines/nixtended/default.nix

@@ -1,17 +0,0 @@
-{ inputs, ... }:
-{
-  flake = import ../../libx {
-    inherit inputs;
-    sys = {
-      hostName = "starship";
-      userName = "amogus";
-      is = "iso";
-      platform = "x86_64-linux";
-      ver = "24.05";
-    };
-    styl = {
-      theme = "horizon-dark";
-      image = "clouds";
-    };
-  };
-}

machines/nixtended/home/default.nix

@@ -1,11 +0,0 @@
-{ x, ... }:
-let
-  inherit (x) on umport;
-in
-{
-  imports = umport {
-    path = ./.;
-    exclude = [ ./default.nix ];
-  };
-  module.themes.stylix = on;
-}

machines/nixtended/host/default.nix

@@ -1,18 +0,0 @@
-{ x, ... }:
-let
-  inherit (x) on umport;
-in
-{
-  imports = umport {
-    path = ./.;
-    exclude = [ ./default.nix ];
-  };
-  module = {
-    base = on;
-    themes.stylix = on;
-    services = {
-      amneziawg = on;
-      zram.algo = "zstd";
-    };
-  };
-}

machines/nixtended/host/settings.nix

@@ -1,14 +0,0 @@
-{
-  pkgs,
-  modulesPath,
-  ...
-}:
-{
-  imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
-  environment.systemPackages = with pkgs; [
-    fff
-    helix
-    disko
-    gitMinimal
-  ];
-}

modules/home/programs/cli/common/default.nix

@@ -21,6 +21,8 @@ in
       bat = on;
       eza = on;
       fd = on;
+      fzf = on;
+      git = on;
       ripgrep = on;
       zoxide = on;
     };