From 06a4bde31e95b1bf4175060f7bd47e3b5a3e8920 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sun, 26 Nov 2023 22:00:03 +0300 Subject: [PATCH] Use themenix --- flake.lock | 16 ++++++++ flake.nix | 8 +++- machines/enka/dunst/default.nix | 16 ++++---- machines/enka/fuzzel/default.nix | 16 ++++---- machines/enka/hyprland/default.nix | 12 +++--- machines/enka/kitty/default.nix | 61 +++++++++++++++--------------- machines/enka/waybar/default.nix | 35 ++++++++++++++--- 7 files changed, 100 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index d7bd47c..31c3fb9 100644 --- a/flake.lock +++ b/flake.lock @@ -126,6 +126,7 @@ "homeManager": "homeManager", "hyprland": "hyprland", "nixpkgs": "nixpkgs_2", + "themes": "themes", "tools": "tools" } }, @@ -161,6 +162,21 @@ "type": "github" } }, + "themes": { + "locked": { + "lastModified": 1701027224, + "narHash": "sha256-w47uhqWQhYTMi6yHtKloY/BLfnmQBdLYUOPmcPswnos=", + "owner": "RGBCube", + "repo": "ThemeNix", + "rev": "8dad0349c43f1b1d95a6d70145d1bc351fe80f99", + "type": "github" + }, + "original": { + "owner": "RGBCube", + "repo": "ThemeNix", + "type": "github" + } + }, "tools": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 2e06326..b4bd1ff 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + themes = { + url = "github:RGBCube/ThemeNix"; + }; + fenix = { url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -38,9 +42,9 @@ }; }; - outputs = { nixpkgs, homeManager, tools, fenix, ... } @ inputs: tools.eachDefaultLinuxArch (system: let + outputs = { nixpkgs, homeManager, tools, themes, fenix, ... } @ inputs: tools.eachDefaultLinuxArch (system: let upkgs = { - theme = import ./themes/gruvbox.nix; + theme = themes.gruvbox-dark-hard; hyprland = inputs.hyprland.packages.${system}.default; }; diff --git a/machines/enka/dunst/default.nix b/machines/enka/dunst/default.nix index efffbb1..7b4a4ca 100644 --- a/machines/enka/dunst/default.nix +++ b/machines/enka/dunst/default.nix @@ -1,9 +1,7 @@ { pkgs, upkgs, homeConfiguration, enabled, ... }: homeConfiguration "nixos" { - services.dunst = let - inherit (upkgs) theme; - in enabled { + services.dunst = with upkgs.theme.withHashtag; enabled { iconTheme = { name = "Gruvbox-Dark"; package = pkgs.gruvbox-dark-icons-gtk; @@ -15,12 +13,12 @@ homeConfiguration "nixos" { horizontal_padding = 10; padding = 10; - frame_color = "#" + theme.activeHighlight; + frame_color = base0A; frame_width = 2; seperator_color = "frame"; - background = "#" + theme.background; - foreground = "#" + theme.foreground; + background = background; + foreground = lightForeground; alignment = "center"; font = "OpenSans 12"; @@ -32,17 +30,17 @@ homeConfiguration "nixos" { }; settings.urgency_low = { - frame_color = "#" + theme.low; + frame_color = base0D; timeout = 5; }; settings.urgency_normal = { - frame_color = "#" + theme.medium; + frame_color = base0E; timeout = 10; }; settings.urgency_critical = { - frame_color = "#" + theme.high; + frame_color = base08; timeout = 15; }; }; diff --git a/machines/enka/fuzzel/default.nix b/machines/enka/fuzzel/default.nix index f35b391..60c9585 100644 --- a/machines/enka/fuzzel/default.nix +++ b/machines/enka/fuzzel/default.nix @@ -16,15 +16,13 @@ homeConfiguration "nixos" { inner-pad = 10; }; - settings.colors = let - inherit (upkgs) theme; - in { - background = theme.background + theme.transparency; - text = theme.foreground + theme.transparency; - match = theme.activeHighlight + theme.transparency; - selection = theme.foreground + theme.transparency; - selection-text = theme.background + theme.transparency; - border = theme.activeHighlight + theme.transparency; + settings.colors = with upkgs.theme; { + background = background + "FF"; + text = lightForeground + "FF"; + match = base0A + "FF"; + selection = lightForeground + "FF"; + selection-text = background + "FF"; + border = base0A + "FF"; }; settings.border = { diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix index 4b2a04d..49b46af 100644 --- a/machines/enka/hyprland/default.nix +++ b/machines/enka/hyprland/default.nix @@ -8,9 +8,7 @@ wayland.windowManager.hyprland = enabled { package = upkgs.hyprland; - extraConfig = let - inherit (upkgs) theme; - in + extraConfig = with upkgs.theme; '' monitor = , preferred, auto, 1 '' @@ -123,11 +121,11 @@ gaps_out = 10 border_size = 2 - col.active_border = 0x${theme.transparency}${theme.activeHighlight} - col.nogroup_border_active = 0x${theme.transparency}${theme.activeHighlight} + col.active_border = 0xFF${base0A} + col.nogroup_border_active = 0xFF${base0A} - col.inactive_border = 0x${theme.transparency}${theme.inactiveHighlight} - col.nogroup_border = 0x${theme.transparency}${theme.inactiveHighlight} + col.inactive_border = 0xFF${base01} + col.nogroup_border = 0xFF${base01} cursor_inactive_timeout = 10 no_cursor_warps = true diff --git a/machines/enka/kitty/default.nix b/machines/enka/kitty/default.nix index 29d1404..1a350e1 100644 --- a/machines/enka/kitty/default.nix +++ b/machines/enka/kitty/default.nix @@ -12,9 +12,7 @@ homeConfiguration "nixos" { theme = "Gruvbox Dark"; - settings = let - inherit (upkgs) theme; - in { + settings = with upkgs.theme.withHashtag; { allow_remote_control = true; confirm_os_window_close = 0; focus_follows_mouse = true; @@ -24,50 +22,51 @@ homeConfiguration "nixos" { scrollback_lines = 100000; scrollback_pager = "bat --chop-long-lines"; - cursor = "#" + theme.foreground; - cursor_theme_color = "#" + theme.background; + cursor = lightForeground; + cursor_theme_color = background; cursor_shape = "beam"; - url_color = "#" + theme.low; + url_color = base0D; strip_trailing_spaces = "always"; enable_audio_bell = false; - active_border_color = "#" + theme.activeHighlight; - inactive_border_color = "#" + theme.inactiveHighlight; + active_border_color = base0A; + inactive_border_color = base01; window_border_width = "0pt"; - background = "#" + theme.background; - foreground = "#" + theme.foreground; + background = background; + foreground = lightForeground; - selection_background = "#" + theme.foreground; - selection_foreground = "#" + theme.background; + selection_background = lightForeground; + selection_foreground = background; tab_bar_edge = "top"; tab_bar_style = "powerline"; - active_tab_background = "#" + theme.background; - active_tab_foreground = "#" + theme.foreground; + active_tab_background = background; + active_tab_foreground = lightForeground; - inactive_tab_background = "#" + theme.backgroundLight; - inactive_tab_foreground = "#" + theme.foreground; + inactive_tab_background = lightBackground; + inactive_tab_foreground = lightForeground; - color0 = "#665C54"; - color2 = "#98971A"; - color3 = "#D79921"; - color4 = "#458588"; - color5 = "#B16286"; - color6 = "#689D6A"; - color7 = "#A89984"; - color8 = "#7C6F64"; - color9 = "#FB4934"; - color10 = "#B8BB26"; - color11 = "#FABD2F"; - color12 = "#83A598"; - color13 = "#D3869B"; - color14 = "#8EC07C"; - color15 = "#BDAE93"; + color0 = base00; + color1 = base01; + color2 = base02; + color3 = base03; + color4 = base04; + color5 = base05; + color6 = base06; + color7 = base07; + color8 = base08; + color9 = base09; + color10 = base0A; + color11 = base0B; + color12 = base0C; + color13 = base0D; + color14 = base0E; + color15 = base0F; }; }; } diff --git a/machines/enka/waybar/default.nix b/machines/enka/waybar/default.nix index f95ed8d..d8d26f4 100644 --- a/machines/enka/waybar/default.nix +++ b/machines/enka/waybar/default.nix @@ -114,18 +114,41 @@ homeConfiguration "nixos" { }; }]; - style = let - inherit (upkgs) theme; - in '' + style = with upkgs.theme.withHashtag; '' * { border: none; border-radius: 0; font-family: "OpenSans"; } - window#waybar { - background: #${theme.background}; - color: #${theme.foreground}; + #waybar { + background: ${background}; + color: ${lightForeground}; + } + + #waybar:hover { + border: 3px; + border-color: ${base0A}; + } + + #workspace-1 { + color: ${base08}; + } + + #workspace-2 { + color: ${base09}; + } + + #workspace-3 { + color: ${base0A}; + } + + #workspace-4 { + color: ${base0B}; + } + + #workspace-5 { + color: ${base0C}; } ''; };