move colorscheme out of gui section

This commit is contained in:
Noah Masur
2022-07-25 23:36:06 -04:00
parent 6353ac188e
commit 4e8546728e
10 changed files with 97 additions and 98 deletions

View File

@ -1,11 +1,7 @@
{ config, lib, pkgs, ... }: {
imports = [
../modules/shell
../modules/neovim
../modules/repositories/notes.nix
../modules/repositories/dotfiles.nix
];
imports =
[ ../modules/shell ../modules/neovim ../modules/repositories/dotfiles.nix ];
options = with lib; {
user = mkOption {
@ -26,10 +22,10 @@
description = "Enable graphics";
default = false;
};
colorscheme = mkOption {
type = types.attrs;
description = "Base16 color scheme";
};
};
colorscheme = mkOption {
type = types.attrs;
description = "Base16 color scheme";
};
homePath = mkOption {
type = types.path;

View File

@ -32,6 +32,7 @@ nixpkgs.lib.nixosSystem {
../../modules/gaming
../../modules/applications
../../modules/mail/himalaya.nix
../../modules/repositories/notes.nix
../../modules/services/keybase.nix
../../modules/services/gnupg.nix
../../modules/services/mullvad.nix

View File

@ -9,7 +9,7 @@ darwin.lib.darwinSystem {
home-manager.darwinModules.home-manager
{
gui.enable = true;
gui.colorscheme = (import ../../modules/colorscheme/gruvbox);
colorscheme = (import ../../modules/colorscheme/gruvbox);
mailUser = globals.user;
nixpkgs.overlays = [ nur.overlay ];
}
@ -18,6 +18,7 @@ darwin.lib.darwinSystem {
../../modules/applications/alacritty.nix
../../modules/applications/discord.nix
../../modules/mail/himalaya.nix
../../modules/repositories/notes.nix
../../modules/programming/nix.nix
../../modules/programming/terraform.nix
../../modules/programming/python.nix

View File

@ -11,7 +11,7 @@ nixpkgs.lib.nixosSystem {
{
networking.hostName = "wsl";
gui.enable = false;
gui.colorscheme = (import ../../modules/colorscheme/gruvbox);
colorscheme = (import ../../modules/colorscheme/gruvbox);
passwordHash =
"$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.";
wsl = {
@ -28,6 +28,7 @@ nixpkgs.lib.nixosSystem {
../../modules/wsl
../../modules/nixos
../../modules/mail/himalaya.nix
../../modules/repositories/notes.nix
../../modules/programming/nix.nix
../../modules/programming/lua.nix
];