From 810aa7be5a8b2b511d422dd910ea5b24ccf1f277 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Mon, 16 Mar 2026 08:31:03 +0000 Subject: [PATCH] Moved assets/flake/users and assets/flake/terminal_shell to generated/out_of_tree/ --- Droidnix/README.org | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 3edbb5297..671957043 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -179,7 +179,7 @@ outputs = let lib = nixpkgs.lib; system = "x86_64-linux"; - user = import ./assets/flake/users/henrov.nix; + user = import ./generated/out_of_tree/users/henrov.nix; machines = [ "traveldroid" "maindroid" @@ -219,7 +219,7 @@ outputs = } ); - devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix { + devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix { inherit (nixpkgs.legacyPackages.${system}) mkShell; }; }; @@ -227,9 +227,9 @@ outputs = #+END_SRC * First the nix-files that flake really needs and that do not fit wel in the hierarchical structure -** =assets/flake/users/top.nix= +** =generated/out_of_tree/users/top.nix= The ./generated/top.nix file acts as an anchor or entry point for the entire chain of imports in the pyramid structure. -#+BEGIN_SRC nix :tangle assets/flake/users/top.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/users/top.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, lib, ... }: { imports = [ @@ -238,9 +238,9 @@ The ./generated/top.nix file acts as an anchor or entry point for the entire cha } #+END_SRC -** =assets/flake/users/user.nix= +** =generated/out_of_tree/users/user.nix= This is the default user, just search and replace henrov another name if you want to change -#+BEGIN_SRC nix :tangle assets/flake/users/user.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/users/user.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, @@ -269,9 +269,9 @@ in } #+END_SRC -** =assets/flake/users/henrov.nix= +** =generated/out_of_tree/users/henrov.nix= This is the default user, just search and replace henrov another name if you want to change -#+BEGIN_SRC nix :tangle assets/flake/users/henrov.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/users/henrov.nix :noweb tangle :mkdirp yes :eval never-html { username = "henrov"; hashedPassword = "$6$ISAmsPLyFi7idYXr$VmZsq.zMsyh1irSkyDNqtorNXG0oEHbbMVqTii1t8bymvrQ5ZQmbdi4OiBNeNYe/huHGrojXM.3TST2fTLz0T."; @@ -281,9 +281,30 @@ This is the default user, just search and replace henrov another name if you wan } #+END_SRC -** =assets/flake/terminal_shell/devshell.nix= +** =generated/out_of_tree/terminal_shell/top.nix= This code defines a Nix shell environment (also called a "devShell") that you can enter using the nix develop command. When you enter this shell, Nix will provide the tools and dependencies listed in buildInputs. -#+BEGIN_SRC nix :tangle assets/flake/terminal_shell/devshell.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/terminal_shell/top.nix :noweb tangle :mkdirp yes :eval never-html +{ + config, + pkgs, + lib, + user, + inputs, + flakeRoot, + ... +}: + +{ + imports = [ + ./devshell.nix + inputs.home-manager.nixosModules.home-manager + ]; +} +#+END_SRC + +** =generated/out_of_tree/terminal_shell/devshell.nix= +This code defines a Nix shell environment (also called a "devShell") that you can enter using the nix develop command. When you enter this shell, Nix will provide the tools and dependencies listed in buildInputs. +#+BEGIN_SRC nix :tangle generated/out_of_tree/terminal_shell/devshell.nix :noweb tangle :mkdirp yes :eval never-html { mkShell, ... }: mkShell { buildInputs = with import {}; [