mirror of
https://github.com/tomasriveral/nixos.git
synced 2026-08-12 02:28:37 +02:00
dendritic: rewrote entire config
This commit is contained in:
@@ -18,14 +18,13 @@
|
||||
url = "git+https://codeberg.org/gibbert/micro-vivify";
|
||||
flake = false;
|
||||
};
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
};
|
||||
import-tree.url = "github:vic/import-tree"; # imports ./modules recursively
|
||||
};
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
|
||||
outputs = inputs @ { flake-parts, ... }:
|
||||
/*@ inputs: let
|
||||
unfreePkgs = [
|
||||
"hplip"
|
||||
"vivify.vim"
|
||||
@@ -40,27 +39,7 @@
|
||||
|
||||
config.allowUnfreePredicate = mkUnfreePredicate;
|
||||
};
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
laptop = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs pkgs-unstable;};
|
||||
modules = [
|
||||
./hosts/laptop/configuration.nix
|
||||
# solves evaluation warning
|
||||
/*
|
||||
You have set specialArgs.pkgs, which means that options like nixpkgs.config
|
||||
and nixpkgs.overlays will be ignored. If you wish to reuse an already created
|
||||
pkgs, which you know is configured correctly for this NixOS configuration,
|
||||
please import the `nixosModules.readOnlyPkgs` module from the nixpkgs flake or
|
||||
`(modulesPath + "/misc/nixpkgs/read-only.nix"), and set `{ nixpkgs.pkgs = <your pkgs>; }`.
|
||||
This properly disables the ignored options to prevent future surprises.
|
||||
*/
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate = mkUnfreePredicate;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
# we use home-manager directly inside of configuration.nix
|
||||
};
|
||||
}
|
||||
in */
|
||||
flake-parts.lib.mkFlake { inherit inputs; }
|
||||
(inputs.import-tree ./modules);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user