fix flake check errors

also break out packages into individual systems
This commit is contained in:
Noah Masur
2023-04-16 16:33:16 -04:00
parent 1510c8c31f
commit 2337db0bda
7 changed files with 60 additions and 63 deletions

View File

@ -1,4 +1,4 @@
{ inputs, globals, ... }:
{ inputs, system, globals, overlays, ... }:
with inputs;
@ -8,6 +8,7 @@ nixos-generators.nixosGenerate {
modules = [
home-manager.nixosModules.home-manager
{
nixpkgs.overlays = overlays;
user = globals.user;
fullName = globals.fullName;
dotfilesRepo = globals.dotfilesRepo;
@ -15,7 +16,7 @@ nixos-generators.nixosGenerate {
gitEmail = globals.gitEmail;
networking.hostName = "sheep";
gui.enable = false;
colorscheme = (import ../colorscheme/gruvbox);
theme.colors = (import ../../colorscheme/gruvbox).dark;
passwordHash = null;
publicKey =
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
@ -24,7 +25,7 @@ nixos-generators.nixosGenerate {
}
../../modules/common
../../modules/nixos
../../modules/common/services/sshd.nix
../../modules/nixos/services/sshd.nix
] ++ [
# Required to fix diskSize errors during build
({ ... }: { amazonImage.sizeMB = 16 * 1024; })

View File

@ -34,9 +34,7 @@ nixos-generators.nixosGenerate {
curl
(import ../../modules/common/neovim/package {
inherit pkgs;
# colors = import ../../colorscheme/gruvbox.dark.neovimConfig {
# inherit pkgs;
# };
colors = (import ../../colorscheme/gruvbox).dark;
})
];
nix.extraOptions = ''