From 1fe89e8238cfeba2f6b25c8a9157f19b2eeac5ef Mon Sep 17 00:00:00 2001 From: megit Date: Sat, 26 Jul 2025 13:18:38 +0000 Subject: [PATCH] temp --- default.nix | 7 ++++ flake.lock | 34 +++++++++--------- flake.nix | 101 +++++++++++++++++++++++++++++----------------------- 3 files changed, 81 insertions(+), 61 deletions(-) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..e09f52c --- /dev/null +++ b/default.nix @@ -0,0 +1,7 @@ +[ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + "i686-linux" +] diff --git a/flake.lock b/flake.lock index 082126c..3f998b6 100644 --- a/flake.lock +++ b/flake.lock @@ -106,7 +106,9 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "my_systems" + ] }, "locked": { "lastModified": 1710146030, @@ -124,7 +126,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, @@ -241,6 +243,18 @@ "type": "github" } }, + "my_systems": { + "flake": false, + "locked": { + "path": "./default.nix", + "type": "path" + }, + "original": { + "path": "./default.nix", + "type": "path" + }, + "parent": [] + }, "neorg": { "flake": false, "locked": { @@ -463,6 +477,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", + "my_systems": "my_systems", "neorg-overlay": "neorg-overlay", "nixpkgs": "nixpkgs_4", "nixvim": "nixvim" @@ -483,21 +498,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 6e0cf54..0bfc767 100644 --- a/flake.nix +++ b/flake.nix @@ -8,59 +8,72 @@ nixvim.url = "github:nix-community/nixvim/nixos-24.05"; # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; - flake-utils.url = "github:numtide/flake-utils"; + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.systems.follows = "my_systems"; + }; + my_systems = { + url = "path:./default.nix"; + flake = false; + }; # https://github.com/nvim-neorg/nixpkgs-neorg-overlay # https://github.com/nix-community/nixvim/issues/1395 neorg-overlay.url = "github:nvim-neorg/nixpkgs-neorg-overlay"; }; - outputs = { - self - , nixpkgs - # , nixpkgs-stable - , nixvim - , flake-utils - , neorg-overlay - , ... - } @ inputs: let - config = import ./config; # import the module directly - in - flake-utils.lib.eachDefaultSystem (system: let - nixvimLib = nixvim.lib.${system}; - pkgs = import nixpkgs { - inherit system; - nixpkgs.overlays = [ neorg-overlay.overlays.default ]; - }; - # pkgs-stable = import nixpkgs-stable { - # inherit system; - # nixpkgs.overlays = [ neorg-overlay.overlays.default ]; - # }; - nixvim' = nixvim.legacyPackages.${system}; - nvim = nixvim'.makeNixvimWithModule { - inherit pkgs; - module = config; - # You can use `extraSpecialArgs` to pass additional arguments to your module files - extraSpecialArgs = { - inherit self; - # inherit pkgs-stable; + outputs = + { + self, + nixpkgs, + # , nixpkgs-stable + nixvim, + flake-utils, + neorg-overlay, + ... + }@inputs: + let + config = import ./config; # import the module directly + in + flake-utils.lib.eachDefaultSystem ( + system: + let + nixvimLib = nixvim.lib.${system}; + pkgs = import nixpkgs { + inherit system; + nixpkgs.overlays = [ neorg-overlay.overlays.default ]; + }; + # pkgs-stable = import nixpkgs-stable { + # inherit system; + # nixpkgs.overlays = [ neorg-overlay.overlays.default ]; + # }; + nixvim' = nixvim.legacyPackages.${system}; + nvim = nixvim'.makeNixvimWithModule { inherit pkgs; + module = config; + # You can use `extraSpecialArgs` to pass additional arguments to your module files + extraSpecialArgs = { + inherit self; + # inherit pkgs-stable; + inherit pkgs; + }; }; - }; - in { - checks = { - # Run `nix flake check .` to verify that your config is not broken - default = nixvimLib.check.mkTestDerivationFromNvim { - inherit nvim; - name = "my_nixvim"; + in + { + checks = { + # Run `nix flake check .` to verify that your config is not broken + default = nixvimLib.check.mkTestDerivationFromNvim { + inherit nvim; + name = "my_nixvim"; + }; }; - }; - packages = { - # Lets you run `nix run .` to start nixvim - default = nvim; - }; + packages = { + # Lets you run `nix run .` to start nixvim + default = nvim; + }; - # formatter = pkgs.alejandra; - }); + # formatter = pkgs.alejandra; + } + ); }