1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-30 19:47:47 +00:00

Use themenix

This commit is contained in:
RGBCube 2023-11-26 22:00:03 +03:00
parent 6bc0d3c359
commit 06a4bde31e
No known key found for this signature in database
7 changed files with 100 additions and 64 deletions

16
flake.lock generated
View file

@ -126,6 +126,7 @@
"homeManager": "homeManager", "homeManager": "homeManager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"themes": "themes",
"tools": "tools" "tools": "tools"
} }
}, },
@ -161,6 +162,21 @@
"type": "github" "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": { "tools": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View file

@ -28,6 +28,10 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
themes = {
url = "github:RGBCube/ThemeNix";
};
fenix = { fenix = {
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs"; 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 = { upkgs = {
theme = import ./themes/gruvbox.nix; theme = themes.gruvbox-dark-hard;
hyprland = inputs.hyprland.packages.${system}.default; hyprland = inputs.hyprland.packages.${system}.default;
}; };

View file

@ -1,9 +1,7 @@
{ pkgs, upkgs, homeConfiguration, enabled, ... }: { pkgs, upkgs, homeConfiguration, enabled, ... }:
homeConfiguration "nixos" { homeConfiguration "nixos" {
services.dunst = let services.dunst = with upkgs.theme.withHashtag; enabled {
inherit (upkgs) theme;
in enabled {
iconTheme = { iconTheme = {
name = "Gruvbox-Dark"; name = "Gruvbox-Dark";
package = pkgs.gruvbox-dark-icons-gtk; package = pkgs.gruvbox-dark-icons-gtk;
@ -15,12 +13,12 @@ homeConfiguration "nixos" {
horizontal_padding = 10; horizontal_padding = 10;
padding = 10; padding = 10;
frame_color = "#" + theme.activeHighlight; frame_color = base0A;
frame_width = 2; frame_width = 2;
seperator_color = "frame"; seperator_color = "frame";
background = "#" + theme.background; background = background;
foreground = "#" + theme.foreground; foreground = lightForeground;
alignment = "center"; alignment = "center";
font = "OpenSans 12"; font = "OpenSans 12";
@ -32,17 +30,17 @@ homeConfiguration "nixos" {
}; };
settings.urgency_low = { settings.urgency_low = {
frame_color = "#" + theme.low; frame_color = base0D;
timeout = 5; timeout = 5;
}; };
settings.urgency_normal = { settings.urgency_normal = {
frame_color = "#" + theme.medium; frame_color = base0E;
timeout = 10; timeout = 10;
}; };
settings.urgency_critical = { settings.urgency_critical = {
frame_color = "#" + theme.high; frame_color = base08;
timeout = 15; timeout = 15;
}; };
}; };

View file

@ -16,15 +16,13 @@ homeConfiguration "nixos" {
inner-pad = 10; inner-pad = 10;
}; };
settings.colors = let settings.colors = with upkgs.theme; {
inherit (upkgs) theme; background = background + "FF";
in { text = lightForeground + "FF";
background = theme.background + theme.transparency; match = base0A + "FF";
text = theme.foreground + theme.transparency; selection = lightForeground + "FF";
match = theme.activeHighlight + theme.transparency; selection-text = background + "FF";
selection = theme.foreground + theme.transparency; border = base0A + "FF";
selection-text = theme.background + theme.transparency;
border = theme.activeHighlight + theme.transparency;
}; };
settings.border = { settings.border = {

View file

@ -8,9 +8,7 @@
wayland.windowManager.hyprland = enabled { wayland.windowManager.hyprland = enabled {
package = upkgs.hyprland; package = upkgs.hyprland;
extraConfig = let extraConfig = with upkgs.theme;
inherit (upkgs) theme;
in
'' ''
monitor = , preferred, auto, 1 monitor = , preferred, auto, 1
'' ''
@ -123,11 +121,11 @@
gaps_out = 10 gaps_out = 10
border_size = 2 border_size = 2
col.active_border = 0x${theme.transparency}${theme.activeHighlight} col.active_border = 0xFF${base0A}
col.nogroup_border_active = 0x${theme.transparency}${theme.activeHighlight} col.nogroup_border_active = 0xFF${base0A}
col.inactive_border = 0x${theme.transparency}${theme.inactiveHighlight} col.inactive_border = 0xFF${base01}
col.nogroup_border = 0x${theme.transparency}${theme.inactiveHighlight} col.nogroup_border = 0xFF${base01}
cursor_inactive_timeout = 10 cursor_inactive_timeout = 10
no_cursor_warps = true no_cursor_warps = true

View file

@ -12,9 +12,7 @@ homeConfiguration "nixos" {
theme = "Gruvbox Dark"; theme = "Gruvbox Dark";
settings = let settings = with upkgs.theme.withHashtag; {
inherit (upkgs) theme;
in {
allow_remote_control = true; allow_remote_control = true;
confirm_os_window_close = 0; confirm_os_window_close = 0;
focus_follows_mouse = true; focus_follows_mouse = true;
@ -24,50 +22,51 @@ homeConfiguration "nixos" {
scrollback_lines = 100000; scrollback_lines = 100000;
scrollback_pager = "bat --chop-long-lines"; scrollback_pager = "bat --chop-long-lines";
cursor = "#" + theme.foreground; cursor = lightForeground;
cursor_theme_color = "#" + theme.background; cursor_theme_color = background;
cursor_shape = "beam"; cursor_shape = "beam";
url_color = "#" + theme.low; url_color = base0D;
strip_trailing_spaces = "always"; strip_trailing_spaces = "always";
enable_audio_bell = false; enable_audio_bell = false;
active_border_color = "#" + theme.activeHighlight; active_border_color = base0A;
inactive_border_color = "#" + theme.inactiveHighlight; inactive_border_color = base01;
window_border_width = "0pt"; window_border_width = "0pt";
background = "#" + theme.background; background = background;
foreground = "#" + theme.foreground; foreground = lightForeground;
selection_background = "#" + theme.foreground; selection_background = lightForeground;
selection_foreground = "#" + theme.background; selection_foreground = background;
tab_bar_edge = "top"; tab_bar_edge = "top";
tab_bar_style = "powerline"; tab_bar_style = "powerline";
active_tab_background = "#" + theme.background; active_tab_background = background;
active_tab_foreground = "#" + theme.foreground; active_tab_foreground = lightForeground;
inactive_tab_background = "#" + theme.backgroundLight; inactive_tab_background = lightBackground;
inactive_tab_foreground = "#" + theme.foreground; inactive_tab_foreground = lightForeground;
color0 = "#665C54"; color0 = base00;
color2 = "#98971A"; color1 = base01;
color3 = "#D79921"; color2 = base02;
color4 = "#458588"; color3 = base03;
color5 = "#B16286"; color4 = base04;
color6 = "#689D6A"; color5 = base05;
color7 = "#A89984"; color6 = base06;
color8 = "#7C6F64"; color7 = base07;
color9 = "#FB4934"; color8 = base08;
color10 = "#B8BB26"; color9 = base09;
color11 = "#FABD2F"; color10 = base0A;
color12 = "#83A598"; color11 = base0B;
color13 = "#D3869B"; color12 = base0C;
color14 = "#8EC07C"; color13 = base0D;
color15 = "#BDAE93"; color14 = base0E;
color15 = base0F;
}; };
}; };
} }

View file

@ -114,18 +114,41 @@ homeConfiguration "nixos" {
}; };
}]; }];
style = let style = with upkgs.theme.withHashtag; ''
inherit (upkgs) theme;
in ''
* { * {
border: none; border: none;
border-radius: 0; border-radius: 0;
font-family: "OpenSans"; font-family: "OpenSans";
} }
window#waybar { #waybar {
background: #${theme.background}; background: ${background};
color: #${theme.foreground}; 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};
} }
''; '';
}; };