split up flake

This commit is contained in:
lucy 2026-08-31 14:36:32 +02:00
commit c9902751ca
8 changed files with 89 additions and 60 deletions

View file

@ -27,23 +27,9 @@
wrappers.flakeModules.wrappers
./modules/theme.nix
./modules/programs/emacs/emacs.nix
./hosts.nix
];
flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
base16.nixosModule
{ scheme = "${inputs.tt-schemes}/base16/oxocarbon-dark.yaml"; }
./modules/hosts/nerv/configuration.nix
config.flake.wrappers.emacs.install
{ wrappers.emacs.enable = true; }
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.lucy = ./modules/home.nix;
}
];
};
}
);
}

23
hosts.nix Normal file
View file

@ -0,0 +1,23 @@
{ inputs, config, ... }:
let
themeName = "catppuccin-mocha";
in
{
flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
inputs.base16.nixosModules
{ scheme = "${inputs.tt-schemes}/base16/${themeName}"; }
config.wrappers.emacs.install
./configuration.nix
./modules/theme.nix
./modules/programs/emacs/emacs.nix
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
}
];
};
}

View file

@ -1,22 +1,17 @@
{
inputs,
pkgs,
config,
...
}:
let
c = ((pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs config.theme.name).withHashtag;
c = config.scheme.withHashtag;
in
{
home-manager.users.lucy = {
home.stateVersion = "26.05";
gtk = {
enable = true;
colorScheme = "dark";
cursorTheme = {
name = "macOS";
package = pkgs.apple-cursor;
size = 24;
};
gtk3.extraCss = ''
@define-color theme_bg_color ${c.base00};
@define-color theme_fg_color ${c.base05};
@ -31,7 +26,31 @@ in
@define-color error_color ${c.base08};
@define-color success_color ${c.base0B};
'';
gtk4.extraCss = ''
@define-color window_bg_color ${c.base00};
@define-color window_fg_color ${c.base05};
@define-color view_bg_color ${c.base00};
@define-color view_fg_color ${c.base05};
@define-color headerbar_bg_color ${c.base01};
@define-color headerbar_fg_color ${c.base05};
@define-color headerbar_border_color ${c.base02};
@define-color sidebar_bg_color ${c.base01};
@define-color sidebar_fg_color ${c.base05};
@define-color card_bg_color ${c.base01};
@define-color card_fg_color ${c.base05};
@define-color popover_bg_color ${c.base01};
@define-color popover_fg_color ${c.base05};
@define-color dialog_bg_color ${c.base01};
@define-color dialog_fg_color ${c.base05};
@define-color accent_bg_color ${c.base0D};
@define-color accent_fg_color ${c.base00};
@define-color accent_color ${c.base0D};
@define-color destructive_bg_color ${c.base08};
@define-color destructive_color ${c.base08};
@define-color warning_color ${c.base0A};
@define-color error_color ${c.base08};
@define-color success_color ${c.base0B};
'';
};
};
}

View file

@ -0,0 +1,9 @@
{ inputs, ... }: {
flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
modules = [
./configuration.nix
];
};
}

View file

@ -1,23 +0,0 @@
{
inputs,
config,
lib,
...
}:
let
schemeName = config.theme.name;
in
{
config,
lib,
pkgs,
...
}:
let
scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
in
{
}

View file

@ -0,0 +1 @@
lucy@nerv.50314:1788169501

View file

@ -1 +0,0 @@
lucy@nerv.31959:1788169501

View file

@ -1,7 +1,22 @@
{ inputs, config, lib, ... }: let
{
inputs,
config,
lib,
...
}:
let
schemeName = config.theme.name;
in
{config, lib, pkgs, ...}:
let scheme = (pkgs.callPackage inputs.base16.lib {}).mkSchemeAttrs schemeName; in
{}
{
config,
lib,
pkgs,
...
}:
let
scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
in
{
options.scheme = lib.mkOption {type = lib.types.str; };
config.scheme = scheme;
}