AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix theme and cursor

Browse Source
This commit is contained in:
Dmitriy Kholkin 2021-02-17 01:06:42 +03:00
parent f3bed52949
commit c323244d9e
4 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/applications/vscode.nix
View File

@ -8,6 +8,24 @@ in
# thmFile { name = "vscode"; };
# Support Wal color theme
# home-manager.users.alukard.home.file.".cache/wal/colors".text = ''
# #${thm.base00-hex}
# #${thm.base08-hex}
# #${thm.base0B-hex}
# #${thm.base0A-hex}
# #${thm.base0D-hex}
# #${thm.base0E-hex}
# #${thm.base0C-hex}
# #${thm.base05-hex}
# #${thm.base03-hex}
# #${thm.base09-hex}
# #${thm.base01-hex}
# #${thm.base02-hex}
# #${thm.base04-hex}
# #${thm.base06-hex}
# #${thm.base0F-hex}
# #${thm.base07-hex}
# '';
home-manager.users.alukard.home.file.".cache/wal/colors".text = ''
#${thm.base00-hex}
#${thm.base08-hex}
@ -18,12 +36,12 @@ in
#${thm.base0C-hex}
#${thm.base05-hex}
#${thm.base03-hex}
#${thm.base09-hex}
#${thm.base01-hex}
#${thm.base02-hex}
#${thm.base04-hex}
#${thm.base06-hex}
#${thm.base0F-hex}
#${thm.base08-hex}
#${thm.base0B-hex}
#${thm.base0A-hex}
#${thm.base0D-hex}
#${thm.base0E-hex}
#${thm.base0C-hex}
#${thm.base07-hex}
'';
}

55
modules/themes.nix
View File

@ -1,43 +1,15 @@
{ config, lib, pkgs, inputs, ... }:
with lib;
# let
# fromBase16 = base16scheme:
# builtins.mapAttrs (_: v: "#" + v) {
# bg = base00-hex;
# # fg = base07-hex;
# fg = base05-hex;
# };
# in
{
# options = {
# themes = {
# colors = mkOption {
# description =
# "Set of colors from which the themes for various applications will be generated";
# type = with types;
# submodule {
{ config, lib, pkgs, inputs, ... }: {
# options = let
# colors = (builtins.genList (x: (toString x) ) 15);
# in {
# bg = types.str;
# fg = types.str;
# } // builtins.listToAttrs (builtins.map (x: {
# name = "base${x}";
# value = types.str;
# }) colors);
# };
# };
# };
# };
config.themes.base16 = {
config.themes.base16 = with config.deviceSpecific.devInfo; {
enable = true;
customScheme = {
enable = true;
path = "${inputs.base16-horizon-scheme}/horizon-dark.yaml";
};
# scheme = "gruvbox";
# variant = "gruvbox-dark-medium";
# customScheme = {
# enable = true;
# path = "${inputs.base16-horizon-scheme}/horizon-dark.yaml";
# };
# scheme = "darkmoss";
# variant = "darkmoss";
scheme = "nord";
variant = "nord";
extraParams = {
font = "IBM Plex Sans";
fontMono = "IBM Plex Mono";
@ -50,6 +22,7 @@ with lib;
iconFont = "Font Awesome 5 Free";
fallbackIcon = "Material Icons";
iconTheme = "Papirus-Dark";
normalFontSize = "12";
headerFontSize = "14";
@ -57,8 +30,8 @@ with lib;
microFontSize = "10";
minimalFontSize = "8";
iconTheme = "Papirus-Dark";
# iconPkg = pkgs.papirus-icon-theme;
cursorPackage = pkgs.bibata-cursors;
cursorSize = if bigScreen then 32 else 16;
};
};
}
}

11
modules/workspace/cursor.nix
View File

@ -1,16 +1,21 @@
{ pkgs, lib, ... }: {
{ pkgs, lib, config, ... }:
let
thm = config.lib.base16.theme;
in {
environment.sessionVariables = {
XCURSOR_PATH = lib.mkForce "/home/alukard/.icons";
XCURSOR_SIZE = lib.mkForce (toString thm.cursorSize);
};
home-manager.users.alukard = {
xsession.pointerCursor = {
package = pkgs.bibata-cursors;
package = thm.cursorPackage;
name = "Bibata-Modern-Classic";
size = thm.cursorSize;
};
home.file.".icons/default" = {
source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic";
source = "${thm.cursorPackage}/share/icons/Bibata-Modern-Classic";
};
};
}

48
modules/workspace/gtk.nix
View File

@ -3,22 +3,46 @@ let
thm = config.lib.base16.theme;
materia_colors = pkgs.writeTextFile {
name = "gtk-generated-colors";
# https://github.com/themix-project/themix-plugin-base16/blob/453cccbd2e22f69078c6ded894421c4c0f943bc0/oomox_plugin.py#L424
# text = ''
# BG=${thm.base00-hex}
# FG=${thm.base07-hex}
# BTN_BG=${thm.base00-hex}
# BTN_FG=${thm.base07-hex}
# MENU_BG=${thm.base00-hex}
# MENU_FG=${thm.base07-hex}
# ACCENT_BG=${thm.base02-hex}
# SEL_BG=${thm.base0D-hex}
# SEL_FG=${thm.base00-hex}
# TXT_BG=${thm.base00-hex}
# TXT_FG=${thm.base07-hex}
# HDR_BTN_BG=${thm.base00-hex}
# HDR_BTN_FG=${thm.base07-hex}
# WM_BORDER_FOCUS=${thm.base02-hex}
# WM_BORDER_UNFOCUS=${thm.base01-hex}
# MATERIA_STYLE_COMPACT=True
# MATERIA_COLOR_VARIANT=dark
# UNITY_DEFAULT_LAUNCHER_STYLE=False
# NAME=generated
# '';
text = ''
BG=${thm.base00-hex}
FG=${thm.base05-hex}
BG=${thm.base01-hex}
FG=${thm.base06-hex}
HDR_BG=${thm.base00-hex}
HDR_FG=${thm.base05-hex}
SEL_BG=${thm.base0E-hex}
SEL_FG=${thm.base00-hex}
ACCENT_BG=${thm.base0E-hex}
TXT_BG=${thm.base02-hex}
TXT_FG=${thm.base07-hex}
BTN_BG=${thm.base00-hex}
BTN_FG=${thm.base05-hex}
MENU_BG=${thm.base00-hex}
MENU_FG=${thm.base05-hex}
ACCENT_BG=${thm.base02-hex}
SEL_BG=${thm.base0D-hex}
SEL_FG=${thm.base00-hex}
TXT_BG=${thm.base00-hex}
TXT_FG=${thm.base05-hex}
HDR_BTN_BG=${thm.base00-hex}
HDR_BTN_BG=${thm.base01-hex}
HDR_BTN_FG=${thm.base05-hex}
WM_BORDER_FOCUS=${thm.base02-hex}
WM_BORDER_UNFOCUS=${thm.base01-hex}
ICONS_LIGHT_FOLDER=${thm.base0D-hex}
ICONS_LIGHT=${thm.base0D-hex}
ICONS_MEDIUM=${thm.base0E-hex}
ICONS_DARK=${thm.base00-hex}
MATERIA_STYLE_COMPACT=True
MATERIA_COLOR_VARIANT=dark
UNITY_DEFAULT_LAUNCHER_STYLE=False