diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 7e42d2e..1dfe292 100755 Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index 342d2a3..2c81f7d 100755 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -1,9 +1,10 @@ -{ pkgs, lib, rice, user, secrets, ... }: +{ pkgs, rice, secrets, ... }: let channels = [ + "Caedrel" "agurin" "asmongold" - "Caedrel" + # "Caedrel" "EintrachtSpandau" "GamesDoneQuick" "gdolphn" @@ -12,7 +13,6 @@ let "HisWattson" "Jankos" "KuruHS" - "kutcherlol" "LEC" "lol_nemesis" "NASA" @@ -45,7 +45,7 @@ in { home = { packages = with pkgs; [ chatterino2 ]; file = { - ".local/share/chatterino/Settings/settings.json".text = with secrets.chatterino; '' + ".local/share/chatterino/Settings/settings.json".text = with secrets.chatterino; /* json */ '' { "accounts": { "current": "${username}", @@ -77,7 +77,7 @@ in { }, "tabVisibility": 1, "theme": { - "name": "Black" + "name": "nxtheme.json" } }, "behaviour": { @@ -716,22 +716,111 @@ in { } ''; ".local/share/chatterino/Settings/window-layout.json".text = builtins.toJSON { - windows = [ - { - emotePopup = { - x = 0; - y = 0; - }; - height = 569; - state = "maximized"; - tabs = map tabber channels; - type = "main"; - width = 943; + windows = [{ + emotePopup = { x = 0; y = 0; - } - ]; + }; + height = 569; + state = "maximized"; + tabs = map tabber channels; + type = "main"; + width = 943; + x = 0; + y = 0; + }]; }; + ".local/share/chatterino/Themes/nxtheme.json".text = with rice.color; let + tr = builtins.toString (rice.lib.float-to-drune rice.transparency); + nh = rice.lib.nohash; + in /* json */ '' + { + "colors": { + "accent": "${accent.base}", + "messages": { + "backgrounds": { + "alternate": "${rice.lib.alter-luminace-hex accent.dark (-0.2)}", + "regular": "${background}" + }, + "disabled": "#99000000", + "highlightAnimationEnd": "#00e6e6e6", + "highlightAnimationStart": "#6ee6e6e6", + "selection": "#40ffffff", + "textColors": { + "caret": "#ffffff", + "chatPlaceholder": "#5d5555", + "link": "#4286f4", + "regular": "#ffffff", + "system": "#8c7f7f" + } + }, + "scrollbars": { + "background": "#00000000", + "thumb": "${secondary.dark}", + "thumbSelected": "${secondary.base}" + }, + "splits": { + "background": "${background}", + "dropPreview": "#300094ff", + "dropPreviewBorder": "${border}", + "dropTargetRect": "${background}", + "dropTargetRectBorder": "${border2}", + "header": { + "background": "${background}", "focusedBackground": "${accent.dark}", + "border": "${background}", "focusedBorder": "${secondary.base}", + "text": "${tertiary.base}", "focusedText": "${tertiary.bright}" + }, + "input": { + "background": "${background}", + "text": "${foreground}" + }, + "messageSeperator": "${accent.dark}", + "resizeHandle": "#70${nh accent.base}", + "resizeHandleBackground": "#20${nh secondary.dark}" + }, + "tabs": { + "liveIndicator": "${special.base}", + "rerunIndicator": "${accent.base}", + "dividerLine": "${background}", + "highlighted": { + "backgrounds": { "hover": "${accent.dark}", "regular": "${secondary.dark}", "unfocused": "${black.dark}" }, + "line": { "hover": "${secondary.base}", "regular": "${accent.base}", "unfocused": "${accent.dark}" }, + "text": "${accent.base}" + }, + "newMessage": { + "backgrounds": { "hover": "${accent.dark}", "regular": "${secondary.dark}", "unfocused": "${black.dark}" }, + "line": { "hover": "${secondary.base}", "regular": "${accent.base}", "unfocused": "${accent.dark}" }, + "text": "${accent.base}" + }, + "regular": { + "backgrounds": { "hover": "${accent.dark}", "regular": "${background}", "unfocused": "${background}" }, + "line": { "hover": "${secondary.base}", "regular": "${accent.dark}", "unfocused": "${background}" }, + "text": "${accent.base}" + }, + "selected": { + "backgrounds": { "hover": "${accent.dark}", "regular": "${secondary.dark}", "unfocused": "${secondary.dark}" }, + "line": { "hover": "${accent.bright}", "regular": "${accent.base}", "unfocused": "${accent.dark}" }, + "text": "${foreground}" + } + }, + "window": { + "background": "${background}", + "text": "${foreground}" + } + }, + "metadata": { + "iconTheme": "light" + }, + "ctcMeta": { + "name": "nxtheme", + "createdAt": "1970-01-01T00:00:00Z", + "modifiedAt": "1970-01-01T00:00:00Z", + "simpleTabSettings": false, + "checkeredRow": true, + "messageSeparator": false + } + } + ''; }; }; } diff --git a/home-modules/wallpaper-to-colors.nix b/home-modules/wallpaper-to-colors.nix index b8519d2..fb53f88 100644 --- a/home-modules/wallpaper-to-colors.nix +++ b/home-modules/wallpaper-to-colors.nix @@ -73,7 +73,7 @@ new_sat = min((sat**0.5) + 0.4, 1) else: new_sat = sat - new_lum = max(lum, 0.5) + new_lum = 0.6 r, g, b = hls_to_rgb(h=hue, l=new_lum, s=new_sat) return [int(r*255), int(g*255), int(b*255)]