[m] Migrated deprecated options & lock update

This commit is contained in:
soraefir 2024-02-06 09:23:37 +01:00
parent 7434010069
commit 4f7a2fca23
Signed by: sora
GPG Key ID: A362EA0491E2EEA0
18 changed files with 270 additions and 268 deletions

24
flake.lock generated
View File

@ -59,11 +59,11 @@
]
},
"locked": {
"lastModified": 1707114923,
"narHash": "sha256-LDYPWa+BgxHSNEye93SyIPgz5u3RAfh78P9KyO+rQzI=",
"lastModified": 1707175763,
"narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "afcedcf2c8e424d0465e823cf833eb3adebe1db7",
"rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80",
"type": "github"
},
"original": {
@ -83,11 +83,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1707142088,
"narHash": "sha256-kyZNkkhLLuhqUIuLPaOUxVRH7IS9IDpijhW0nkEWEW4=",
"lastModified": 1707176359,
"narHash": "sha256-h6BkgPOewfefG40E0KhEIqub207lUsfA84VfETb1m7c=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "f9202f791e3690ad248c842158ee9fa9e1105ea6",
"rev": "ded174d6e5d14bc376919194cbc52c238a07f640",
"type": "github"
},
"original": {
@ -164,11 +164,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1706913249,
"narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
"lastModified": 1707092692,
"narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e92b6015881907e698782c77641aa49298330223",
"rev": "faf912b086576fd1a15fca610166c98d47bc667e",
"type": "github"
},
"original": {
@ -195,11 +195,11 @@
},
"nur": {
"locked": {
"lastModified": 1707151471,
"narHash": "sha256-1au4c4EKRPNT8zx7sJ1vamevyA0EPjF1938Naz9af/8=",
"lastModified": 1707204419,
"narHash": "sha256-RUwB/3Sbh2eeQQUl/UtvUVyUeQapmL+vMY3bGECAhuA=",
"owner": "nix-community",
"repo": "nur",
"rev": "2fd6d20bb00f05fc91321c2eebd497c2e5247d74",
"rev": "af9064a549d5f89d4a85d651b0b94ac4a3c2ea23",
"type": "github"
},
"original": {

View File

@ -6,86 +6,86 @@
# Theme generated from: ${config.colorScheme.slug}
# Main background, empty for terminal default, need to be empty if you want transparent background
theme[main_bg]="#${config.colorScheme.colors.base00}"
theme[main_bg]="#${config.colorScheme.palette.base00}"
# Main text color
theme[main_fg]="#${config.colorScheme.colors.base07}"
theme[main_fg]="#${config.colorScheme.palette.base07}"
# Title color for boxes
theme[title]="#${config.colorScheme.colors.base07}"
theme[title]="#${config.colorScheme.palette.base07}"
# Higlight color for keyboard shortcuts
theme[hi_fg]="#${config.colorScheme.colors.base0E}"
theme[hi_fg]="#${config.colorScheme.palette.base0E}"
# Background color of selected item in processes box
theme[selected_bg]="#${config.colorScheme.colors.base0C}"
theme[selected_bg]="#${config.colorScheme.palette.base0C}"
# Foreground color of selected item in processes box
theme[selected_fg]="#${config.colorScheme.colors.base00}"
theme[selected_fg]="#${config.colorScheme.palette.base00}"
# Color of inactive/disabled text
theme[inactive_fg]="#${config.colorScheme.colors.base02}"
theme[inactive_fg]="#${config.colorScheme.palette.base02}"
# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
theme[graph_text]="#${config.colorScheme.colors.base05}"
theme[graph_text]="#${config.colorScheme.palette.base05}"
# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
theme[proc_misc]="#${config.colorScheme.colors.base0C}"
theme[proc_misc]="#${config.colorScheme.palette.base0C}"
# Cpu box outline color
theme[cpu_box]="#${config.colorScheme.colors.base02}"
theme[cpu_box]="#${config.colorScheme.palette.base02}"
# Memory/disks box outline color
theme[mem_box]="#${config.colorScheme.colors.base02}"
theme[mem_box]="#${config.colorScheme.palette.base02}"
# Net up/down box outline color
theme[net_box]="#${config.colorScheme.colors.base02}"
theme[net_box]="#${config.colorScheme.palette.base02}"
# Processes box outline color
theme[proc_box]="#${config.colorScheme.colors.base02}"
theme[proc_box]="#${config.colorScheme.palette.base02}"
# Box divider line and small boxes line color
theme[div_line]="#${config.colorScheme.colors.base02}"
theme[div_line]="#${config.colorScheme.palette.base02}"
# Temperature graph colors
theme[temp_start]="#${config.colorScheme.colors.base0D}"
theme[temp_start]="#${config.colorScheme.palette.base0D}"
theme[temp_mid]=""
theme[temp_end]="#${config.colorScheme.colors.base0F}"
theme[temp_end]="#${config.colorScheme.palette.base0F}"
# CPU graph colors
theme[cpu_start]="#${config.colorScheme.colors.base0C}"
theme[cpu_start]="#${config.colorScheme.palette.base0C}"
theme[cpu_mid]=""
theme[cpu_end]="#${config.colorScheme.colors.base0C}"
theme[cpu_end]="#${config.colorScheme.palette.base0C}"
# Mem/Disk free meter
theme[free_start]="#${config.colorScheme.colors.base0A}"
theme[free_start]="#${config.colorScheme.palette.base0A}"
theme[free_mid]=""
theme[free_end]="#${config.colorScheme.colors.base0A}"
theme[free_end]="#${config.colorScheme.palette.base0A}"
# Mem/Disk cached meter
theme[cached_start]="#${config.colorScheme.colors.base09}"
theme[cached_start]="#${config.colorScheme.palette.base09}"
theme[cached_mid]=""
theme[cached_end]="#${config.colorScheme.colors.base09}"
theme[cached_end]="#${config.colorScheme.palette.base09}"
# Mem/Disk available meter
theme[available_start]="#${config.colorScheme.colors.base0B}"
theme[available_start]="#${config.colorScheme.palette.base0B}"
theme[available_mid]=""
theme[available_end]="#${config.colorScheme.colors.base0B}"
theme[available_end]="#${config.colorScheme.palette.base0B}"
# Mem/Disk used meter
theme[used_start]="#${config.colorScheme.colors.base08}"
theme[used_start]="#${config.colorScheme.palette.base08}"
theme[used_mid]=""
theme[used_end]="#${config.colorScheme.colors.base08}"
theme[used_end]="#${config.colorScheme.palette.base08}"
# Download graph colors
theme[download_start]="#${config.colorScheme.colors.base02}"
theme[download_start]="#${config.colorScheme.palette.base02}"
theme[download_mid]=""
theme[download_end]="#${config.colorScheme.colors.base0D}"
theme[download_end]="#${config.colorScheme.palette.base0D}"
# Upload graph colors
theme[upload_start]="#${config.colorScheme.colors.base02}"
theme[upload_start]="#${config.colorScheme.palette.base02}"
theme[upload_mid]=""
theme[upload_end]="#${config.colorScheme.colors.base0E}"
theme[upload_end]="#${config.colorScheme.palette.base0E}"
'';
}

View File

@ -2,53 +2,53 @@
programs.kitty = {
enable = true;
settings = {
foreground = "#${config.colorScheme.colors.base07}";
background = "#${config.colorScheme.colors.base00}";
selection_foreground = "#${config.colorScheme.colors.base07}";
selection_background = "#${config.colorScheme.colors.base03}";
foreground = "#${config.colorScheme.palette.base07}";
background = "#${config.colorScheme.palette.base00}";
selection_foreground = "#${config.colorScheme.palette.base07}";
selection_background = "#${config.colorScheme.palette.base03}";
background_opacity = "0.9";
cursor = "#${config.colorScheme.colors.base05}";
cursor_text_color = "#${config.colorScheme.colors.base01}";
cursor = "#${config.colorScheme.palette.base05}";
cursor_text_color = "#${config.colorScheme.palette.base01}";
url_color = "#${config.colorScheme.colors.base05}";
url_color = "#${config.colorScheme.palette.base05}";
active_border_color = "#${config.colorScheme.colors.base05}";
inactive_border_color = "#${config.colorScheme.colors.base03}";
bell_border_color = "#${config.colorScheme.colors.base09}";
active_border_color = "#${config.colorScheme.palette.base05}";
inactive_border_color = "#${config.colorScheme.palette.base03}";
bell_border_color = "#${config.colorScheme.palette.base09}";
wayland_titlebar_color = "system";
macos_titlebar_color = "system";
active_tab_foreground = "#${config.colorScheme.colors.base0C}";
active_tab_background = "#${config.colorScheme.colors.base01}";
inactive_tab_foreground = "#${config.colorScheme.colors.base06}";
inactive_tab_background = "#${config.colorScheme.colors.base00}";
tab_bar_background = "#${config.colorScheme.colors.base02}";
active_tab_foreground = "#${config.colorScheme.palette.base0C}";
active_tab_background = "#${config.colorScheme.palette.base01}";
inactive_tab_foreground = "#${config.colorScheme.palette.base06}";
inactive_tab_background = "#${config.colorScheme.palette.base00}";
tab_bar_background = "#${config.colorScheme.palette.base02}";
mark1_foreground = "#${config.colorScheme.colors.base00}";
mark1_background = "#${config.colorScheme.colors.base0C}";
mark2_foreground = "#${config.colorScheme.colors.base00}";
mark2_background = "#${config.colorScheme.colors.base0E}";
mark3_foreground = "#${config.colorScheme.colors.base00}";
mark3_background = "#${config.colorScheme.colors.base0A}";
mark1_foreground = "#${config.colorScheme.palette.base00}";
mark1_background = "#${config.colorScheme.palette.base0C}";
mark2_foreground = "#${config.colorScheme.palette.base00}";
mark2_background = "#${config.colorScheme.palette.base0E}";
mark3_foreground = "#${config.colorScheme.palette.base00}";
mark3_background = "#${config.colorScheme.palette.base0A}";
color0 = "#${config.colorScheme.colors.base01}";
color1 = "#${config.colorScheme.colors.base0F}";
color2 = "#${config.colorScheme.colors.base0A}";
color3 = "#${config.colorScheme.colors.base09}";
color4 = "#${config.colorScheme.colors.base0C}";
color5 = "#${config.colorScheme.colors.base0D}";
color6 = "#${config.colorScheme.colors.base0B}";
color7 = "#${config.colorScheme.colors.base07}";
color8 = "#${config.colorScheme.colors.base01}";
color9 = "#${config.colorScheme.colors.base0F}";
color10 = "#${config.colorScheme.colors.base0A}";
color11 = "#${config.colorScheme.colors.base09}";
color12 = "#${config.colorScheme.colors.base0C}";
color13 = "#${config.colorScheme.colors.base0D}";
color14 = "#${config.colorScheme.colors.base0B}";
color15 = "#${config.colorScheme.colors.base07}";
color0 = "#${config.colorScheme.palette.base01}";
color1 = "#${config.colorScheme.palette.base0F}";
color2 = "#${config.colorScheme.palette.base0A}";
color3 = "#${config.colorScheme.palette.base09}";
color4 = "#${config.colorScheme.palette.base0C}";
color5 = "#${config.colorScheme.palette.base0D}";
color6 = "#${config.colorScheme.palette.base0B}";
color7 = "#${config.colorScheme.palette.base07}";
color8 = "#${config.colorScheme.palette.base01}";
color9 = "#${config.colorScheme.palette.base0F}";
color10 = "#${config.colorScheme.palette.base0A}";
color11 = "#${config.colorScheme.palette.base09}";
color12 = "#${config.colorScheme.palette.base0C}";
color13 = "#${config.colorScheme.palette.base0D}";
color14 = "#${config.colorScheme.palette.base0B}";
color15 = "#${config.colorScheme.palette.base07}";
font_size = 12;
window-padding-width = 15;

View File

@ -10,36 +10,36 @@
enableZshIntegration = true;
settings = {
format = lib.concatStrings [
"[](#${config.colorScheme.colors.base06})"
"[](#${config.colorScheme.palette.base06})"
"$username"
"$hostname"
"[](bg:#${config.colorScheme.colors.base05} fg:#${config.colorScheme.colors.base06})"
"[](bg:#${config.colorScheme.palette.base05} fg:#${config.colorScheme.palette.base06})"
"$directory"
"[](bg:#${config.colorScheme.colors.base04} fg:#${config.colorScheme.colors.base05})"
"[ ](bg:#${config.colorScheme.colors.base04})"
"[](bg:#${config.colorScheme.palette.base04} fg:#${config.colorScheme.palette.base05})"
"[ ](bg:#${config.colorScheme.palette.base04})"
"$env_var"
"[](bg:#${config.colorScheme.colors.base00} fg:#${config.colorScheme.colors.base04})"
"[](bg:#${config.colorScheme.palette.base00} fg:#${config.colorScheme.palette.base04})"
" "
];
username = {
show_always = true;
style_user =
"bg:#${config.colorScheme.colors.base06} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base06} fg:#${config.colorScheme.palette.base00}";
style_root =
"bg:#${config.colorScheme.colors.base06} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base06} fg:#${config.colorScheme.palette.base00}";
format = "[ $user]($style)";
};
hostname = {
ssh_symbol = "";
style =
"bg:#${config.colorScheme.colors.base06} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base06} fg:#${config.colorScheme.palette.base00}";
format = "[@$hostname]($style)";
ssh_only = false;
disabled = false;
};
directory = {
style =
"bg:#${config.colorScheme.colors.base05} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base05} fg:#${config.colorScheme.palette.base00}";
format = "[ $path ]($style)";
truncation_length = 3;
truncation_symbol = "/";
@ -54,7 +54,7 @@
variable = "SHELLENVTYPE";
default = "";
style =
"bg:#${config.colorScheme.colors.base04} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base04} fg:#${config.colorScheme.palette.base00}";
format = "[$env_value]($style)";
};
};

View File

@ -4,43 +4,43 @@
programs.zathura = {
enable = true;
extraConfig = ''
set default-fg "#${config.colorScheme.colors.base06}"
set default-bg "#${config.colorScheme.colors.base00}"
set default-fg "#${config.colorScheme.palette.base06}"
set default-bg "#${config.colorScheme.palette.base00}"
set completion-bg "#${config.colorScheme.colors.base02}"
set completion-fg "#${config.colorScheme.colors.base06}"
set completion-highlight-bg "#${config.colorScheme.colors.base03}"
set completion-highlight-fg "#${config.colorScheme.colors.base06}"
set completion-group-bg "#${config.colorScheme.colors.base01}"
set completion-group-fg "#${config.colorScheme.colors.base0C}"
set completion-bg "#${config.colorScheme.palette.base02}"
set completion-fg "#${config.colorScheme.palette.base06}"
set completion-highlight-bg "#${config.colorScheme.palette.base03}"
set completion-highlight-fg "#${config.colorScheme.palette.base06}"
set completion-group-bg "#${config.colorScheme.palette.base01}"
set completion-group-fg "#${config.colorScheme.palette.base0C}"
set statusbar-fg "#${config.colorScheme.colors.base06}"
set statusbar-bg "#${config.colorScheme.colors.base01}"
set statusbar-fg "#${config.colorScheme.palette.base06}"
set statusbar-bg "#${config.colorScheme.palette.base01}"
set notification-bg "#${config.colorScheme.colors.base01}"
set notification-fg "#${config.colorScheme.colors.base06}"
set notification-error-bg "#${config.colorScheme.colors.base01}"
set notification-error-fg "#${config.colorScheme.colors.base0F}"
set notification-warning-bg "#${config.colorScheme.colors.base01}"
set notification-warning-fg "#${config.colorScheme.colors.base09}"
set notification-bg "#${config.colorScheme.palette.base01}"
set notification-fg "#${config.colorScheme.palette.base06}"
set notification-error-bg "#${config.colorScheme.palette.base01}"
set notification-error-fg "#${config.colorScheme.palette.base0F}"
set notification-warning-bg "#${config.colorScheme.palette.base01}"
set notification-warning-fg "#${config.colorScheme.palette.base09}"
set inputbar-fg "#${config.colorScheme.colors.base06}"
set inputbar-bg "#${config.colorScheme.colors.base01}"
set inputbar-fg "#${config.colorScheme.palette.base06}"
set inputbar-bg "#${config.colorScheme.palette.base01}"
set recolor-lightcolor "#${config.colorScheme.colors.base00}"
set recolor-darkcolor "#${config.colorScheme.colors.base06}"
set recolor-lightcolor "#${config.colorScheme.palette.base00}"
set recolor-darkcolor "#${config.colorScheme.palette.base06}"
set index-fg "#${config.colorScheme.colors.base06}"
set index-bg "#${config.colorScheme.colors.base00}"
set index-active-fg "#${config.colorScheme.colors.base06}"
set index-active-bg "#${config.colorScheme.colors.base01}"
set index-fg "#${config.colorScheme.palette.base06}"
set index-bg "#${config.colorScheme.palette.base00}"
set index-active-fg "#${config.colorScheme.palette.base06}"
set index-active-bg "#${config.colorScheme.palette.base01}"
set render-loading-bg "#${config.colorScheme.colors.base00}"
set render-loading-fg "#${config.colorScheme.colors.base06}"
set render-loading-bg "#${config.colorScheme.palette.base00}"
set render-loading-fg "#${config.colorScheme.palette.base06}"
set highlight-color "#${config.colorScheme.colors.base04}"
set highlight-fg "#${config.colorScheme.colors.base0E}"
set highlight-active-color "#${config.colorScheme.colors.base0E}"
set highlight-color "#${config.colorScheme.palette.base04}"
set highlight-fg "#${config.colorScheme.palette.base0E}"
set highlight-active-color "#${config.colorScheme.palette.base0E}"
'';
};

View File

@ -35,26 +35,26 @@ in pkgs.stdenv.mkDerivation rec {
sed -e 's/handle-horz-.*//' -e 's/handle-vert-.*//' -i ./src/gtk-2.0/assets.txt
cat > /build/gtk-colors << EOF
BG=${scheme.colors.base00}
FG=${scheme.colors.base07}
HDR_BG=${scheme.colors.base00}
HDR_FG=${scheme.colors.base07}
SEL_BG=${scheme.colors.base03}
SEL_FG=${scheme.colors.base07}
TXT_BG=${scheme.colors.base01}
TXT_FG=${scheme.colors.base07}
BTN_BG=${scheme.colors.base01}
BTN_FG=${scheme.colors.base07}
HDR_BTN_BG=${scheme.colors.base01}
HDR_BTN_FG=${scheme.colors.base07}
MENU_BG=${scheme.colors.base00}
MENU_FG=${scheme.colors.base07}
ACCENT_BG=${scheme.colors.base0C}
ACCENT_FG=${scheme.colors.base00}
MATERIA_SURFACE=${scheme.colors.base01}
MATERIA_VIEW=${scheme.colors.base00}
WM_BORDER_FOCUS=${scheme.colors.base02}
WM_BORDER_UNFOCUS=${scheme.colors.base02}
BG=${scheme.palette.base00}
FG=${scheme.palette.base07}
HDR_BG=${scheme.palette.base00}
HDR_FG=${scheme.palette.base07}
SEL_BG=${scheme.palette.base03}
SEL_FG=${scheme.palette.base07}
TXT_BG=${scheme.palette.base01}
TXT_FG=${scheme.palette.base07}
BTN_BG=${scheme.palette.base01}
BTN_FG=${scheme.palette.base07}
HDR_BTN_BG=${scheme.palette.base01}
HDR_BTN_FG=${scheme.palette.base07}
MENU_BG=${scheme.palette.base00}
MENU_FG=${scheme.palette.base07}
ACCENT_BG=${scheme.palette.base0C}
ACCENT_FG=${scheme.palette.base00}
MATERIA_SURFACE=${scheme.palette.base01}
MATERIA_VIEW=${scheme.palette.base00}
WM_BORDER_FOCUS=${scheme.palette.base02}
WM_BORDER_UNFOCUS=${scheme.palette.base02}
UNITY_DEFAULT_LAUNCHER_STYLE=False
ROUNDNESS=7
NAME=${scheme.slug}

View File

@ -2,7 +2,7 @@
let
scheme = config.colorScheme;
colors = scheme.colors;
colors = scheme.palette;
dither =
"atkinson"; # none | floyd-steinberg | atkinson | jjn | burkes | sierra | sierra-lite
in pkgs.stdenv.mkDerivation rec {

View File

@ -13,7 +13,7 @@
scale = "0";
origin = "top-right";
offset =
"${config.colorScheme.colors.gaps-bar}x${config.colorScheme.colors.gaps-screen}";
"${config.colorScheme.palette.gaps-bar}x${config.colorScheme.palette.gaps-screen}";
notification_limit = "0";
progress_bar = "true";
progress_bar_height = "10";
@ -26,8 +26,8 @@
padding = "12";
horizontal_padding = "15";
text_icon_padding = "0";
frame_width = "${config.colorScheme.colors.border-width}";
frame_color = "#${config.colorScheme.colors.base04}";
frame_width = "${config.colorScheme.palette.border-width}";
frame_color = "#${config.colorScheme.palette.base04}";
separator_color = "auto";
sort = "yes";
font = "IBM Plex Mono 14";
@ -57,7 +57,7 @@
always_run_script = "true";
title = "Dunst";
class = "Dunst";
corner_radius = "${config.colorScheme.colors.border-radius}";
corner_radius = "${config.colorScheme.palette.border-radius}";
ignore_dbusclose = "false";
layer = "top";
force_xwayland = "true";
@ -69,25 +69,25 @@
};
urgency_low = {
background = "#${config.colorScheme.colors.base01}";
foreground = "#${config.colorScheme.colors.base07}";
frame_color = "#${config.colorScheme.colors.base03}";
background = "#${config.colorScheme.palette.base01}";
foreground = "#${config.colorScheme.palette.base07}";
frame_color = "#${config.colorScheme.palette.base03}";
timeout = "3";
highlight = "#${config.colorScheme.colors.base0B}";
highlight = "#${config.colorScheme.palette.base0B}";
};
urgency_normal = {
background = "#${config.colorScheme.colors.base01}";
foreground = "#${config.colorScheme.colors.base07}";
frame_color = "#${config.colorScheme.colors.base04}";
background = "#${config.colorScheme.palette.base01}";
foreground = "#${config.colorScheme.palette.base07}";
frame_color = "#${config.colorScheme.palette.base04}";
timeout = "5";
highlight = "#${config.colorScheme.colors.base0C}";
highlight = "#${config.colorScheme.palette.base0C}";
};
urgency_critical = {
background = "#${config.colorScheme.colors.base01}";
foreground = "#${config.colorScheme.colors.base0F}";
frame_color = "#${config.colorScheme.colors.base0F}";
background = "#${config.colorScheme.palette.base01}";
foreground = "#${config.colorScheme.palette.base0F}";
frame_color = "#${config.colorScheme.palette.base0F}";
timeout = "10";
highlight = "#${config.colorScheme.colors.base0E}";
highlight = "#${config.colorScheme.palette.base0E}";
};
};
};

View File

@ -16,22 +16,22 @@
# colors file
xdg.configFile."eww/css/_colors.scss".text = ''
$base00: #${config.colorScheme.colors.base00};
$base01: #${config.colorScheme.colors.base01};
$base02: #${config.colorScheme.colors.base02};
$base03: #${config.colorScheme.colors.base03};
$base04: #${config.colorScheme.colors.base04};
$base05: #${config.colorScheme.colors.base05};
$base06: #${config.colorScheme.colors.base06};
$base07: #${config.colorScheme.colors.base07};
$base08: #${config.colorScheme.colors.base08};
$base09: #${config.colorScheme.colors.base09};
$base0A: #${config.colorScheme.colors.base0A};
$base0B: #${config.colorScheme.colors.base0B};
$base0C: #${config.colorScheme.colors.base0C};
$base0D: #${config.colorScheme.colors.base0D};
$base0E: #${config.colorScheme.colors.base0E};
$base0F: #${config.colorScheme.colors.base0F};
$base00: #${config.colorScheme.palette.base00};
$base01: #${config.colorScheme.palette.base01};
$base02: #${config.colorScheme.palette.base02};
$base03: #${config.colorScheme.palette.base03};
$base04: #${config.colorScheme.palette.base04};
$base05: #${config.colorScheme.palette.base05};
$base06: #${config.colorScheme.palette.base06};
$base07: #${config.colorScheme.palette.base07};
$base08: #${config.colorScheme.palette.base08};
$base09: #${config.colorScheme.palette.base09};
$base0A: #${config.colorScheme.palette.base0A};
$base0B: #${config.colorScheme.palette.base0B};
$base0C: #${config.colorScheme.palette.base0C};
$base0D: #${config.colorScheme.palette.base0D};
$base0E: #${config.colorScheme.palette.base0E};
$base0F: #${config.colorScheme.palette.base0F};
$fg: $base07;
@ -40,11 +40,11 @@
$border-color: $base03;
$border-color-focus: $base04;
$border-radius: ${config.colorScheme.colors.border-radius}px;
$border-width: ${config.colorScheme.colors.border-width}px;
$border-radius: ${config.colorScheme.palette.border-radius}px;
$border-width: ${config.colorScheme.palette.border-width}px;
$gaps-screen: ${config.colorScheme.colors.gaps-screen}px;
$gaps-window: ${config.colorScheme.colors.gaps-window}px;
$gaps-screen: ${config.colorScheme.palette.gaps-screen}px;
$gaps-window: ${config.colorScheme.palette.gaps-window}px;
'';
};
}

View File

@ -28,23 +28,23 @@ in {
style = ''
* {
border: none;
border-radius: ${config.colorScheme.colors.border-radius}pt;
border-radius: ${config.colorScheme.palette.border-radius}pt;
font-family:'Monospace','Material Design Icons','Openmoji';
font-size: 13pt;
color: #${config.colorScheme.colors.base07};
color: #${config.colorScheme.palette.base07};
}
window#waybar {
background: transparent;
padding-top: ${config.colorScheme.colors.gaps-screen}pt;
padding-bottom: ${config.colorScheme.colors.gaps-screen}pt;
padding-top: ${config.colorScheme.palette.gaps-screen}pt;
padding-bottom: ${config.colorScheme.palette.gaps-screen}pt;
}
tooltip {
background: #${config.colorScheme.colors.base01};
border-radius: ${config.colorScheme.colors.border-radius}pt;
border-color: #${config.colorScheme.colors.base03};
border-width: ${config.colorScheme.colors.border-width}pt;
background: #${config.colorScheme.palette.base01};
border-radius: ${config.colorScheme.palette.border-radius}pt;
border-color: #${config.colorScheme.palette.base03};
border-width: ${config.colorScheme.palette.border-width}pt;
border-style: solid;
font-size: 13pt;
}
@ -64,19 +64,19 @@ in {
}
#workspaces button.focused {
color: #${config.colorScheme.colors.base0C};
color: #${config.colorScheme.palette.base0C};
}
#workspaces button.active {
color: #${config.colorScheme.colors.base0C};
color: #${config.colorScheme.palette.base0C};
}
#workspaces button.urgent {
color: #${config.colorScheme.colors.base08};
color: #${config.colorScheme.palette.base08};
}
#workspaces button:hover icon {
color: #${config.colorScheme.colors.base04};
color: #${config.colorScheme.palette.base04};
}
#workspaces,
@ -88,16 +88,16 @@ in {
#custom-powermenu,
#clock, #clock.date, #clock.time
{
background: #${config.colorScheme.colors.base01};
margin-bottom: ${config.colorScheme.colors.gaps-window}pt;
background: #${config.colorScheme.palette.base01};
margin-bottom: ${config.colorScheme.palette.gaps-window}pt;
padding-top: 2px;
padding-left: 2px;
padding-bottom: 2px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
border-top: ${config.colorScheme.colors.border-width}px solid #${config.colorScheme.colors.base03};
border-left: ${config.colorScheme.colors.border-width}px solid #${config.colorScheme.colors.base03};
border-bottom: ${config.colorScheme.colors.border-width}px solid #${config.colorScheme.colors.base03};
border-top: ${config.colorScheme.palette.border-width}px solid #${config.colorScheme.palette.base03};
border-left: ${config.colorScheme.palette.border-width}px solid #${config.colorScheme.palette.base03};
border-bottom: ${config.colorScheme.palette.border-width}px solid #${config.colorScheme.palette.base03};
}
#custom-powermenu {

View File

@ -12,43 +12,43 @@
ignore-empty-password
font=IBM Plex Mono
color=${config.colorscheme.colors.base00}00
color=${config.colorScheme.palette.base00}00
indicator-radius=100
indicator-thickness=30
separator-color=${config.colorscheme.colors.base00}00
separator-color=${config.colorScheme.palette.base00}00
inside-color=${config.colorscheme.colors.base0C}00
inside-clear-color=${config.colorscheme.colors.base08}FF
inside-caps-lock-color=${config.colorscheme.colors.base09}00
inside-ver-color=${config.colorscheme.colors.base0C}FF
inside-wrong-color=${config.colorscheme.colors.base0F}FF
inside-color=${config.colorScheme.palette.base0C}00
inside-clear-color=${config.colorScheme.palette.base08}FF
inside-caps-lock-color=${config.colorScheme.palette.base09}00
inside-ver-color=${config.colorScheme.palette.base0C}FF
inside-wrong-color=${config.colorScheme.palette.base0F}FF
ring-color=${config.colorscheme.colors.base00}00
ring-clear-color=${config.colorscheme.colors.base00}00
ring-caps-lock-color=${config.colorscheme.colors.base00}00
ring-ver-color=${config.colorscheme.colors.base00}00
ring-wrong-color=${config.colorscheme.colors.base00}00
ring-color=${config.colorScheme.palette.base00}00
ring-clear-color=${config.colorScheme.palette.base00}00
ring-caps-lock-color=${config.colorScheme.palette.base00}00
ring-ver-color=${config.colorScheme.palette.base00}00
ring-wrong-color=${config.colorScheme.palette.base00}00
line-color=${config.colorscheme.colors.base00}00
line-clear-color=${config.colorscheme.colors.base00}00
line-caps-lock-color=${config.colorscheme.colors.base00}00
line-ver-color=${config.colorscheme.colors.base00}00
line-wrong-color=${config.colorscheme.colors.base00}00
line-color=${config.colorScheme.palette.base00}00
line-clear-color=${config.colorScheme.palette.base00}00
line-caps-lock-color=${config.colorScheme.palette.base00}00
line-ver-color=${config.colorScheme.palette.base00}00
line-wrong-color=${config.colorScheme.palette.base00}00
text-color=${config.colorscheme.colors.base00}00
text-clear-color=${config.colorscheme.colors.base00}00
text-caps-lock-color=${config.colorscheme.colors.base00}00
text-ver-color=${config.colorscheme.colors.base00}00
text-wrong-color=${config.colorscheme.colors.base00}00
text-color=${config.colorScheme.palette.base00}00
text-clear-color=${config.colorScheme.palette.base00}00
text-caps-lock-color=${config.colorScheme.palette.base00}00
text-ver-color=${config.colorScheme.palette.base00}00
text-wrong-color=${config.colorScheme.palette.base00}00
key-hl-color=${config.colorscheme.colors.base0C}FF
bs-hl-color=${config.colorscheme.colors.base08}FF
caps-lock-key-hl-color=${config.colorscheme.colors.base09}FF
caps-lock-bs-hl-color=${config.colorscheme.colors.base09}FF
key-hl-color=${config.colorScheme.palette.base0C}FF
bs-hl-color=${config.colorScheme.palette.base08}FF
caps-lock-key-hl-color=${config.colorScheme.palette.base09}FF
caps-lock-bs-hl-color=${config.colorScheme.palette.base09}FF
'';
};
}

View File

@ -23,8 +23,8 @@
xdg.configFile."wofi/style.css".text = ''
window {
margin: 0px;
border-radius: ${config.colorscheme.colors.border-radius}px;
background-color: #${config.colorscheme.colors.base00};
border-radius: ${config.colorScheme.palette.border-radius}px;
background-color: #${config.colorScheme.palette.base00};
}
#input {
@ -33,14 +33,14 @@
padding: 4px 10px;
margin: 4px;
border: none;
color: #${config.colorscheme.colors.base07};
color: #${config.colorScheme.palette.base07};
font-weight: bold;
background-color: #${config.colorscheme.colors.base01};
outline: #${config.colorscheme.colors.base04};
background-color: #${config.colorScheme.palette.base01};
outline: #${config.colorScheme.palette.base04};
}
#input:selected {
color: #${config.colorscheme.colors.base0C};
color: #${config.colorScheme.palette.base0C};
}
#inner-box {
@ -51,19 +51,19 @@
#outer-box {
margin: 0px;
padding: 3px;
border-radius: ${config.colorscheme.colors.border-radius}px;
border-width: ${config.colorscheme.colors.border-width}px;
border-color: #${config.colorscheme.colors.base04};
border-radius: ${config.colorScheme.palette.border-radius}px;
border-width: ${config.colorScheme.palette.border-width}px;
border-color: #${config.colorScheme.palette.base04};
border-style: solid;
}
#text:selected {
color: #${config.colorscheme.colors.base00};
color: #${config.colorScheme.palette.base00};
background-color: transparent;
}
#entry:selected {
background-color: #${config.colorscheme.colors.base07};
background-color: #${config.colorScheme.palette.base07};
}
'';
};

View File

@ -33,18 +33,18 @@
}
general {
gaps_in = ${config.colorScheme.colors.gaps-window}
gaps_out = ${config.colorScheme.colors.gaps-screen}
border_size = ${config.colorScheme.colors.border-width}
gaps_in = ${config.colorScheme.palette.gaps-window}
gaps_out = ${config.colorScheme.palette.gaps-screen}
border_size = ${config.colorScheme.palette.border-width}
col.active_border = rgb(${config.colorScheme.colors.base04})
col.inactive_border = rgb(${config.colorScheme.colors.base03})
col.active_border = rgb(${config.colorScheme.palette.base04})
col.inactive_border = rgb(${config.colorScheme.palette.base03})
layout = dwindle
}
decoration {
rounding = ${config.colorScheme.colors.border-radius}
rounding = ${config.colorScheme.palette.border-radius}
blur {
enabled = true

View File

@ -4,26 +4,26 @@
#define white #ffffff
#define black #000000
#define cFG #${config.colorScheme.colors.base07}
#define cBG #${config.colorScheme.colors.base00}
#define cP #${config.colorScheme.colors.base07}
#define cH #${config.colorScheme.colors.base0C}
#define c0 #${config.colorScheme.colors.base00}
#define c1 #${config.colorScheme.colors.base01}
#define c2 #${config.colorScheme.colors.base02}
#define c3 #${config.colorScheme.colors.base03}
#define c4 #${config.colorScheme.colors.base04}
#define c5 #${config.colorScheme.colors.base05}
#define c6 #${config.colorScheme.colors.base06}
#define c7 #${config.colorScheme.colors.base07}
#define c8 #${config.colorScheme.colors.base08}
#define c9 #${config.colorScheme.colors.base09}
#define cA #${config.colorScheme.colors.base0A}
#define cB #${config.colorScheme.colors.base0B}
#define cC #${config.colorScheme.colors.base0C}
#define cD #${config.colorScheme.colors.base0D}
#define cE #${config.colorScheme.colors.base0E}
#define cF #${config.colorScheme.colors.base0F}
#define cFG #${config.colorScheme.palette.base07}
#define cBG #${config.colorScheme.palette.base00}
#define cP #${config.colorScheme.palette.base07}
#define cH #${config.colorScheme.palette.base0C}
#define c0 #${config.colorScheme.palette.base00}
#define c1 #${config.colorScheme.palette.base01}
#define c2 #${config.colorScheme.palette.base02}
#define c3 #${config.colorScheme.palette.base03}
#define c4 #${config.colorScheme.palette.base04}
#define c5 #${config.colorScheme.palette.base05}
#define c6 #${config.colorScheme.palette.base06}
#define c7 #${config.colorScheme.palette.base07}
#define c8 #${config.colorScheme.palette.base08}
#define c9 #${config.colorScheme.palette.base09}
#define cA #${config.colorScheme.palette.base0A}
#define cB #${config.colorScheme.palette.base0B}
#define cC #${config.colorScheme.palette.base0C}
#define cD #${config.colorScheme.palette.base0D}
#define cE #${config.colorScheme.palette.base0E}
#define cF #${config.colorScheme.palette.base0F}
Xft.dpi: 96

View File

@ -5,8 +5,10 @@ in {
services.xserver = {
enable = true;
videoDrivers = [ "amd" ];
layout = "us";
xkbVariant = "intl";
xkb = {
layout = "us";
variant = "intl";
};
excludePackages = [ pkgs.xterm ];
exportConfiguration = true;
# libinput.touchpad.tapping = false;

View File

@ -1,9 +1,9 @@
{ config, ... }: {
imports = [ ./sorahiro_soft.nix ];
colorScheme.colors.border-radius = "#8";
colorScheme.colors.border-width = "#2";
colorScheme.colors.gaps-screen = "#8";
colorScheme.colors.gaps-window = "#4";
colorScheme.colors.gaps-bar = "#32";
colorScheme.palette.border-radius = "#8";
colorScheme.palette.border-width = "#2";
colorScheme.palette.gaps-screen = "#8";
colorScheme.palette.gaps-window = "#4";
colorScheme.palette.gaps-bar = "#32";
}

View File

@ -1,12 +1,12 @@
{ nix-colors, ... }: {
# usage: a = "#${config.colorScheme.colors.base00}";
# usage: a = "#${config.colorScheme.palette.base00}";
colorScheme = {
slug = "sorahiro-hard";
name = "sorahiro-hard";
author = "Soraefir @ Helcel";
kind = "dark";
colors = {
variant = "dark";
palette = {
# Format: Name, Pantone, RAL
base00 = "#030B12"; # Rich Black / 6C / 000-15-00
base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15

View File

@ -1,12 +1,12 @@
{ nix-colors, ... }: {
# usage: a = "#${config.colorScheme.colors.base00}";
# usage: a = "#${config.colorScheme.palette.base00}";
colorScheme = {
slug = "sorahiro-soft";
name = "sorahiro-soft";
author = "Soraefir @ Helcel";
kind = "dark";
colors = {
variant = "dark";
palette = {
# Format: Name, Pantone, RAL
base00 = "#030B12"; # Rich Black / 6C / 000-15-00
base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15