feat: devops done the 0.1 version

tao3k · Jul 26, 2023 · bd25752 · bd25752
1 parent 51adbb7
commit bd25752
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 29 deletions.
diff --git a/.envrc b/.envrc
@@ -4,4 +4,4 @@ watch_file flakes.nix flake.lock
 # shellcheck disable=SC1090
 source "$(fetchurl "https://raw.githubusercontent.com/paisano-nix/direnv/main/lib" "sha256-IgQhKK7UHL1AfCUntJO2KCaIDJQotRnK2qC4Daxk+wI=")"
 
-use envreload //users/shells/default
+use envreload //dev/shells/default
diff --git a/cells/tasks/dir/default.nix b/cells/tasks/dir/default.nix
diff --git a/cells/tasks/job-1.nix b/cells/tasks/job-1.nix
diff --git a/data/tenzir/generated-sysmon.yaml → data/tenzir/generated-tenzir-sysmon.yaml b/data/tenzir/generated-sysmon.yaml → data/tenzir/generated-tenzir-sysmon.yaml
@@ -2,7 +2,6 @@
     fields:
     - sysmon.extend.field_1
     - sysmon.extend.field_2
-    - sysmon.extend.field_3
     - sysmon.CreateRemoteThread.SourceProcessGuid
     - sysmon.CreateRemoteThread.TargetProcessGuid
     - sysmon.FileCreate.ProcessGuid

diff --git a/dev/configs/treefmt.toml b/dev/configs/treefmt.toml
@@ -0,0 +1,3 @@
+[formatter.prettier]
+command = "prettier"
+excludes = ["generated-*.yaml"]
diff --git a/cells/devshell/commands.toml → dev/shellProfiles/commands.toml b/cells/devshell/commands.toml → dev/shellProfiles/commands.toml
diff --git a/cells/devshell/packages.toml → dev/shellProfiles/packages.toml b/cells/devshell/packages.toml → dev/shellProfiles/packages.toml
diff --git a/dev/tasks/dir/default.nix b/dev/tasks/dir/default.nix
@@ -0,0 +1,7 @@
+makeScript {
+  name = "runScriptDir";
+  searchPaths.bin = [nixpkgs.hello];
+  entrypoint = ''
+    hello
+  '';
+}
diff --git a/dev/tasks/makes-test.nix b/dev/tasks/makes-test.nix
@@ -0,0 +1,26 @@
+makeScript {
+  name = "runScriptWithEnv";
+  searchPaths.bin = [
+    nixpkgs.hello
+  ];
+  searchPaths.source = [
+    (makeEnvVars {
+      name = "firstEnvVarsOutput";
+      mapping = {
+        a = "1";
+        b = "2";
+      };
+    })
+    (makeEnvVars {
+      name = "secondEnvVarsOutput";
+      mapping = {
+        c = "3";
+        d = "4";
+      };
+    })
+  ];
+  entrypoint = ''
+    hello --help
+    echo $a
+  '';
+}
diff --git a/cells/tasks/runScriptWithEnv.nix → dev/tasks/runScriptWithEnv.nix b/cells/tasks/runScriptWithEnv.nix → dev/tasks/runScriptWithEnv.nix
diff --git a/devshell.toml b/devshell.toml
@@ -1,8 +1,9 @@
-[cellsFrom]
-devshell = "/devshell"
+[cellBlocks]
+shellProfiles = "/shellProfiles" #toml,nix
+shell = "/shell" # nix
 tasks = "/tasks"
-configs = "/configs"
-schemas = "/tenzir/schemas"
+configs = "/configs" #json,toml,yaml
+schemas = "/schemas" #json,toml,yaml
 
 [devshell]
 # programs.sops.enable = true;

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,15 +6,11 @@
     ...
   } @ inputs:
     (
-      tenzir-devops.lib.mkStd
-      {
-        inherit inputs;
-        cellsFrom = ./cells;
-      }
+      tenzir-devops.lib.mkStd {inherit inputs;}
     )
     // {
-      devShells = inputs.tenzir-devops.inputs.std.harvest inputs.self [["users" "shells"]];
-      templates = (inputs.tenzir-devops.inputs.std.harvest inputs.self ["users" "lib"]).x86_64-linux.templates;
+      devShells = inputs.tenzir-devops.inputs.std.harvest inputs.self [["dev" "shells"]];
+      templates = (inputs.tenzir-devops.inputs.std.harvest inputs.self ["dev" "lib"]).x86_64-linux.templates;
     };
   inputs = {
     tenzir-devops.url = "github:gtrunsec/vast/devops?dir=nix/devops";

diff --git a/tenzir/schemas/sysmon.yaml → prod/schemas/tenzir-sysmon.yaml b/tenzir/schemas/sysmon.yaml → prod/schemas/tenzir-sysmon.yaml
@@ -6,4 +6,3 @@ data:
       fields:
         - sysmon.extend.field_1
         - sysmon.extend.field_2
-        - sysmon.extend.field_3