From e5e23373dad7a53908746a654a419001b0601f40 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Thu, 11 Jul 2024 15:40:58 +0200 Subject: [PATCH] Make theming modular --- nix/base/base_packages.nix | 1 + nix/flake.lock | 231 ++++++++++- nix/flake.nix | 6 +- nix/modules/conf.nix | 32 ++ nix/programs/common.nix | 18 +- nix/programs/hyprland/config.nix | 5 +- nix/programs/individual_configs/kitty.nix | 78 ++-- nix/programs/individual_configs/yazi.nix | 460 +++++++++++----------- nix/programs/themes/default.nix | 5 +- nix/programs/themes/qt.nix | 10 +- nix/programs/themes/stylix.nix | 38 ++ 11 files changed, 596 insertions(+), 288 deletions(-) create mode 100644 nix/programs/themes/stylix.nix diff --git a/nix/base/base_packages.nix b/nix/base/base_packages.nix index 4484588..4175297 100644 --- a/nix/base/base_packages.nix +++ b/nix/base/base_packages.nix @@ -3,6 +3,7 @@ imports = [ # is wrapped in if statement to enable when needed ../programs/gaming/default.nix + ../programs/themes/stylix.nix ]; environment.systemPackages = with pkgs; [ diff --git a/nix/flake.lock b/nix/flake.lock index ccd91e0..7969627 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -20,6 +20,120 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "665b3c6748534eb766c777298721cece9453fdae", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "base16-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-foot", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1696727917, + "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "kdrag0n", + "repo": "base16-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "kdrag0n", + "repo": "base16-kitty", + "type": "github" + } + }, + "base16-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "base16-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-tmux", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -41,6 +155,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -356,6 +486,39 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -376,6 +539,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -834,6 +1018,22 @@ "type": "github" } }, + "nixpkgs_21": { + "locked": { + "lastModified": 1714912032, + "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1720031269, @@ -1115,7 +1315,8 @@ "oxishut": "oxishut", "reset": "reset", "reset-plugins": "reset-plugins", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "stylix": "stylix" } }, "rust-overlay": { @@ -1273,6 +1474,34 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-foot": "base16-foot", + "base16-helix": "base16-helix", + "base16-kitty": "base16-kitty", + "base16-tmux": "base16-tmux", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_21" + }, + "locked": { + "lastModified": 1719525570, + "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", + "owner": "danth", + "repo": "stylix", + "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1689347949, diff --git a/nix/flake.nix b/nix/flake.nix index ff67740..9a91ee0 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -28,6 +28,8 @@ url = "github:JakeStanger/ironbar"; }; + stylix.url = "github:danth/stylix"; + anyrun.url = "github:Kirottu/anyrun"; oxicalc.url = "github:DashieTM/OxiCalc"; oxishut.url = "github:DashieTM/OxiShut"; @@ -71,11 +73,11 @@ inherit inputs pkgs mod; }; modules = [ - mod - inputs.home-manager.nixosModules.home-manager + inputs.stylix.nixosModules.stylix ./base/default.nix ./programs + mod ] ++ inputs.nixpkgs.lib.optional (builtins.pathExists ./hardware/${name}/${name}.nix) ./hardware/${name}/${name}.nix ++ inputs.nixpkgs.lib.optional (builtins.pathExists mod) mod; }; diff --git a/nix/modules/conf.nix b/nix/modules/conf.nix index 227f805..a3da21e 100644 --- a/nix/modules/conf.nix +++ b/nix/modules/conf.nix @@ -147,6 +147,38 @@ ''; }; }; + + colorscheme = lib.mkOption { + default = { + base00 = "1A1B26"; + # base01 = "16161E"; + # base01 = "15161e"; + base01 = "191a25"; + base02 = "2F3549"; + base03 = "444B6A"; + base04 = "787C99"; + base05 = "A9B1D6"; + base06 = "CBCCD1"; + base07 = "D5D6DB"; + base08 = "C0CAF5"; + base09 = "A9B1D6"; + base0A = "0DB9D7"; + base0B = "9ECE6A"; + base0C = "B4F9F8"; + # base0D = "2AC3DE"; + # base0D = "A9B1D6"; + # base0D = "62A0EA"; + # base0D = "779EF1"; + base0D = "366fea"; + base0E = "BB9AF7"; + base0F = "F7768E"; + }; + example = { base00 = "FFFFFF"; }; + type = with lib.types; attrs; + description = '' + Base16 colorscheme. + ''; + }; }; config = { diff --git a/nix/programs/common.nix b/nix/programs/common.nix index 5061c43..5b4f35c 100644 --- a/nix/programs/common.nix +++ b/nix/programs/common.nix @@ -98,15 +98,15 @@ in [Context] filesystems=xdg-config/gtk-3.0;xdg-config/gtk-4.0 ''; - - dconf.settings = { - "org/gnome/desktop/interface" = { - gtk-theme = "adw-gtk3"; - cursor-theme = "Bibata-Modern-Classic"; - cursor-size = 24; - icon-theme = "MoreWaita"; - }; - }; + # + # dconf.settings = { + # "org/gnome/desktop/interface" = { + # gtk-theme = "adw-gtk3"; + # cursor-theme = "Bibata-Modern-Classic"; + # cursor-size = 24; + # icon-theme = "MoreWaita"; + # }; + # }; programs.nix-index = { diff --git a/nix/programs/hyprland/config.nix b/nix/programs/hyprland/config.nix index b9881fb..6dd74d5 100644 --- a/nix/programs/hyprland/config.nix +++ b/nix/programs/hyprland/config.nix @@ -1,4 +1,5 @@ { config +, lib , ... }: { @@ -121,8 +122,8 @@ general = { gaps_out = "3,5,5,5"; border_size = 3; - "col.active_border" = "0xFFFF0000 0xFF00FF00 0xFF0000FF 45deg"; - "col.inactive_border" = "0x66333333"; + "col.active_border" = lib.mkForce "0xFFFF0000 0xFF00FF00 0xFF0000FF 45deg"; + # "col.inactive_border" = "0x66333333"; allow_tearing = true; }; diff --git a/nix/programs/individual_configs/kitty.nix b/nix/programs/individual_configs/kitty.nix index 60ef324..838edfc 100644 --- a/nix/programs/individual_configs/kitty.nix +++ b/nix/programs/individual_configs/kitty.nix @@ -1,11 +1,11 @@ -{ +{ lib, ... }: { programs.kitty = { enable = true; settings = { enable_audio_bell = "no"; window_alert_on_bell = "no"; - background_opacity = "0.8"; + background_opacity = lib.mkForce "0.8"; cursor_blink_interval = "0"; window_padding_width = "1"; shell_integration = "yes"; @@ -16,44 +16,44 @@ italic_font = "JetBrainsMono Nerd Font Mono Extra Italic"; bold_italic_font = "JetBrainsMono Nerd Font Mono Extra Bold Italic"; - background = "#1a1b25"; - foreground = "#c5c8c6"; + background = lib.mkForce "#1a1b25"; + # foreground = "#c5c8c6"; + # + # selection_background = "#b2ceee"; + # selection_foreground = "#080808"; + # + # url_color = "#73daca"; + # cursor = "#c0caf5"; + # cursor_text_color = "#1a1b25"; + # + # active_tab_background = "#7aa2f7"; + # active_tab_foreground = "#16161e"; + # inactive_tab_background = "#292e42"; + # inactive_tab_foreground = "#545c7e"; + # + # active_border_color = "#7aa2f7"; + # inactive_border_color = "#292e42"; - selection_background = "#b2ceee"; - selection_foreground = "#080808"; - - url_color = "#73daca"; - cursor = "#c0caf5"; - cursor_text_color = "#1a1b25"; - - active_tab_background = "#7aa2f7"; - active_tab_foreground = "#16161e"; - inactive_tab_background = "#292e42"; - inactive_tab_foreground = "#545c7e"; - - active_border_color = "#7aa2f7"; - inactive_border_color = "#292e42"; - - color0 = "#15161e"; - color1 = "#c94448"; - color2 = "#9ece6a"; - color3 = "#e0af68"; - color4 = "#7aa2f7"; - color5 = "#bb9af7"; - color6 = "#7dcfff"; - color7 = "#a9b1d6"; - - color8 = "#414868"; - color9 = "#f2201f"; - color10 = "#9ece6a"; - color11 = "#e0af68"; - color12 = "#7aa2f7"; - color13 = "#bb9af7"; - color14 = "#7dcfff"; - color15 = "#c0caf5"; - - color16 = "#ff9e64"; - color17 = "#db4b4b"; + # color0 = "#15161e"; + # color1 = "#c94448"; + # color2 = "#9ece6a"; + # color3 = "#e0af68"; + # color4 = "#7aa2f7"; + # color5 = "#bb9af7"; + # color6 = "#7dcfff"; + # color7 = "#a9b1d6"; + # + # color8 = "#414868"; + # color9 = "#f2201f"; + # color10 = "#9ece6a"; + # color11 = "#e0af68"; + # color12 = "#7aa2f7"; + # color13 = "#bb9af7"; + # color14 = "#7dcfff"; + # color15 = "#c0caf5"; + # + # color16 = "#ff9e64"; + # color17 = "#db4b4b"; shell = "fish"; }; diff --git a/nix/programs/individual_configs/yazi.nix b/nix/programs/individual_configs/yazi.nix index 486c94a..b04a7a7 100644 --- a/nix/programs/individual_configs/yazi.nix +++ b/nix/programs/individual_configs/yazi.nix @@ -1250,236 +1250,236 @@ } ]; }; - theme = { - manager = { - cwd = { - fg = "#94e2d5"; - }; - - # Hovered - hovered = { - reversed = true; - }; - preview_hovered = { underline = true; }; - - # Find - find_keyword = { - fg = "#f9e2af"; - bold = true; - italic = true; - underline = true; - }; - find_position = { - fg = "#f5c2e7"; - bg = "reset"; - bold = true; - italic = true; - }; - - # Marker - marker_copied = { - fg = "#a6e3a1"; - bg = "#a6e3a1"; - }; - marker_cut = { - fg = "#f38ba8"; - bg = "#f38ba8"; - }; - marker_marked = { - fg = "#f9e2af"; - bg = "#f9e2af"; - }; - marker_selected = { - fg = "#779EF0"; - bg = "#89b4fa"; - }; - - # Tab - tab_active = { - fg = "#1e1e2e"; - bg = "#cdd6f4"; - }; - tab_inactive = { - fg = "#cdd6f4"; - bg = "#45475a"; - }; - tab_width = 1; - - # Count - count_copied = { - fg = "#1e1e2e"; - bg = "#a6e3a1"; - }; - count_cut = { - fg = "#1e1e2e"; - bg = "#f38ba8"; - }; - count_selected = { - fg = "#1e1e2e"; - bg = "#89b4fa"; - }; - - # Border - border_symbol = "│"; - border_style = { fg = "#7f849c"; }; - - }; - status = { - separator_open = ""; - separator_close = ""; - separator_style = { - fg = "#45475a"; - bg = "#45475a"; - }; - - # Mode - mode_normal = { - fg = "#1e1e2e"; - bg = "#89b4fa"; - bold = true; - }; - mode_select = { - fg = "#1e1e2e"; - bg = "#a6e3a1"; - bold = true; - }; - mode_unset = { - fg = "#1e1e2e"; - bg = "#f2cdcd"; - bold = true; - }; - - # Progress - progress_label = { - fg = "#ffffff"; - bold = true; - }; - progress_normal = { - fg = "#89b4fa"; - bg = "#45475a"; - }; - progress_error = { - fg = "#f38ba8"; - bg = "#45475a"; - }; - - # Permissions - permissions_t = { fg = "#89b4fa"; }; - permissions_r = { fg = "#f9e2af"; }; - permissions_w = { fg = "#f38ba8"; }; - permissions_x = { fg = "#a6e3a1"; }; - permissions_s = { fg = "#7f849c"; }; - }; - - input = { - border = { - fg = "#89b4fa"; - }; - title = { }; - value = { }; - selected = { reversed = true; }; - }; - select = { - border = { - fg = "#89b4fa"; - }; - active = { fg = "#f5c2e7"; }; - inactive = { }; - }; - tasks = { - border = { - fg = "#89b4fa"; - }; - title = { }; - hovered = { - underline = true; - }; - }; - which = { - mask = { - bg = "#313244"; - }; - cand = { fg = "#94e2d5"; }; - rest = { fg = "#9399b2"; }; - desc = { fg = "#f5c2e7"; }; - separator = "  "; - separator_style = { fg = "#585b70"; }; - }; - help = { - on = { - fg = "#f5c2e7"; - }; - exec = { fg = "#94e2d5"; }; - desc = { fg = "#9399b2"; }; - hovered = { - bg = "#585b70"; - bold = true; - }; - footer = { - fg = "#45475a"; - bg = "#cdd6f4"; - }; - }; - filetype = { - rules = [ - # Images - { - mime = "image/*"; - fg = "#94e2d5"; - } - - # Videos - { - mime = "video/*"; - fg = "#f9e2af"; - } - { - mime = "audio/*"; - fg = "#f9e2af"; - } - - # Archives - { - mime = "application/zip"; - fg = "#f5c2e7"; - } - { - mime = "application/gzip"; - fg = "#f5c2e7"; - } - { - mime = "application/x-tar"; - fg = "#f5c2e7"; - } - { - mime = "application/x-bzip"; - fg = "#f5c2e7"; - } - { - mime = "application/x-bzip2"; - fg = "#f5c2e7"; - } - { - mime = "application/x-7z-compressed"; - fg = "#f5c2e7"; - } - { - mime = "application/x-rar"; - fg = "#f5c2e7"; - } - - # Fallback - { - name = "*"; - fg = "#cdd6f4"; - } - { - name = "*/"; - fg = "#89b4fa"; - } - ]; - }; - }; + # theme = { + # manager = { + # cwd = { + # fg = "#94e2d5"; + # }; + # + # # Hovered + # hovered = { + # reversed = true; + # }; + # preview_hovered = { underline = true; }; + # + # # Find + # find_keyword = { + # fg = "#f9e2af"; + # bold = true; + # italic = true; + # underline = true; + # }; + # find_position = { + # fg = "#f5c2e7"; + # bg = "reset"; + # bold = true; + # italic = true; + # }; + # + # # Marker + # marker_copied = { + # fg = "#a6e3a1"; + # bg = "#a6e3a1"; + # }; + # marker_cut = { + # fg = "#f38ba8"; + # bg = "#f38ba8"; + # }; + # marker_marked = { + # fg = "#f9e2af"; + # bg = "#f9e2af"; + # }; + # marker_selected = { + # fg = "#779EF0"; + # bg = "#89b4fa"; + # }; + # + # # Tab + # tab_active = { + # fg = "#1e1e2e"; + # bg = "#cdd6f4"; + # }; + # tab_inactive = { + # fg = "#cdd6f4"; + # bg = "#45475a"; + # }; + # tab_width = 1; + # + # # Count + # count_copied = { + # fg = "#1e1e2e"; + # bg = "#a6e3a1"; + # }; + # count_cut = { + # fg = "#1e1e2e"; + # bg = "#f38ba8"; + # }; + # count_selected = { + # fg = "#1e1e2e"; + # bg = "#89b4fa"; + # }; + # + # # Border + # border_symbol = "│"; + # border_style = { fg = "#7f849c"; }; + # + # }; + # status = { + # separator_open = ""; + # separator_close = ""; + # separator_style = { + # fg = "#45475a"; + # bg = "#45475a"; + # }; + # + # # Mode + # mode_normal = { + # fg = "#1e1e2e"; + # bg = "#89b4fa"; + # bold = true; + # }; + # mode_select = { + # fg = "#1e1e2e"; + # bg = "#a6e3a1"; + # bold = true; + # }; + # mode_unset = { + # fg = "#1e1e2e"; + # bg = "#f2cdcd"; + # bold = true; + # }; + # + # # Progress + # progress_label = { + # fg = "#ffffff"; + # bold = true; + # }; + # progress_normal = { + # fg = "#89b4fa"; + # bg = "#45475a"; + # }; + # progress_error = { + # fg = "#f38ba8"; + # bg = "#45475a"; + # }; + # + # # Permissions + # permissions_t = { fg = "#89b4fa"; }; + # permissions_r = { fg = "#f9e2af"; }; + # permissions_w = { fg = "#f38ba8"; }; + # permissions_x = { fg = "#a6e3a1"; }; + # permissions_s = { fg = "#7f849c"; }; + # }; + # + # input = { + # border = { + # fg = "#89b4fa"; + # }; + # title = { }; + # value = { }; + # selected = { reversed = true; }; + # }; + # select = { + # border = { + # fg = "#89b4fa"; + # }; + # active = { fg = "#f5c2e7"; }; + # inactive = { }; + # }; + # tasks = { + # border = { + # fg = "#89b4fa"; + # }; + # title = { }; + # hovered = { + # underline = true; + # }; + # }; + # which = { + # mask = { + # bg = "#313244"; + # }; + # cand = { fg = "#94e2d5"; }; + # rest = { fg = "#9399b2"; }; + # desc = { fg = "#f5c2e7"; }; + # separator = "  "; + # separator_style = { fg = "#585b70"; }; + # }; + # help = { + # on = { + # fg = "#f5c2e7"; + # }; + # exec = { fg = "#94e2d5"; }; + # desc = { fg = "#9399b2"; }; + # hovered = { + # bg = "#585b70"; + # bold = true; + # }; + # footer = { + # fg = "#45475a"; + # bg = "#cdd6f4"; + # }; + # }; + # filetype = { + # rules = [ + # # Images + # { + # mime = "image/*"; + # fg = "#94e2d5"; + # } + # + # # Videos + # { + # mime = "video/*"; + # fg = "#f9e2af"; + # } + # { + # mime = "audio/*"; + # fg = "#f9e2af"; + # } + # + # # Archives + # { + # mime = "application/zip"; + # fg = "#f5c2e7"; + # } + # { + # mime = "application/gzip"; + # fg = "#f5c2e7"; + # } + # { + # mime = "application/x-tar"; + # fg = "#f5c2e7"; + # } + # { + # mime = "application/x-bzip"; + # fg = "#f5c2e7"; + # } + # { + # mime = "application/x-bzip2"; + # fg = "#f5c2e7"; + # } + # { + # mime = "application/x-7z-compressed"; + # fg = "#f5c2e7"; + # } + # { + # mime = "application/x-rar"; + # fg = "#f5c2e7"; + # } + # + # # Fallback + # { + # name = "*"; + # fg = "#cdd6f4"; + # } + # { + # name = "*/"; + # fg = "#89b4fa"; + # } + # ]; + # }; + # }; }; } diff --git a/nix/programs/themes/default.nix b/nix/programs/themes/default.nix index 9236af2..331246a 100644 --- a/nix/programs/themes/default.nix +++ b/nix/programs/themes/default.nix @@ -1,8 +1,9 @@ { imports = [ ./qt.nix - ./gtk3.nix - ./gtk4.nix + ./stylix.nix + # ./gtk3.nix + # ./gtk4.nix ]; } diff --git a/nix/programs/themes/qt.nix b/nix/programs/themes/qt.nix index 5a36969..2c394fe 100644 --- a/nix/programs/themes/qt.nix +++ b/nix/programs/themes/qt.nix @@ -1,11 +1,15 @@ { config, ... }: let username = config.conf.username; + scheme = config.conf.colorscheme; + # active_colors=#ffc0caf5, #${scheme.base00}, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ffc0caf5, #ffc0caf5, #ffc0caf5, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ffc0caf5, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ffc0caf5, #ffc0caf5 + # disabled_colors=#ff6d728d, #${scheme.base00}, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ff6d728d, #ff6d728d, #ff6d728d, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ff6d728d, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ff6d728d, #ff6d728d + # inactive_colors=#ff6d728d, #${scheme.base00}, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ff6d728d, #ff6d728d, #ff6d728d, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ff6d728d, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ff6d728d, #ff6d728d color = '' [ColorScheme] - active_colors=#ffc0caf5, #ff1a1b26, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ffc0caf5, #ffc0caf5, #ffc0caf5, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ffc0caf5, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ffc0caf5, #ffc0caf5 - disabled_colors=#ff6d728d, #ff1a1b26, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ff6d728d, #ff6d728d, #ff6d728d, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ff6d728d, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ff6d728d, #ff6d728d - inactive_colors=#ff6d728d, #ff1a1b26, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ff6d728d, #ff6d728d, #ff6d728d, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ff6d728d, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ff6d728d, #ff6d728d + active_colors=#ff${scheme.base05}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base00}, #ff${scheme.base05}, #ff${scheme.base04}, #ff${scheme.base05}, #ff${scheme.base00}, #ff${scheme.base00}, #00${scheme.base01}, #ff${scheme.base02}, #ff${scheme.base04}, #ff${scheme.base08}, #ff${scheme.base04}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base01}, #ff${scheme.base05}, #ff${scheme.base04} + disabled_colors=#ff${scheme.base05}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base00}, #ff${scheme.base05}, #ff${scheme.base04}, #ff${scheme.base05}, #ff${scheme.base00}, #ff${scheme.base00}, #00${scheme.base01}, #ff${scheme.base02}, #ff${scheme.base04}, #ff${scheme.base08}, #ff${scheme.base04}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base01}, #ff${scheme.base05}, #ff${scheme.base04} + inactive_colors=#ff${scheme.base05}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base00}, #ff${scheme.base05}, #ff${scheme.base04}, #ff${scheme.base05}, #ff${scheme.base00}, #ff${scheme.base00}, #00${scheme.base01}, #ff${scheme.base02}, #ff${scheme.base04}, #ff${scheme.base08}, #ff${scheme.base04}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base01}, #ff${scheme.base05}, #ff${scheme.base04} ''; qss = '' QTabBar::tab:selected { diff --git a/nix/programs/themes/stylix.nix b/nix/programs/themes/stylix.nix new file mode 100644 index 0000000..3e2860d --- /dev/null +++ b/nix/programs/themes/stylix.nix @@ -0,0 +1,38 @@ +{ pkgs, config, ... }: { + stylix = { + enable = true; + image = /home/${config.conf.username}/Pictures/backgrounds/shinobu_2k.jpg; + polarity = "dark"; + + fonts = { + serif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Serif"; + }; + + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + + monospace = { + package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }); + # name = "JetBrains Mono Nerd"; + name = "JetBrainsMono Nerd Font Mono"; + }; + + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; + + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 24; + }; + + base16Scheme = config.conf.colorscheme; + }; +}