Skip to content

Commit

Permalink
flake: reduce lockfile bloat
Browse files Browse the repository at this point in the history
  • Loading branch information
moni-dz committed Nov 27, 2024
1 parent e505c85 commit d628421
Show file tree
Hide file tree
Showing 10 changed files with 746 additions and 808 deletions.
797 changes: 23 additions & 774 deletions flake.lock

Large diffs are not rendered by default.

22 changes: 14 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,23 @@
];

imports = [
inputs.parts.flakeModules.partitions
./modules/parts
./packages
./hosts
./users
];

partitions = {
drvs = {
extraInputsFlake = ./packages;
module = ./packages/module.nix;
};
};

partitionedAttrs = {
overlays = "drvs";
packages = "drvs";
};
};

inputs = {
Expand All @@ -25,22 +37,18 @@
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1";
home.url = "github:nix-community/home-manager";
nil.url = "github:oxalica/nil";
nix.url = "github:nixos/nix";
nix-colors.url = "github:Misterio77/nix-colors";
nix-index-database.url = "github:Mic92/nix-index-database";
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
nixos-wsl.url = "github:nix-community/nixos-wsl";
nixpkgs-f2k.url = "github:fortuneteller2k/nixpkgs-f2k";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
nvim.url = "github:nix-community/neovim-nightly-overlay";
parts.url = "github:hercules-ci/flake-parts";
statix.url = "github:nerdypepper/statix";

# Non-flake inputs

# Nixpkgs branches
master.url = "github:nixos/nixpkgs/master";
stable.url = "github:nixos/nixpkgs/release-23.05";
stable.url = "github:nixos/nixpkgs/release-24.11";
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";

# Default Nixpkgs for packages and modules
Expand All @@ -51,11 +59,9 @@
agenix.inputs.darwin.follows = "darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs";
home.inputs.nixpkgs.follows = "nixpkgs";
nix.inputs.nixpkgs.follows = "nixpkgs";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs-f2k.inputs.nixpkgs.follows = "nixpkgs";
statix.inputs.nixpkgs.follows = "nixpkgs";
};
}
2 changes: 1 addition & 1 deletion modules/shared/home-manager/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

inherit (pkgs.gitAndTools) gh;
inherit (inputs'.agenix.packages) agenix;
inherit (inputs'.nvim.packages) neovim;
inherit (self'.packages) neovim;
};

sessionVariables = {
Expand Down
11 changes: 0 additions & 11 deletions packages/default.nix

This file was deleted.

Loading

0 comments on commit d628421

Please sign in to comment.