Merge develop into master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

TheMaxMur merged 32 commits into master from develop

Mar 8, 2025

assets/keyboard/layer-0.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

assets/keyboard/layer-1.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

assets/keyboard/layer-2.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

assets/keyboard/layer-3.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

assets/keyboard/layer-4.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

assets/keyboard/layer-5.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

assets/keyboard/layer-6.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

assets/network/main.svg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

assets/network/network.svg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

docs/default.nix

-Original file line number
+Diff line change
@@ -1,7 +1,9 @@
     {
-      perSystem =
-        { self', pkgs, ... }:
-        {
-          packages.mydocs = pkgs.callPackage ./docs.nix { self = self'; };
-        };
+      perSystem = {
+        self',
+        pkgs,
+        ...
+      }: {
+        packages.mydocs = pkgs.callPackage ./docs.nix {self = self';};
+      };
     }

docs/docs.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,45 +1,42 @@
  
    /*

      { pkgs

      , ...

      }:

    { pkgs

    , ...

    }:

      let

        inherit (pkgs) stdenv mkdocs python310Packages;

        options-doc = pkgs.callPackage ./options-doc.nix {};

      in stdenv.mkDerivation {

        src = ./.;

        name = "docs";

    let

      inherit (pkgs) stdenv mkdocs python310Packages;

      options-doc = pkgs.callPackage ./options-doc.nix {};

    in stdenv.mkDerivation {

      src = ./.;

      name = "docs";

        buildInput = [ options-doc ];

      buildInput = [ options-doc ];

        nativeBuildInputs = [

            mkdocs

            python310Packages.mkdocs-material

            python310Packages.pygments

          ];

      nativeBuildInputs = [

          mkdocs

          python310Packages.mkdocs-material

          python310Packages.pygments

        ];

          buildPhase = ''

            ln -s ${options-doc} "./docs/nixos-options.md"

            mkdocs build

          '';

        buildPhase = ''

          ln -s ${options-doc} "./docs/nixos-options.md"

          mkdocs build

        '';

          installPhase = ''

            mv site $out

          '';

        }

        installPhase = ''

          mv site $out

        '';

      }

    */

    {

      writeShellScriptBin,

      pkgs,

      self,

      ...

    }:

    let

      options-doc = pkgs.callPackage ./options-doc.nix { inherit self; };

    }: let

      options-doc = pkgs.callPackage ./options-doc.nix {inherit self;};

    in

    writeShellScriptBin "gen-options-doc" ''

      echo "Generating NixOS module options documentation"

      cat ${options-doc} > OPTIONS.md

    ''

      writeShellScriptBin "gen-options-doc" ''

        echo "Generating NixOS module options documentation"

        cat ${options-doc} > OPTIONS.md

      ''

docs/options-doc.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,11 +4,9 @@
  
      pkgs,

      runCommand,

      nixosOptionsDoc,

    }:

    let

    }: let

      eval = lib.evalModules {

        specialArgs = { inherit self pkgs; };

        specialArgs = {inherit self pkgs;};

        modules = [

          (lib.nixosSystem {

    @@ -24,6 +22,6 @@ let
  
        inherit (eval) options;

      };

    in

    runCommand "options-doc.md" { } ''

      cat ${optionsDoc.optionsCommonMark} >> $out

    ''

      runCommand "options-doc.md" {} ''

        cat ${optionsDoc.optionsCommonMark} >> $out

      ''