From 5bbf5d012b306ae04bfdafc00c1e2487743dc84c Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 29 Apr 2024 16:04:55 +0200 Subject: [PATCH] Add light theme --- modules/home/de/default.nix | 2 +- modules/home/de/theme.nix | 85 +++++++++++++++++++++++++++++++++++++ modules/home/de/theming.nix | 48 --------------------- modules/home/de/waybar.nix | 5 --- modules/home/vscode.nix | 8 +++- users/seb/@inspiron.nix | 2 + users/seb/@north.nix | 2 + users/seb/home.nix | 3 -- 8 files changed, 96 insertions(+), 59 deletions(-) create mode 100644 modules/home/de/theme.nix delete mode 100644 modules/home/de/theming.nix diff --git a/modules/home/de/default.nix b/modules/home/de/default.nix index 6cb713e..30e5eee 100644 --- a/modules/home/de/default.nix +++ b/modules/home/de/default.nix @@ -1,7 +1,7 @@ { imports = [ ./hyprland - ./theming.nix + ./theme.nix ./rofi ./tray.nix ./waybar.nix diff --git a/modules/home/de/theme.nix b/modules/home/de/theme.nix new file mode 100644 index 0000000..fd75bc2 --- /dev/null +++ b/modules/home/de/theme.nix @@ -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; + }; + }) + ]; +} diff --git a/modules/home/de/theming.nix b/modules/home/de/theming.nix deleted file mode 100644 index 64a331c..0000000 --- a/modules/home/de/theming.nix +++ /dev/null @@ -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; - }; - }; -} diff --git a/modules/home/de/waybar.nix b/modules/home/de/waybar.nix index f43a96e..75e29d1 100644 --- a/modules/home/de/waybar.nix +++ b/modules/home/de/waybar.nix @@ -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; - } ''; }; diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix index 6a90f1d..506bb23 100644 --- a/modules/home/vscode.nix +++ b/modules/home/vscode.nix @@ -17,12 +17,17 @@ extensions = [ pkgs.vscode-extensions.jnoortheen.nix-ide pkgs.vscode-extensions.pkief.material-icon-theme -pkgs.vscode-extensions.yzhang.markdown-all-in-one + 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 [ diff --git a/users/seb/@inspiron.nix b/users/seb/@inspiron.nix index 367885c..fbcdcfc 100644 --- a/users/seb/@inspiron.nix +++ b/users/seb/@inspiron.nix @@ -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 = [ diff --git a/users/seb/@north.nix b/users/seb/@north.nix index 046271a..dd4b288 100644 --- a/users/seb/@north.nix +++ b/users/seb/@north.nix @@ -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 { diff --git a/users/seb/home.nix b/users/seb/home.nix index 2c3d9f2..6235858 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -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; };