From e2794671d7ba9bcc73d88261e02342a8bb9c33e4 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sun, 12 Nov 2023 14:13:03 +0000 Subject: [PATCH] Re-enable a few missing stylix targets Move from using base16 theme definition to my own custom version Update nyxt config and move all into config.lisp --- flake.nix | 27 +++++++++++++++++++++++++-- home/default.nix | 31 +++++++++++++++++++++++++++++-- home/hyprland/mako.nix | 1 - home/hyprland/rofi.nix | 1 - home/hyprland/waybar/style.css | 20 -------------------- home/nyxt/config.lisp | 11 ++++++++++- home/nyxt/default.nix | 17 +---------------- 7 files changed, 65 insertions(+), 43 deletions(-) diff --git a/flake.nix b/flake.nix index 36b9bfff..a411aa68 100644 --- a/flake.nix +++ b/flake.nix @@ -121,9 +121,32 @@ networking = { inherit hostName; }; stylix = { autoEnable = false; + target = { + console.enable = true; + lightdm.enable = true; + }; image = ./wallpapers/tokyo-space.png; - base16Scheme = - "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml"; + base16Scheme = { + slug = "tokyonight"; + scheme = "My implementation of Enkia's TokyoNight theme"; + author = "xenia"; + base00 = "15161e"; + base01 = "f7768e"; + base02 = "9ece6a"; + base03 = "e0af68"; + base04 = "7aa2f7"; + base05 = "bb9af7"; + base06 = "7dcfff"; + base07 = "a9b1d6"; + base08 = "414868"; + base09 = "f7768e"; + base0A = "9ece6a"; + base0B = "e0af68"; + base0C = "7aa2f7"; + base0D = "bb9af7"; + base0E = "7dcfff"; + base0F = "c0caf5"; + }; polarity = "dark"; opacity = { popups = 0.8; diff --git a/home/default.nix b/home/default.nix index c3785e12..1f3b3b5a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,8 +1,35 @@ { config, lib, pkgs, ... }: { - xdg.configFile."bat/themes/tokyonight_night.tmTheme".source = - ./tokyonight_night.tmTheme; + stylix.targets = { + avizo.enable = true; + fzf.enable = true; + mako.enable = true; + rofi.enable = true; + tmux.enable = true; + xresources.enable = true; + }; + xdg.configFile = { + "style.css".text = with config.lib.stylix.colors.withHashtag; '' + @define-color base00 ${base00}; + @define-color base01 ${base01}; + @define-color base02 ${base02}; + @define-color base03 ${base03}; + @define-color base04 ${base04}; + @define-color base05 ${base05}; + @define-color base06 ${base06}; + @define-color base07 ${base07}; + @define-color base08 ${base08}; + @define-color base09 ${base09}; + @define-color base0A ${base0A}; + @define-color base0B ${base0B}; + @define-color base0C ${base0C}; + @define-color base0D ${base0D}; + @define-color base0E ${base0E}; + @define-color base0F ${base0F}; + ''; + "bat/themes/tokyonight_night.tmTheme".source = ./tokyonight_night.tmTheme; + }; programs = { bash.enable = true; readline = { diff --git a/home/hyprland/mako.nix b/home/hyprland/mako.nix index 7d42cdf1..2b25fa75 100644 --- a/home/hyprland/mako.nix +++ b/home/hyprland/mako.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: { - stylix.targets.mako.enable = true; services.mako = { enable = true; actions = true; diff --git a/home/hyprland/rofi.nix b/home/hyprland/rofi.nix index bcae27e3..76db909c 100644 --- a/home/hyprland/rofi.nix +++ b/home/hyprland/rofi.nix @@ -4,7 +4,6 @@ let power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"; in { - stylix.targets.rofi.enable = true; programs.rofi = { enable = true; package = pkgs.rofi-wayland; diff --git a/home/hyprland/waybar/style.css b/home/hyprland/waybar/style.css index 204e3fb1..3cf704c3 100644 --- a/home/hyprland/waybar/style.css +++ b/home/hyprland/waybar/style.css @@ -1,23 +1,3 @@ -/* *background: #1a1b26 */ -/* *foreground: #c0caf5 */ - -@define-color base00 #15161e; -@define-color base01 #f7768e; -@define-color base02 #9ece6a; -@define-color base03 #e0af68; -@define-color base04 #7aa2f7; -@define-color base05 #bb9af7; -@define-color base06 #7dcfff; -@define-color base07 #a9b1d6; -@define-color base08 #414868; -@define-color base09 #f7768e; -@define-color base0A #9ece6a; -@define-color base0B #e0af68; -@define-color base0C #7aa2f7; -@define-color base0D #bb9af7; -@define-color base0E #7dcfff; -@define-color base0F #c0caf5; - * { font-family: "FiraMono Nerd Font"; font-size: 16px; diff --git a/home/nyxt/config.lisp b/home/nyxt/config.lisp index 300543ba..7f27659f 100644 --- a/home/nyxt/config.lisp +++ b/home/nyxt/config.lisp @@ -23,4 +23,13 @@ :shortcut "ddg" :search-url "https://duckduckgo.com/?q=~a" :fallback-url (quri.uri:uri "https://duckduckgo.com/")))))) -(load "~/.config/nyxt/theme.lisp") +(define-configuration browser + ((theme (make-instance + 'theme:theme + :font-family "Fira Sans" + :background-color "#1a1b26" + :background-alt-color "#414868" + :accent-color "#bb9af7" + :primary-color "#bb9af7" + :secondary-color "#a9b1d6" + :warning-color "#f7768e")))) diff --git a/home/nyxt/default.nix b/home/nyxt/default.nix index 9f9ef88a..ba09d1bc 100644 --- a/home/nyxt/default.nix +++ b/home/nyxt/default.nix @@ -2,20 +2,5 @@ { home.packages = with pkgs; [ nyxt ]; - xdg.configFile = { - "nyxt/config.lisp".source = ./config.lisp; - "nyxt/theme.lisp".text = with config.lib.stylix.colors.withHashtag; '' - (define-configuration browser - ((theme (make-instance - 'theme:theme - :font-family "${config.stylix.fonts.sansSerif.name}" - :background-color "${base00}" - :background-alt-color "${base01}" - :accent-color "${base0A}" - :primary-color "${base05}" - :secondary-color "${base04}" - :warning-color "${base0A}")))) - - ''; - }; + xdg.configFile."nyxt/config.lisp".source = ./config.lisp; }