Merge remote-tracking branch 'origin/nixos' into nixos-work

This commit is contained in:
Moritz Böhme 2022-10-16 13:55:42 +02:00
commit 7db3dd86f7
62 changed files with 1094 additions and 956 deletions

View file

@ -12,10 +12,7 @@
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
utils = {
url = "github:gytis-ivaskevicius/flake-utils-plus";
inputs.nixpkgs.follows = "nixpkgs";
};
utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
agenix = {
url = "github:ryantm/agenix";
@ -65,14 +62,12 @@
url = "github:SenchoPens/base16.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
howdy.url = "git+https://git.sr.ht/~moritzboehme/howdy";
};
outputs =
inputs @ { self
, nixpkgs
, utils
, ...
}:
inputs@{ self, nixpkgs, utils, ... }:
utils.lib.mkFlake {
inherit self inputs;
@ -87,6 +82,7 @@
self.overlays.default
inputs.utils.overlay
inputs.emacs-overlay.overlay
inputs.howdy.overlays.default
];
###############
@ -99,6 +95,7 @@
./modules/profiles/desktop.nix
./modules/profiles/work.nix
];
hostDefaults.modules = [
./modules/default.nix
self.nixosModules.base
@ -112,12 +109,14 @@
}
inputs.agenix.nixosModules.age
inputs.base16.nixosModule
inputs.howdy.nixosModules.default
];
hosts.nixos-laptop.modules = [
./hosts/nixos-laptop
self.nixosModules.desktop
];
hosts.nixos-desktop.modules = [
./hosts/nixos-desktop
self.nixosModules.desktop
@ -145,6 +144,7 @@
cachix
];
};
checks.pre-commit-check = inputs.pre-commit-hooks.lib."${system}".run {
src = ./.;
hooks = {