Add light theme

This commit is contained in:
SebastianStork 2024-04-29 16:04:55 +02:00
parent 2bf64315f2
commit 5bbf5d012b
8 changed files with 96 additions and 59 deletions

View file

@ -1,7 +1,7 @@
{
imports = [
./hyprland
./theming.nix
./theme.nix
./rofi
./tray.nix
./waybar.nix

85
modules/home/de/theme.nix Normal file
View file

@ -0,0 +1,85 @@
{
config,
pkgs,
lib,
...
}: let
cfg = config.myConfig.de;
in {
options.myConfig.de = {
theme = lib.mkOption {
type = lib.types.string;
};
wallpaper = lib.mkOption {
type = lib.types.path;
};
};
config = lib.mkMerge [
(lib.mkIf (cfg.theme == "dark") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk = {
enable = true;
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme.name = "Adwaita-dark";
theme.package = pkgs.gnome.gnome-themes-extra;
iconTheme.name = "Papirus-Dark";
iconTheme.package = pkgs.papirus-icon-theme;
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
qt = {
enable = true;
platformTheme.name = "adwaita";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
home.pointerCursor = {
name = "Bibata-Original-Classic";
package = pkgs.bibata-cursors;
size = 24;
gtk.enable = true;
};
})
(lib.mkIf (cfg.theme == "light") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-light";
gtk = {
enable = true;
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme.name = "Adwaita";
theme.package = pkgs.gnome.gnome-themes-extra;
iconTheme.name = "Papirus";
iconTheme.package = pkgs.papirus-icon-theme;
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
qt = {
enable = true;
platformTheme.name = "adwaita";
style.name = "adwaita";
style.package = pkgs.adwaita-qt;
};
home.pointerCursor = {
name = "Bibata-Original-Ice";
package = pkgs.bibata-cursors;
size = 24;
gtk.enable = true;
};
})
];
}

View file

@ -1,48 +0,0 @@
{
config,
pkgs,
lib,
...
}: let
cfg = config.myConfig.de;
in {
options.myConfig.de = {
theming.enable = lib.mkEnableOption "";
wallpaper = lib.mkOption {
type = lib.types.path;
};
};
config = lib.mkIf cfg.theming.enable {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk = {
enable = true;
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme.name = "Adwaita-dark";
theme.package = pkgs.gnome.gnome-themes-extra;
iconTheme.name = "Papirus-Dark";
iconTheme.package = pkgs.papirus-icon-theme;
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
qt = {
enable = true;
platformTheme.name = "adwaita";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
home.pointerCursor = {
name = "Bibata-Original-Classic";
package = pkgs.bibata-cursors;
size = 24;
gtk.enable = true;
};
};
}

View file

@ -113,11 +113,6 @@
font-family: "Open Sans, Symbols Nerd Font Mono";
font-size: 15px;
}
window#waybar {
background-color: rgba(43, 48, 59, 0.5);
color: #ffffff;
}
'';
};

View file

@ -23,6 +23,11 @@ pkgs.vscode-extensions.yzhang.markdown-all-in-one
systemd.user.tmpfiles.rules = let
settings = builtins.replaceStrings [","] [",\\n"] (builtins.toJSON {
"workbench.colorTheme" = {
dark = "Default Dark Modern";
light = "Default Light Modern";
}."${config.myConfig.de.theme}";
"workbench.iconTheme" = "material-icon-theme";
"editor.fontFamily" = "JetBrainsMono Nerd Font";
"explorer.confirmDelete" = false;
"explorer.confirmDragAndDrop" = false;
@ -36,7 +41,6 @@ pkgs.vscode-extensions.yzhang.markdown-all-in-one
"git.suggestSmartCommit" = false;
"workbench.sideBar.location" = "right";
"editor.renderWhitespace" = "none";
"workbench.iconTheme" = "material-icon-theme";
"editor.minimap.enabled" = false;
});
in [

View file

@ -6,6 +6,8 @@
imports = [./default.nix];
home-manager.users.seb = {
myConfig.de.theme = "light";
wayland.windowManager.hyprland.settings.monitor = "eDP-1,1920x1080@60,0x0,1";
services.hypridle.listeners = [

View file

@ -13,6 +13,8 @@
pkgs.gimp
];
myConfig.de.theme = "dark";
wayland.windowManager.hyprland.settings.monitor = "DP-2,2560x1440@144,0x0,1";
programs.hyprlock.package = inputs.hyprlock.packages.${pkgs.system}.default.overrideAttrs {

View file

@ -9,10 +9,7 @@
myConfig = {
de = {
hyprland.enable = osConfig.myConfig.de.hyprland.enable;
wallpaper = ./wallpaper;
theming.enable = true;
tray.syncthing.enable = osConfig.myConfig.syncthing.enable;
};