This commit is contained in:
megit 2025-07-26 13:18:38 +00:00
parent d43a0d24dd
commit 1fe89e8238
3 changed files with 81 additions and 61 deletions

7
default.nix Normal file
View file

@ -0,0 +1,7 @@
[
"aarch64-darwin"
"aarch64-linux"
"x86_64-darwin"
"x86_64-linux"
"i686-linux"
]

34
flake.lock generated
View file

@ -106,7 +106,9 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": [
"my_systems"
]
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -124,7 +126,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -241,6 +243,18 @@
"type": "github" "type": "github"
} }
}, },
"my_systems": {
"flake": false,
"locked": {
"path": "./default.nix",
"type": "path"
},
"original": {
"path": "./default.nix",
"type": "path"
},
"parent": []
},
"neorg": { "neorg": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -463,6 +477,7 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"my_systems": "my_systems",
"neorg-overlay": "neorg-overlay", "neorg-overlay": "neorg-overlay",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixvim": "nixvim" "nixvim": "nixvim"
@ -483,21 +498,6 @@
"type": "github" "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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

101
flake.nix
View file

@ -8,59 +8,72 @@
nixvim.url = "github:nix-community/nixvim/nixos-24.05"; nixvim.url = "github:nix-community/nixvim/nixos-24.05";
# nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
# nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; # 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/nvim-neorg/nixpkgs-neorg-overlay
# https://github.com/nix-community/nixvim/issues/1395 # https://github.com/nix-community/nixvim/issues/1395
neorg-overlay.url = "github:nvim-neorg/nixpkgs-neorg-overlay"; neorg-overlay.url = "github:nvim-neorg/nixpkgs-neorg-overlay";
}; };
outputs = { outputs =
self {
, nixpkgs self,
# , nixpkgs-stable nixpkgs,
, nixvim # , nixpkgs-stable
, flake-utils nixvim,
, neorg-overlay flake-utils,
, ... neorg-overlay,
} @ inputs: let ...
config = import ./config; # import the module directly }@inputs:
in let
flake-utils.lib.eachDefaultSystem (system: let config = import ./config; # import the module directly
nixvimLib = nixvim.lib.${system}; in
pkgs = import nixpkgs { flake-utils.lib.eachDefaultSystem (
inherit system; system:
nixpkgs.overlays = [ neorg-overlay.overlays.default ]; let
}; nixvimLib = nixvim.lib.${system};
# pkgs-stable = import nixpkgs-stable { pkgs = import nixpkgs {
# inherit system; inherit system;
# nixpkgs.overlays = [ neorg-overlay.overlays.default ]; nixpkgs.overlays = [ neorg-overlay.overlays.default ];
# }; };
nixvim' = nixvim.legacyPackages.${system}; # pkgs-stable = import nixpkgs-stable {
nvim = nixvim'.makeNixvimWithModule { # inherit system;
inherit pkgs; # nixpkgs.overlays = [ neorg-overlay.overlays.default ];
module = config; # };
# You can use `extraSpecialArgs` to pass additional arguments to your module files nixvim' = nixvim.legacyPackages.${system};
extraSpecialArgs = { nvim = nixvim'.makeNixvimWithModule {
inherit self;
# inherit pkgs-stable;
inherit pkgs; 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
in { {
checks = { checks = {
# Run `nix flake check .` to verify that your config is not broken # Run `nix flake check .` to verify that your config is not broken
default = nixvimLib.check.mkTestDerivationFromNvim { default = nixvimLib.check.mkTestDerivationFromNvim {
inherit nvim; inherit nvim;
name = "my_nixvim"; name = "my_nixvim";
};
}; };
};
packages = { packages = {
# Lets you run `nix run .` to start nixvim # Lets you run `nix run .` to start nixvim
default = nvim; default = nvim;
}; };
# formatter = pkgs.alejandra; # formatter = pkgs.alejandra;
}); }
);
} }