Extract theming from the de configuration

This commit is contained in:
SebastianStork 2024-05-28 20:55:16 +02:00
parent 73afff8799
commit 10bb7b5c31
10 changed files with 10 additions and 17 deletions

View file

@ -1,6 +0,0 @@
{
imports = [
./hyprland
./theme.nix
];
}

View file

@ -1,6 +1,7 @@
{
imports = [
./de
./hyprland
./theme.nix
./vscode.nix
./shell
./ssh-client.nix

View file

@ -16,7 +16,7 @@
wrappers.waybar
wrappers.hyprlock
(wrappers.rofi { inherit (config.myConfig.de) theme; })
(wrappers.rofi { inherit (config.myConfig) theme; })
pkgs.cliphist
pkgs.wl-clipboard
(pkgs.writeScriptBin "clipboard" "cliphist list | rofi -dmenu -display-columns 2 | cliphist decode | wl-copy")

View file

@ -84,7 +84,7 @@
dark = "";
light = "GitHub";
}
.${config.myConfig.de.theme};
.${config.myConfig.theme};
in
{
cat = "bat --plain --theme=${theme}";

View file

@ -5,10 +5,10 @@
...
}:
let
cfg = config.myConfig.de;
cfg = config.myConfig;
in
{
options.myConfig.de.theme = lib.mkOption { type = lib.types.str; };
options.myConfig.theme = lib.mkOption { type = lib.types.str; };
config = lib.mkMerge [
(lib.mkIf (cfg.theme == "dark") {

View file

@ -41,7 +41,7 @@
dark = "Gruvbox Dark Hard";
light = "GitHub Light";
}
.${config.myConfig.de.theme};
.${config.myConfig.theme};
"workbench.iconTheme" = "material-icon-theme";
"editor.fontFamily" = "JetBrainsMono Nerd Font";
"explorer.confirmDelete" = false;