chore: update

tao3k · Oct 20, 2023 · 28e4756 · 28e4756
1 parent 0c4bf73
commit 28e4756
Show file tree

Hide file tree

Showing 20 changed files with 77 additions and 64 deletions.
diff --git a/docs/org/networking.org b/docs/org/networking.org
@@ -0,0 +1,9 @@
+:PROPERTIES:
+:ID:       b965ba06-6f21-4058-8929-3d3936388087
+:END:
+#+TITLE: networking
+#+AUTHOR: GuangTao Zhang
+#+EMAIL: gtrunsec@hardenedlinux.org
+#+DATE: 2023-10-08 Sun 21:22
+
+* avahi :dns:
diff --git a/flake.lock b/flake.lock
diff --git a/local/cells/repo/configs.nix b/local/cells/repo/configs.nix
@@ -14,14 +14,10 @@ let
     let
       inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;
     in
-    inputs.omnibus.pops.configs.addLoadExtender {
-      load.inputs.inputs = inputs' // {
-        inherit nixpkgs;
-      };
-    };
+    inputs.omnibus.pops.configs.addLoadExtender { load.inputs.inputs = inputs'; };
 in
 {
-  conform.data = {
+  conform'.data = {
     commit.conventional.scopes = append [
       "nixosModules"
       "nixosProfiles"
@@ -32,5 +28,5 @@ in
       ".*."
     ];
   };
-  treefmt = configs.layouts.default.treefmt;
+  inherit (configs.layouts.default) treefmt lefthook conform;
 }
diff --git a/local/cells/repo/devshellProfiles.nix b/local/cells/repo/devshellProfiles.nix
@@ -0,0 +1,6 @@
+let
+  inptus' = (inputs.omnibus.pops.flake.setSystem inputs.nixpkgs.system).inputs;
+in
+(inputs.omnibus.pops.devshellProfiles.addLoadExtender {
+  load.inputs = inptus';
+}).layouts.default
diff --git a/local/cells/repo/shells.nix b/local/cells/repo/shells.nix
@@ -6,30 +6,22 @@
 let
   inherit (inputs.std) lib;
   inherit (inputs) nixpkgs std;
-  devshellProfiles =
-    let
-      __inptus__ = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;
-    in
-    (inputs.omnibus.devshell.loadProfiles.addLoadExtender {
-      inputs = {
-        inherit (__inptus__) fenix;
-        nixpkgs = __inptus__.nixpkgs.legacyPackages;
-      };
-    }).exports.default;
 in
 {
   # Tool Homepage: https://numtide.github.io/devshell/
   default = lib.dev.mkShell {
     name = "omnibus devshell";
 
     # imports = [ devshellProfiles.rust ];
+
     # Tool Homepage: https://nix-community.github.io/nixago/
     # This is Standard's devshell integration.
     # It runs the startup hook when entering the shell.
     nixago = [
-      (inputs.std-ext.presets.nixago.conform cell.configs.conform)
-      # (inputs.std-ext.presets.nixago.treefmt)
-      (inputs.std-ext.presets.nixago.lefthook)
+      (std.lib.dev.mkNixago std.lib.cfg.conform cell.configs.conform.default
+        cell.configs.conform'
+      )
+      (std.lib.dev.mkNixago std.lib.cfg.lefthook cell.configs.lefthook.default)
       (std.lib.dev.mkNixago std.lib.cfg.treefmt cell.configs.treefmt.default)
     ];
 

diff --git a/local/flake.nix b/local/flake.nix
@@ -25,6 +25,7 @@
           # Development Environments
           (nixago "configs")
           (devshells "shells")
+          (functions "devshellProfiles")
         ];
       }
       {

diff --git a/local/lock/flake.lock b/local/lock/flake.lock
diff --git a/local/lock/flake.nix b/local/lock/flake.nix
@@ -1,6 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 

diff --git a/templates/hivebus/nix/lib/exporter/pops/subflake.nix b/templates/hivebus/nix/lib/exporter/pops/subflake.nix
@@ -5,9 +5,7 @@
       subflake = omnibus.pops.flake.setInitInputs ../../../lock;
     in
     {
-      inputs = subflake.inputs // {
-        nixpkgs = subflake.inputs.nixpkgs.legacyPackages;
-      };
+      inputs = subflake.inputs;
     }
   )
 ))
diff --git a/templates/hivebus/units/nixos/hosts/darwin/layouts.nix b/templates/hivebus/units/nixos/hosts/darwin/layouts.nix
@@ -3,7 +3,7 @@ let
 in
 # self' = inputs.self.hosts.nixos;
 {
-  system = "aarch64-linux";
+  system = "aarch64-darwin";
 
   data = outputs.local.${self.system}.data;
 

diff --git a/templates/hivebus/units/nixos/hosts/nixos/nixosConfiguration.nix b/templates/hivebus/units/nixos/hosts/nixos/nixosConfiguration.nix
@@ -1,5 +1,5 @@
 let
-  inherit (inputs) nixpkgs;
+  inherit (inputs) nixos;
 in
 nixpkgs.lib.nixosSystem rec {
   system = super.layouts.system;

diff --git a/templates/nixos/units/nixos/hosts/darwin/layouts.nix b/templates/nixos/units/nixos/hosts/darwin/layouts.nix
@@ -7,7 +7,7 @@ let
   outputs = inputs.self;
 in
 {
-  system = "aarch64-linux";
+  system = "aarch64-aarch";
 
   data = outputs.local.${self.system}.data;
 

diff --git a/tests/devshell/expr.nix b/tests/devshell/expr.nix
@@ -12,9 +12,8 @@ let
     ((baseInputs.addInputsExtender (
       POP.lib.extendPop flops.lib.flake.pops.inputsExtender (
         self: super: {
-          inputs = {
+          inputs = baseInputs.inputs // {
             devshell = baseInputs.inputs.devshell.legacyPackages;
-            nixpkgs = baseInputs.inputs.nixpkgs.legacyPackages;
           };
         }
       )

diff --git a/tests/nixos/__fixture/layouts.nix b/tests/nixos/__fixture/layouts.nix
@@ -1,5 +1,5 @@
 let
-  inherit (inputs) nixpkgs darwin;
+  inherit (inputs) nixpkgs darwin nixos;
   # layouts.default to be default
   outputs = omnibus.lib.mapPopsLayouts' super.pops;
   # with multi-layout

diff --git a/tests/nixos/__fixture/pops/flake.nix b/tests/nixos/__fixture/pops/flake.nix
@@ -8,7 +8,6 @@
     {
       inputs = {
         std = local.outputs.std;
-        nixpkgs = omnibus.pops.flake.inputs.nixpkgs.legacyPackages;
       } // selfInputs.inputs;
     }
   )

diff --git a/tests/nixos/_pops.nix b/tests/nixos/_pops.nix
@@ -1,4 +1,8 @@
-{ omnibus, root }:
+{
+  omnibus,
+  root,
+  flops,
+}:
 (omnibus.pops.exporter.addLoadExtender {
   load = {
     src = ./__fixture;

diff --git a/units/nixos/homeProfiles/presets/git.nix b/units/nixos/homeProfiles/presets/git.nix
@@ -0,0 +1,15 @@
+{
+  programs.git = {
+    enable = true;
+    delta.enable = true;
+    lfs.enable = true;
+
+    extraConfig = {
+      core.autocrlf = "input";
+      init.defaultBranch = "main";
+      pull.rebase = true;
+      rebase.autosquash = true;
+      rerere.enabled = true;
+    };
+  };
+}
diff --git a/units/nixos/nixosModules/omnibus/coding/python.nix b/units/nixos/nixosModules/omnibus/coding/python.nix
@@ -4,6 +4,11 @@
       mkEnableOption
         "Enable the language server protocol bridge support";
     emacs-eaf = mkEnableOption "Enable the Emacs Application Framework support";
+    python = mkOption {
+      type = types.package;
+      default = pkgs.python3;
+      description = "The Python package to use";
+    };
     extraPackages = mkOption {
       type = types.functionTo (types.listOf types.package);
       default = ps: [ ];

diff --git a/units/nixos/nixosProfiles/presets/coding/nix.nix b/units/nixos/nixosProfiles/presets/coding/nix.nix
@@ -1,4 +1,8 @@
-{ pkgs, omnibus }:
+{
+  pkgs,
+  omnibus,
+  inputs,
+}:
 let
   inherit
     (omnibus.lib.errors.requiredInputs inputs "omnibus.pops.nixosProfiles" [

diff --git a/units/nixos/nixosProfiles/presets/coding/python.nix b/units/nixos/nixosProfiles/presets/coding/python.nix
@@ -2,7 +2,7 @@
 let
   cfg = config.omnibus.coding.python;
   pythonEnv =
-    (pkgs.python3.withPackages (
+    (cfg.python.withPackages (
       ps:
       with ps;
       (lib.optionals cfg.emacs-eaf [
@@ -30,26 +30,7 @@ let
         paramiko
         rapidfuzz
       ])
-      ++ [
-        pytest
-        #orgparse
-        pytest
-        jupyter
-        #voila
-        pygments
-        # orgbabelhelper
-        # jupyterlab
-        pdftotext
-        openai
-      ]
-      ++ lib.optionals pkgs.stdenv.isLinux [
-        # pyqt6
-        # pyqt6-webengine
-        pyinotify
-        pymupdf
-        # eaf depencencies
-        lxml
-      ]
+      ++ [ ]
     ));
 in
 #.override (args: {ignoreCollisions = true;});