diff --git a/users/rei/apps/bat.nix b/users/rei/apps/bat.nix index 44fa100..325d018 100644 --- a/users/rei/apps/bat.nix +++ b/users/rei/apps/bat.nix @@ -1,4 +1,4 @@ { config, pkgs, lib, ... }: { - xdg.configFile."bat/themes/frappe.tmTheme".text = builtins.readFile ../confs/bat/frappe.tmTheme; + xdg.configFile."bat/themes/macchiato.tmTheme".text = builtins.readFile ../confs/bat/macchiato.tmTheme; } diff --git a/users/rei/apps/foot.nix b/users/rei/apps/foot.nix index df5b746..472d9d9 100644 --- a/users/rei/apps/foot.nix +++ b/users/rei/apps/foot.nix @@ -8,7 +8,7 @@ enable = true; settings = { main = { - include = "${config.xdg.configHome}/foot/frappe.ini"; + include = "${config.xdg.configHome}/foot/macchiato.ini"; font = "FantasqueSansMono Nerd Font Mono:size=10"; font-bold = "FantasqueSansMono Nerd Font Mono:size=10:style=Bold"; font-italic = "FantasqueSansMono Nerd Font Mono:size=10:style=Italic"; @@ -17,6 +17,6 @@ mouse.hide-when-typing = "yes"; }; }; - xdg.configFile."foot/frappe.ini".text = - builtins.readFile ../confs/foot/frappe.ini; + xdg.configFile."foot/macchiato.ini".text = + builtins.readFile ../confs/foot/macchiato.ini; } diff --git a/users/rei/apps/gtk.nix b/users/rei/apps/gtk.nix index 1075b08..87662b4 100644 --- a/users/rei/apps/gtk.nix +++ b/users/rei/apps/gtk.nix @@ -6,11 +6,11 @@ config.gtk = { enable = true; theme = { - name = "Catppuccin-Frappe-Standard-Sky-Dark"; + name = "Catppuccin-Macchiato-Standard-Pink-Dark"; package = pkgs.callPackage ../packages/catppuccin-gtk {}; }; iconTheme = { - package = pkgs.rubyowo.catppuccin-papirus-folders.override {flavor = "frappe"; accent = "sky";}; + package = pkgs.rubyowo.catppuccin-papirus-folders.override {flavor = "macchiato"; accent = "pink";}; name = "Papirus"; }; font = { @@ -32,5 +32,5 @@ }; # cursor theme - config.home.file.".icons/default".source = "${(pkgs.callPackage ../packages/catppuccin-cursors {}).frappeSky}/share/icons/Catppuccin-Frappe-Sky-Cursors"; + config.home.file.".icons/default".source = "${(pkgs.callPackage ../packages/catppuccin-cursors {}).macchiatoPink}/share/icons/Catppuccin-Macchiato-Pink-Cursors"; } diff --git a/users/rei/apps/hyprland.nix b/users/rei/apps/hyprland.nix index 7712097..1c1d0b6 100644 --- a/users/rei/apps/hyprland.nix +++ b/users/rei/apps/hyprland.nix @@ -22,8 +22,8 @@ xdg.configFile."hypr/hyprpaper.conf".text = builtins.readFile ../confs/hypr/hyprpaper.conf; - xdg.configFile."hypr/frappe.conf".text = - builtins.readFile ../confs/hypr/frappe.conf; + xdg.configFile."hypr/macchiato.conf".text = + builtins.readFile ../confs/hypr/macchiato.conf; systemd.user.targets.hyprland-session = { Unit = { diff --git a/users/rei/apps/mako.nix b/users/rei/apps/mako.nix index 844e394..7ca5c37 100644 --- a/users/rei/apps/mako.nix +++ b/users/rei/apps/mako.nix @@ -11,9 +11,9 @@ defaultTimeout = 10000; groupBy = "summary"; - backgroundColor = "#303446"; - textColor = "#c6d0f5"; - borderColor = "#99d1db"; - progressColor = "#414559"; + backgroundColor = "#24273a"; + textColor = "#cad3f5"; + borderColor = "#f5bde6"; + progressColor = "#363a4f"; }; } diff --git a/users/rei/apps/rofi.nix b/users/rei/apps/rofi.nix index 3d9cd7c..37c38ad 100644 --- a/users/rei/apps/rofi.nix +++ b/users/rei/apps/rofi.nix @@ -23,20 +23,20 @@ in hide-scrollbar = true; sidebar-mode = true; font = "FantasqueSansMono Nerd Font 14"; - display-drun = " Apps"; + display-drun = "Apps"; drun-display-format = "{name}"; }; theme = let inherit (config.lib.formats.rasi) mkLiteral; in { "*" = { - bg-col = mkLiteral "#303446"; - bg-col-light = mkLiteral "#303446"; - border-col = mkLiteral "#414559"; - selected-col = mkLiteral "#303446"; - sky = mkLiteral "#99d1db"; - fg-col = mkLiteral "#c6d0f5"; - fg-col2 = mkLiteral "@sky"; - grey = mkLiteral "#737994"; + bg-col = mkLiteral "#24273a"; + bg-col-light = mkLiteral "#24273a"; + border-col = mkLiteral "#363a4f"; + selected-col = mkLiteral "#24273a"; + pink = mkLiteral "#f5bde6"; + fg-col = mkLiteral "#cad3f5"; + fg-col2 = mkLiteral "@pink"; + grey = mkLiteral "#6e738d"; width = mkLiteral "450px"; }; @@ -64,7 +64,7 @@ in }; prompt = { - background-color = mkLiteral "@sky"; + background-color = mkLiteral "@pink"; padding = mkLiteral "6px"; text-color = mkLiteral "@bg-col"; border-radius = mkLiteral "15px"; @@ -117,7 +117,7 @@ in "button selected" = { background-color = mkLiteral "@bg-col"; - text-color = mkLiteral "@sky"; + text-color = mkLiteral "@pink"; }; }; }; diff --git a/users/rei/apps/waybar.nix b/users/rei/apps/waybar.nix index fe2a7c9..ca26e25 100644 --- a/users/rei/apps/waybar.nix +++ b/users/rei/apps/waybar.nix @@ -24,7 +24,7 @@ disable-scroll = true; sort-by-name = true; format = "{icon}"; - format-icons = {default = "";}; + format-icons = {default = "";}; }; pulseaudio = { @@ -93,6 +93,6 @@ xdg.configFile."waybar/style.css".text = builtins.readFile ../confs/waybar/style.css; - xdg.configFile."waybar/frappe.css".text = - builtins.readFile ../confs/waybar/frappe.css; + xdg.configFile."waybar/macchiato.css".text = + builtins.readFile ../confs/waybar/macchiato.css; } diff --git a/users/rei/apps/xdg.nix b/users/rei/apps/xdg.nix index 883da8c..e3eb68a 100644 --- a/users/rei/apps/xdg.nix +++ b/users/rei/apps/xdg.nix @@ -11,16 +11,16 @@ enable = true; createDirectories = true; - download = "~/downloads"; - desktop = "~/desktop"; - documents = "~/documents"; + download = "${config.home.homeDirectory}/downloads"; + desktop = "${config.home.homeDirectory}/desktop"; + documents = "${config.home.homeDirectory}/documents"; - publicShare = "~/.local/public"; - templates = "~/.local/templates"; + publicShare = "${config.home.homeDirectory}/.local/public"; + templates = "${config.home.homeDirectory}/.local/templates"; - music = "~/media/music"; - pictures = "~/media/pictures"; - videos = "~/media/videos"; + music = "${config.home.homeDirectory}/media/music"; + pictures = "${config.home.homeDirectory}/media/pictures"; + videos = "${config.home.homeDirectory}/media/videos"; }; mimeApps = { diff --git a/users/rei/apps/zsh.nix b/users/rei/apps/zsh.nix index 59fb972..ded450b 100644 --- a/users/rei/apps/zsh.nix +++ b/users/rei/apps/zsh.nix @@ -27,7 +27,7 @@ envExtra = '' export MCFLY_KEY_SCHEME=vim export MCFLY_DISABLE_MENU=TRUE - export BAT_THEME="frappe" + export BAT_THEME="macchiato" ''; initExtra = '' @@ -73,7 +73,7 @@ rev = "dbb1ec93b30dbe8cd728cffe0974aa7fa1ac3298"; sha256 = "0B7g0J6+ZCoe1eErsSEmqO0aNOBi+FB+///vXnuiels="; }; - file = "themes/catppuccin_frappe-zsh-syntax-highlighting.zsh"; + file = "themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh"; } { name = "zsh-syntax-highlighting"; diff --git a/users/rei/confs/bat/frappe.tmTheme b/users/rei/confs/bat/macchiato.tmTheme similarity index 88% rename from users/rei/confs/bat/frappe.tmTheme rename to users/rei/confs/bat/macchiato.tmTheme index f4eb222..0beedb6 100644 --- a/users/rei/confs/bat/frappe.tmTheme +++ b/users/rei/confs/bat/macchiato.tmTheme @@ -10,33 +10,33 @@ settings foreground - #c6d0f5 + #cad3f5 background - #303446 + #24273a caret - #b5bfe2 + #b8c0e0 invisibles - #a5adce + #a5adcb gutterForeground - #949cbb + #939ab7 gutterForegroundHighlight - #a6d189 + #a6da95 lineHighlight - #626880 + #5b6078 selection - #737994 + #6e738d selectionBorder - #303446 + #24273a activeGuide - #ef9f76 + #f5a97f findHighlightForeground - #292c3c + #1e2030 findHighlight - #e5c890 + #eed49f bracketsForeground - #949cbb + #939ab7 bracketContentsForeground - #949cbb + #939ab7 @@ -47,7 +47,7 @@ settings foreground - #737994 + #6e738d fontStyle italic @@ -60,7 +60,7 @@ settings foreground - #a6d189 + #a6da95 fontStyle @@ -73,7 +73,7 @@ settings foreground - #ef9f76 + #f5a97f fontStyle @@ -86,7 +86,7 @@ settings foreground - #ef9f76 + #f5a97f fontStyle @@ -99,7 +99,7 @@ settings foreground - #ef9f76 + #f5a97f fontStyle bold italic @@ -112,7 +112,7 @@ settings foreground - #babbf1 + #b7bdf8 fontStyle italic @@ -125,7 +125,7 @@ settings foreground - #ef9f76 + #f5a97f fontStyle italic @@ -138,7 +138,7 @@ settings foreground - #ef9f76 + #f5a97f fontStyle @@ -159,7 +159,7 @@ settings foreground - #e78284 + #ed8796 fontStyle italic @@ -172,7 +172,7 @@ settings foreground - #ca9ee6 + #c6a0f6 fontStyle bold @@ -185,7 +185,7 @@ settings foreground - #f4b8e4 + #f5bde6 fontStyle bold @@ -198,7 +198,7 @@ settings foreground - #ef9f76 + #f5a97f fontStyle italic @@ -211,7 +211,7 @@ settings foreground - #99d1db + #91d7e3 fontStyle bold @@ -224,7 +224,7 @@ settings foreground - #81c8be + #8bd5ca fontStyle @@ -237,7 +237,7 @@ settings foreground - #81c8be + #8bd5ca fontStyle @@ -250,7 +250,7 @@ settings foreground - #949cbb + #939ab7 fontStyle @@ -263,7 +263,7 @@ settings foreground - #81c8be + #8bd5ca fontStyle italic @@ -276,7 +276,7 @@ settings foreground - #e78284 + #ed8796 fontStyle @@ -289,7 +289,7 @@ settings foreground - #e5c890 + #eed49f fontStyle italic @@ -302,7 +302,7 @@ settings foreground - #e78284 + #ed8796 fontStyle @@ -315,7 +315,7 @@ settings foreground - #f2d5cf + #f4dbd6 fontStyle italic @@ -328,7 +328,7 @@ settings foreground - #f2d5cf + #f4dbd6 fontStyle italic @@ -341,7 +341,7 @@ settings foreground - #8caaee + #8aadf4 fontStyle @@ -354,7 +354,7 @@ settings foreground - #e78284 + #ed8796 fontStyle italic @@ -367,7 +367,7 @@ settings foreground - #99d1db + #91d7e3 fontStyle @@ -380,7 +380,7 @@ settings foreground - #99d1db + #91d7e3 fontStyle italic @@ -393,7 +393,7 @@ settings foreground - #8caaee + #8aadf4 fontStyle italic @@ -406,7 +406,7 @@ settings foreground - #e78284 + #ed8796 fontStyle @@ -419,7 +419,7 @@ settings foreground - #e78284 + #ed8796 fontStyle @@ -432,7 +432,7 @@ settings foreground - #babbf1 + #b7bdf8 fontStyle @@ -445,7 +445,7 @@ settings foreground - #f2d5cf + #f4dbd6 fontStyle italic @@ -458,7 +458,7 @@ settings foreground - #ea999c + #ee99a0 fontStyle italic @@ -471,7 +471,7 @@ settings foreground - #99d1db + #91d7e3 fontStyle @@ -484,7 +484,7 @@ settings foreground - #8caaee + #8aadf4 fontStyle @@ -497,7 +497,7 @@ settings foreground - #8caaee + #8aadf4 fontStyle italic @@ -521,7 +521,7 @@ settings foreground - #8caaee + #8aadf4 fontStyle italic @@ -534,7 +534,7 @@ settings foreground - #f2d5cf + #f4dbd6 fontStyle italic @@ -547,7 +547,7 @@ settings foreground - #c6d0f5 + #cad3f5 fontStyle italic @@ -560,7 +560,7 @@ settings foreground - #f2d5cf + #f4dbd6 fontStyle @@ -573,7 +573,7 @@ settings foreground - #81c8be + #8bd5ca fontStyle @@ -586,7 +586,7 @@ settings foreground - #ef9f76 + #f5a97f fontStyle @@ -599,7 +599,7 @@ settings foreground - #ca9ee6 + #c6a0f6 fontStyle italic @@ -612,7 +612,7 @@ settings foreground - #ea999c + #ee99a0 fontStyle @@ -625,7 +625,7 @@ settings foreground - #f2d5cf + #f4dbd6 fontStyle italic underline @@ -638,7 +638,7 @@ settings foreground - #babbf1 + #b7bdf8 fontStyle bold @@ -651,7 +651,7 @@ settings foreground - #81c8be + #8bd5ca fontStyle italic @@ -664,7 +664,7 @@ settings foreground - #8caaee + #8aadf4 fontStyle bold @@ -677,7 +677,7 @@ settings foreground - #ea999c + #ee99a0 fontStyle italic @@ -690,7 +690,7 @@ settings foreground - #ea999c + #ee99a0 fontStyle bold @@ -703,7 +703,7 @@ settings foreground - #f4b8e4 + #f5bde6 fontStyle @@ -716,7 +716,7 @@ settings foreground - #f4b8e4 + #f5bde6 fontStyle @@ -729,7 +729,7 @@ settings foreground - #e78284 + #ed8796 fontStyle italic @@ -742,7 +742,7 @@ settings foreground - #babbf1 + #b7bdf8 fontStyle italic @@ -755,7 +755,7 @@ settings foreground - #eebebe + #f0c6c6 fontStyle @@ -768,7 +768,7 @@ settings foreground - #81c8be + #8bd5ca fontStyle @@ -781,7 +781,7 @@ settings foreground - #eebebe + #f0c6c6 fontStyle italic @@ -794,7 +794,7 @@ settings foreground - #c6d0f5 + #cad3f5 fontStyle @@ -807,7 +807,7 @@ settings foreground - #81c8be + #8bd5ca fontStyle italic @@ -820,7 +820,7 @@ settings foreground - #81c8be + #8bd5ca fontStyle @@ -833,7 +833,7 @@ settings foreground - #babbf1 + #b7bdf8 fontStyle @@ -846,7 +846,7 @@ settings foreground - #81c8be + #8bd5ca fontStyle @@ -859,9 +859,9 @@ settings foreground - #c6d0f5 + #cad3f5 background - #e78284 + #ed8796 fontStyle @@ -874,9 +874,9 @@ settings foreground - #c6d0f5 + #cad3f5 background - #ca9ee6 + #c6a0f6 fontStyle @@ -889,7 +889,7 @@ settings foreground - #737994 + #6e738d fontStyle @@ -902,7 +902,7 @@ settings foreground - #e78284 + #ed8796 fontStyle @@ -915,7 +915,7 @@ settings foreground - #a6d189 + #a6da95 fontStyle @@ -928,7 +928,7 @@ settings foreground - #e5c890 + #eed49f fontStyle @@ -941,7 +941,7 @@ settings foreground - #e78284 + #ed8796 fontStyle diff --git a/users/rei/confs/cava/config b/users/rei/confs/cava/config index e243327..a8b5057 100644 --- a/users/rei/confs/cava/config +++ b/users/rei/confs/cava/config @@ -2,11 +2,11 @@ gradient = 1 -gradient_color_1 = '#81c8be' -gradient_color_2 = '#99d1db' -gradient_color_3 = '#85c1dc' -gradient_color_4 = '#8caaee' -gradient_color_5 = '#ca9ee6' -gradient_color_6 = '#f4b8e4' -gradient_color_7 = '#ea999c' -gradient_color_8 = '#e78284' +gradient_color_1 = '#8bd5ca' +gradient_color_2 = '#91d7e3' +gradient_color_3 = '#7dc4e4' +gradient_color_4 = '#8aadf4' +gradient_color_5 = '#c6a0f6' +gradient_color_6 = '#f5bde6' +gradient_color_7 = '#ee99a0' +gradient_color_8 = '#ed8796' diff --git a/users/rei/confs/firefox/includes/cascade-colours.css b/users/rei/confs/firefox/includes/cascade-colours.css deleted file mode 100644 index 87b1e75..0000000 --- a/users/rei/confs/firefox/includes/cascade-colours.css +++ /dev/null @@ -1,107 +0,0 @@ -/*---+---+---+---+---+---+---+ - | C | O | L | O | U | R | S | - +---+---+---+---+---+---+---*/ - - -@media (prefers-color-scheme: dark) { :root { - - /* These colours are (mainly) used by the - Container Tabs Plugin */ - --uc-identity-colour-blue: #89B4FA; - --uc-identity-colour-turquoise: #94E2D5; - --uc-identity-colour-green: #A6E3A1; - --uc-identity-colour-yellow: #F9E2AF; - --uc-identity-colour-orange: #FAB387; - --uc-identity-colour-red: #F38BA8; - --uc-identity-colour-pink: #F5C2E7; - --uc-identity-colour-purple: #CBA6F7; - - /* Cascades main Colour Scheme */ - --uc-base-colour: #1E1E2E; - --uc-highlight-colour: #181825; - --uc-inverted-colour: #CDD6F4; - --uc-muted-colour: #6C7086; - --uc-accent-colour: var(--uc-identity-colour-purple); - -}} - - -@media (prefers-color-scheme: light) { :root { - - /* These colours are (mainly) used by the - Container Tabs Plugin */ - --uc-identity-colour-blue: #1E66F5; - --uc-identity-colour-turquoise: #179299; - --uc-identity-colour-green: #40A02B; - --uc-identity-colour-yellow: #DF8E1D; - --uc-identity-colour-orange: #FE640B; - --uc-identity-colour-red: #D20F39; - --uc-identity-colour-pink: #D20F39; - --uc-identity-colour-purple: #8839EF; - - /* Cascades main Colour Scheme */ - --uc-base-colour: #EFF1F5; - --uc-highlight-colour: #DCE0E8; - --uc-inverted-colour: #4C4F69; - --uc-muted-colour: #9CA0B0; - --uc-accent-colour: var(--uc-identity-colour-purple); - -}} - - - - - - -/* Down here I'm just reassigning variables based on the colours set above. - Feel free to play around with these but there is no editing necessary below this line. c: - */ - -:root { - - --lwt-frame: var(--uc-base-colour) !important; - --lwt-accent-color: var(--lwt-frame) !important; - --lwt-text-color: var(--uc-inverted-colour) !important; - - --toolbar-field-color: var(--uc-inverted-colour) !important; - - --toolbar-field-focus-color: var(--uc-inverted-colour) !important; - --toolbar-field-focus-background-color: var(--uc-highlight-colour) !important; - --toolbar-field-focus-border-color: transparent !important; - - --toolbar-field-background-color: var(--lwt-frame) !important; - --lwt-toolbar-field-highlight: var(--uc-inverted-colour) !important; - --lwt-toolbar-field-highlight-text: var(--uc-highlight-colour) !important; - --urlbar-popup-url-color: var(--uc-accent-colour) !important; - - --lwt-tab-text: var(--lwt-text-colour) !important; - - --lwt-selected-tab-background-color: var(--uc-highlight-colour) !important; - - --toolbar-bgcolor: var(--lwt-frame) !important; - --toolbar-color: var(--lwt-text-color) !important; - --toolbarseparator-color: var(--uc-accent-colour) !important; - --toolbarbutton-hover-background: var(--uc-highlight-colour) !important; - --toolbarbutton-active-background: var(--toolbarbutton-hover-background) !important; - - --lwt-sidebar-background-color: var(--lwt-frame) !important; - --sidebar-background-color: var(--lwt-sidebar-background-color) !important; - - --urlbar-box-bgcolor: var(--uc-highlight-colour) !important; - --urlbar-box-text-color: var(--uc-muted-colour) !important; - --urlbar-box-hover-bgcolor: var(--uc-highlight-colour) !important; - --urlbar-box-hover-text-color: var(--uc-inverted-colour) !important; - --urlbar-box-focus-bgcolor: var(--uc-highlight-colour) !important; - -} - - - -.identity-color-blue { --identity-tab-color: var(--uc-identity-colour-blue) !important; --identity-icon-color: var(--uc-identity-colour-blue) !important; } -.identity-color-turquoise { --identity-tab-color: var(--uc-identity-colour-turquoise) !important; --identity-icon-color: var(--uc-identity-colour-turquoise) !important; } -.identity-color-green { --identity-tab-color: var(--uc-identity-colour-green) !important; --identity-icon-color: var(--uc-identity-colour-green) !important; } -.identity-color-yellow { --identity-tab-color: var(--uc-identity-colour-yellow) !important; --identity-icon-color: var(--uc-identity-colour-yellow) !important; } -.identity-color-orange { --identity-tab-color: var(--uc-identity-colour-orange) !important; --identity-icon-color: var(--uc-identity-colour-orange) !important; } -.identity-color-red { --identity-tab-color: var(--uc-identity-colour-red) !important; --identity-icon-color: var(--uc-identity-colour-red) !important; } -.identity-color-pink { --identity-tab-color: var(--uc-identity-colour-pink) !important; --identity-icon-color: var(--uc-identity-colour-pink) !important; } -.identity-color-purple { --identity-tab-color: var(--uc-identity-colour-purple) !important; --identity-icon-color: var(--uc-identity-colour-purple) !important; } diff --git a/users/rei/confs/firefox/includes/cascade-config-mouse.css b/users/rei/confs/firefox/includes/cascade-config-mouse.css deleted file mode 100644 index 659a258..0000000 --- a/users/rei/confs/firefox/includes/cascade-config-mouse.css +++ /dev/null @@ -1,139 +0,0 @@ -/*---+---+---+---+---+---+ - | G | L | O | B | A | L | - +---+---+---+---+---+---*/ - - - :root { - - /* Global Border Radius - * applied to ALL UI elements - */ --uc-border-radius: 0px; - - - /* The distance the Statuspanel floats - * away from the window border - * 0 places directly in the corner - */ --uc-status-panel-spacing: 12px; - -} - - -/* remove window control buttons */ -.titlebar-buttonbox-container { display: none !important; } - - -#pageActionButton { display: none !important; } - - - - - -/*---+---+---+---+---+---+---+ - | T | O | O | L | B | A | R | - +---+---+---+---+---+---+---*/ - - -:root { - - /* Position of the Personal Toolbar - * possible values: - * 0 – toolbar on top - * 4 – toolbar on bottom - */ --uc-toolbar-position: 0; - - /* Darken the Personal Toolbar by X amount - * where X = 1 means pure black - * and X = 0 means no darkening at all - */ --uc-darken-toolbar: .2; - -} - - - - - -/*---+---+---+---+---+---+---+ - | U | R | L | — | B | A | R | - +---+---+---+---+---+---+---*/ - - -:root { - - /* Width of the URL Bar for the Oneline layout - * If enabled the max-width is applied on focus - * otherwise the URL Bar will always be it's min-width - */ --uc-urlbar-min-width: 40vw; - --uc-urlbar-max-width: 40vw; - - /* Position of the URL Bar - * possible values: - * 1 – tabs on the right - * 3 – tabs on the left - */ --uc-urlbar-position: 1; - -} - - -/* Disable the Navigation Buttons */ - -/* Disables the Tracking Protection Shield */ -/* #tracking-protection-icon-container { display: none !important; } */ - -/* Encryption and Permissions icons */ - /* Only hides permission items */ - #identity-permission-box { display: none !important; } - /* Hides encryption AND permission items */ - /* #identity-box { display: none !important } */ - -/* Hide everything BUT the zoom indicator within the URL Bar */ -#page-action-buttons > :not(#urlbar-zoom-button):not(#star-button-box) { display: none !important; } - - -/* Hide the »Go«-arrow in the URL Bar */ -#urlbar-go-button { display: none !important; } - - - - - -/*---+---+---+---+---+---+---+ - | T | A | B | — | B | A | R | - +---+---+---+---+---+---+---*/ - - -:root { - - /* Allow tabs to have dynamic widths based on - * the Tab Bars maximum width - */ --uc-active-tab-width: clamp(100px, 30vw, 300px); - --uc-inactive-tab-width: clamp(100px, 20vw, 200px); - - - /* Enable this to always show the Tab Close button - * possible values: - * show: -moz-inline-block - * hide: none - */ --show-tab-close-button: none; - - /* Enable this to only show the Tab Close button on tab hover - * possible values: - * show: -moz-inline-block - * hide: none - */ --show-tab-close-button-hover: -moz-inline-block; - - - /* Left and Right "dip" of the container indicator - * 0px equals tab width - * higer values make the indicator smaller - */ --container-tabs-indicator-margin: 10px; - - /* Amount of Glow to add to the container indicator - * Setting it to 0 disables the Glow - */ --uc-identity-glow: 0 1px 10px 1px; - -} - - -/* Hide the secondary Tab Label - * e.g. playing indicator (the text, not the icon) */ -.tab-secondary-label { display: none !important; } diff --git a/users/rei/confs/firefox/includes/cascade-config.css b/users/rei/confs/firefox/includes/cascade-config.css deleted file mode 100644 index 10b71db..0000000 --- a/users/rei/confs/firefox/includes/cascade-config.css +++ /dev/null @@ -1,144 +0,0 @@ -/*---+---+---+---+---+---+ - | G | L | O | B | A | L | - +---+---+---+---+---+---*/ - - -:root { - - /* Global Border Radius - * applied to ALL UI elements - */ --uc-border-radius: 5px; - - - /* The distance the Statuspanel floats - * away from the window border - * 0 places directly in the corner - */ --uc-status-panel-spacing: 12px; - -} - - -/* remove window control buttons */ -.titlebar-buttonbox-container { display: none !important; } - - -#pageActionButton { display: none !important; } - -#PanelUI-menu-button { padding: 0px !important; } -#PanelUI-menu-button .toolbarbutton-icon { width: 1px !important; } -#PanelUI-menu-button .toolbarbutton-badge-stack { padding: 0px !important; } - - - - - -/*---+---+---+---+---+---+---+ - | T | O | O | L | B | A | R | - +---+---+---+---+---+---+---*/ - - -:root { - - /* Position of the Personal Toolbar - * possible values: - * 0 – toolbar on top - * 4 – toolbar on bottom - */ --uc-toolbar-position: 4; - - /* Darken the Personal Toolbar by X amount - * where X = 1 means pure black - * and X = 0 means no darkening at all - */ --uc-darken-toolbar: .2; - -} - - - - - -/*---+---+---+---+---+---+---+ - | U | R | L | — | B | A | R | - +---+---+---+---+---+---+---*/ - - -:root { - - /* Width of the URL Bar for the Oneline layout - * If enabled the max-width is applied on focus - * otherwise the URL Bar will always be it's min-width - */ --uc-urlbar-min-width: 35vw; - --uc-urlbar-max-width: 45vw; - - /* Position of the URL Bar - * possible values: - * 1 – tabs on the right - * 3 – tabs on the left - */ --uc-urlbar-position: 1; - -} - - -/* Disable the Navigation Buttons */ -#back-button, -#forward-button { display: none !important; } - -/* Disables the Tracking Protection Shield */ -/* #tracking-protection-icon-container { display: none !important; } */ - -/* Encryption and Permissions icons */ - /* Only hides permission items */ - #identity-permission-box { display: none !important; } - /* Hides encryption AND permission items */ - /* #identity-box { display: none !important } */ - -/* Hide everything BUT the zoom indicator within the URL Bar */ -#page-action-buttons > :not(#urlbar-zoom-button) { display: none !important; } - -/* Hide the »Go«-arrow in the URL Bar */ -#urlbar-go-button { display: none !important; } - - - - - -/*---+---+---+---+---+---+---+ - | T | A | B | — | B | A | R | - +---+---+---+---+---+---+---*/ - - -:root { - - /* Allow tabs to have dynamic widths based on - * the Tab Bars maximum width - */ --uc-active-tab-width: clamp(100px, 30vw, 200px); - --uc-inactive-tab-width: clamp(100px, 20vw, 200px); - - - /* Enable this to always show the Tab Close button - * possible values: - * show: -moz-inline-block - * hide: none - */ --show-tab-close-button: none; - - /* Enable this to only show the Tab Close button on tab hover - * possible values: - * show: -moz-inline-block - * hide: none - */ --show-tab-close-button-hover: none; - - - /* Left and Right "dip" of the container indicator - * 0px equals tab width - * higer values make the indicator smaller - */ --container-tabs-indicator-margin: 10px; - - /* Amount of Glow to add to the container indicator - * Setting it to 0 disables the Glow - */ --uc-identity-glow: 0 1px 10px 1px; - -} - - -/* Hide the secondary Tab Label - * e.g. playing indicator (the text, not the icon) */ -.tab-secondary-label { display: none !important; } diff --git a/users/rei/confs/firefox/includes/cascade-floating-panel.css b/users/rei/confs/firefox/includes/cascade-floating-panel.css deleted file mode 100644 index 46b51b1..0000000 --- a/users/rei/confs/firefox/includes/cascade-floating-panel.css +++ /dev/null @@ -1 +0,0 @@ -#statuspanel #statuspanel-label { margin: 0 0 var(--uc-status-panel-spacing) var(--uc-status-panel-spacing) !important; } diff --git a/users/rei/confs/firefox/includes/cascade-layout.css b/users/rei/confs/firefox/includes/cascade-layout.css deleted file mode 100644 index f25ddce..0000000 --- a/users/rei/confs/firefox/includes/cascade-layout.css +++ /dev/null @@ -1,58 +0,0 @@ -:root { - - --toolbarbutton-border-radius: var(--uc-border-radius) !important; - --tab-border-radius: var(--uc-border-radius) !important; - --arrowpanel-border-radius: var(--uc-border-radius) !important; - -} - - - - - -#main-window, -#toolbar-menubar, -#TabsToolbar, -#navigator-toolbox, -#sidebar-box, -#nav-bar { box-shadow: none !important; } - - -#main-window, -#toolbar-menubar, -#TabsToolbar, -#PersonalToolbar, -#navigator-toolbox, -#sidebar-box, -#nav-bar { - - -moz-appearance: none !important; - border: none !important; - -} - - -/* remove "padding" left and right from tabs */ -.titlebar-spacer { display: none !important; } - - - - - -#PersonalToolbar { - - padding: 6px !important; - box-shadow: inset 0 0 50vh rgba(0, 0, 0, var(--uc-darken-toolbar)) !important;; - -} - - - - - -#statuspanel #statuspanel-label { - - border: none !important; - border-radius: var(--uc-border-radius) !important; - -} diff --git a/users/rei/confs/firefox/includes/cascade-nav-bar.css b/users/rei/confs/firefox/includes/cascade-nav-bar.css deleted file mode 100644 index 7219c3a..0000000 --- a/users/rei/confs/firefox/includes/cascade-nav-bar.css +++ /dev/null @@ -1,39 +0,0 @@ -#nav-bar { - - padding-block-start: 0px !important; - - border: none !important; - box-shadow: none !important; - background: transparent !important; - -} - - -#urlbar, -#urlbar * { - - padding-block-start: 1px !important; - - outline: none !important; - box-shadow: none !important; - -} - - -#urlbar-background { border: transparent !important; } - - -#urlbar[focused='true'] - > #urlbar-background, -#urlbar:not([open]) - > #urlbar-background { background: transparent !important; } - - -#urlbar[open] - > #urlbar-background { background: var(--toolbar-field-background-color) !important; } - - -.urlbarView-row:hover - > .urlbarView-row-inner, -.urlbarView-row[selected] - > .urlbarView-row-inner { background: var(--toolbar-bgcolor) !important; } diff --git a/users/rei/confs/firefox/includes/cascade-responsive-windows-fix.css b/users/rei/confs/firefox/includes/cascade-responsive-windows-fix.css deleted file mode 100644 index 439aadc..0000000 --- a/users/rei/confs/firefox/includes/cascade-responsive-windows-fix.css +++ /dev/null @@ -1,6 +0,0 @@ -@media (min-width: 1000px) { - - #nav-bar { margin: calc((var(--urlbar-min-height) * -1) - 10px) calc(100vw - var(--uc-urlbar-min-width)) 0 0 !important; } - #titlebar { margin-inline-start: var(--uc-urlbar-min-width) !important; } - -} diff --git a/users/rei/confs/firefox/includes/cascade-responsive.css b/users/rei/confs/firefox/includes/cascade-responsive.css deleted file mode 100644 index 6e92d26..0000000 --- a/users/rei/confs/firefox/includes/cascade-responsive.css +++ /dev/null @@ -1,35 +0,0 @@ -@media (min-width: 1000px) { - - - #navigator-toolbox { display: flex; flex-wrap: wrap; } - - - #nav-bar { - - order: var(--uc-urlbar-position); - width: var(--uc-urlbar-min-width); - - } - - - #titlebar { - - order: 2; - width: calc(100vw - var(--uc-urlbar-min-width) - 1px); - - } - - - #PersonalToolbar { - - order: var(--uc-toolbar-position); - width: 100%; - - } - - - #navigator-toolbox:focus-within #nav-bar { width: var(--uc-urlbar-max-width); } - #navigator-toolbox:focus-within #titlebar { width: calc(100vw - var(--uc-urlbar-max-width) - 1px); } - - -} diff --git a/users/rei/confs/firefox/includes/cascade-tabs.css b/users/rei/confs/firefox/includes/cascade-tabs.css deleted file mode 100644 index 6ece4fb..0000000 --- a/users/rei/confs/firefox/includes/cascade-tabs.css +++ /dev/null @@ -1,149 +0,0 @@ -/* remove gap after pinned tabs */ -#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) - > #tabbrowser-arrowscrollbox - > .tabbrowser-tab[first-visible-unpinned-tab] { margin-inline-start: 0 !important; } - - - - - -/* remove tab shadow */ -.tabbrowser-tab - >.tab-stack - > .tab-background { box-shadow: none !important; } - - -/* multi tab selection */ -#tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([multiselected]) - > .tab-stack - > .tab-background:-moz-lwtheme { outline-color: var(--toolbarseparator-color) !important; } - - - - - -/* tab close button options */ -.tabbrowser-tab:not([pinned]) .tab-close-button { display: var(--show-tab-close-button) !important; } -.tabbrowser-tab:not([pinned]):hover .tab-close-button { display: var(--show-tab-close-button-hover) !important } - - - - - -/* adaptive tab width */ -.tabbrowser-tab[selected][fadein]:not([pinned]) { max-width: var(--uc-active-tab-width) !important; } -.tabbrowser-tab[fadein]:not([selected]):not([pinned]) { max-width: var(--uc-inactive-tab-width) !important; } - - - - - -/* container tabs indicator */ -.tabbrowser-tab[usercontextid] - > .tab-stack - > .tab-background - > .tab-context-line { - - margin: -1px var(--container-tabs-indicator-margin) 0 var(--container-tabs-indicator-margin) !important; - height: 1px !important; - - box-shadow: var(--uc-identity-glow) var(--identity-tab-color) !important; - -} - - - - - -/* show favicon when media is playing but tab is hovered */ -.tab-icon-image:not([pinned]) { opacity: 1 !important; } - - -/* Makes the speaker icon to always appear if the tab is playing (not only on hover) */ -.tab-icon-overlay:not([crashed]), -.tab-icon-overlay[pinned][crashed][selected] { - - top: 5px !important; - z-index: 1 !important; - - padding: 1.5px !important; - inset-inline-end: -8px !important; - width: 16px !important; height: 16px !important; - - border-radius: 10px !important; - -} - - -/* style and position speaker icon */ -.tab-icon-overlay:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) { - - stroke: transparent !important; - background: transparent !important; - opacity: 1 !important; fill-opacity: 0.8 !important; - - color: currentColor !important; - - stroke: var(--toolbar-bgcolor) !important; - background-color: var(--toolbar-bgcolor) !important; - -} - - -/* change the colours of the speaker icon on active tab to match tab colours */ -.tabbrowser-tab[selected] .tab-icon-overlay:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) { - - stroke: var(--toolbar-bgcolor) !important; - background-color: var(--toolbar-bgcolor) !important; - -} - - -.tab-icon-overlay:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) { margin-inline-end: 9.5px !important; } - - -.tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]) { - - top: 0 !important; - - padding: 0 !important; - margin-inline-end: 5.5px !important; - inset-inline-end: 0 !important; - -} - - -.tab-icon-overlay:not([crashed])[soundplaying]:hover, -.tab-icon-overlay:not([crashed])[muted]:hover, -.tab-icon-overlay:not([crashed])[activemedia-blocked]:hover { - - color: currentColor !important; - stroke: var(--toolbar-color) !important; - background-color: var(--toolbar-color) !important; - fill-opacity: 0.95 !important; - -} - - -.tabbrowser-tab[selected] .tab-icon-overlay:not([crashed])[soundplaying]:hover, -.tabbrowser-tab[selected] .tab-icon-overlay:not([crashed])[muted]:hover, -.tabbrowser-tab[selected] .tab-icon-overlay:not([crashed])[activemedia-blocked]:hover { - - color: currentColor !important; - stroke: var(--toolbar-color) !important; - background-color: var(--toolbar-color) !important; - fill-opacity: 0.95 !important; - -} - - -/* speaker icon colour fix */ -#TabsToolbar .tab-icon-overlay:not([crashed])[soundplaying], -#TabsToolbar .tab-icon-overlay:not([crashed])[muted], -#TabsToolbar .tab-icon-overlay:not([crashed])[activemedia-blocked] { color: var(--toolbar-color) !important; } - - -/* speaker icon colour fix on hover */ -#TabsToolbar .tab-icon-overlay:not([crashed])[soundplaying]:hover, -#TabsToolbar .tab-icon-overlay:not([crashed])[muted]:hover, -#TabsToolbar .tab-icon-overlay:not([crashed])[activemedia-blocked]:hover { color: var(--toolbar-bgcolor) !important; } diff --git a/users/rei/confs/firefox/includes/cascade-tcr.css b/users/rei/confs/firefox/includes/cascade-tcr.css deleted file mode 100644 index 025b173..0000000 --- a/users/rei/confs/firefox/includes/cascade-tcr.css +++ /dev/null @@ -1,33 +0,0 @@ -#TabsToolbar { display: none !important; } -#nav-bar { width: 100vw !important; } - - - -#browser { position: relative; } -#sidebar-box[sidebarcommand*="tabcenter"] #sidebar-header { display: none; } - -#sidebar-box[sidebarcommand*="tabcenter"]:not([hidden]) { - - display: block; - - position: absolute; - top: 0; bottom: 0; - z-index: 1; - - min-width: 50px; max-width: 50px; - - border-right: none; - - transition: all 0.2s ease; - - overflow: hidden; - -} - -[sidebarcommand*="tabcenter"] #sidebar, -#sidebar-box[sidebarcommand*="tabcenter"]:hover { min-width: 10vw !important; width: 30vw !important; max-width: 250px !important; } - -[sidebarcommand*="tabcenter"] #sidebar { height: 100%; max-height: 100%; } - -#sidebar-box[sidebarcommand*="tabcenter"]:not([hidden]) ~ #appcontent { margin-left: 50px; } -#main-window[inFullscreen][inDOMFullscreen] #appcontent { margin-left: 0; } diff --git a/users/rei/confs/firefox/userChrome.css b/users/rei/confs/firefox/userChrome.css deleted file mode 100644 index 1bb7bbf..0000000 --- a/users/rei/confs/firefox/userChrome.css +++ /dev/null @@ -1,39 +0,0 @@ -/*==============================================================================================* - - +-----+-----+-----+-----+-----+-----+-----+ - | █▀▀ | ▄▀█ | █▀▀ | █▀▀ | ▄▀█ | █▀▄ | █▀▀ | - | █▄▄ | █▀█ | ▄▄█ | █▄▄ | █▀█ | █▄▀ | ██▄ | - +-----+-----+-----+-----+-----+-----+-----+ - - Description: Cascade is a minimalstic and keyboard centered custom theme removing a lot of the - subjective clutter default Firefox comes with. This theme is highly inspired by the - stylistic choices of SimpleFox by Miguel Ávila. 🦊 - https://github.com/migueravila/SimpleFox - - Author: Andreas Grafen - (https://andreas.grafen.info) - - Repository: https://github.com/andreasgrafen/cascade - Thank you Nick, Abdallah, Benyamin and Wael for all the great suggestions for improvements! ♡ - - Nick: https://github.com/nicksundermeyer - Abdallah: https://github.com/HeiWiper - Benyamin: https://github.com/benyaminl - Wael: https://github.com/wael444 - - If you're looking for a **mouse-friendly** clone please check out Waterfall. - https://github.com/crambaud/waterfall - -*==============================================================================================*/ - - - -@import 'includes/cascade-config.css'; -@import 'includes/cascade-colours.css'; - -@import 'includes/cascade-layout.css'; -@import 'includes/cascade-responsive.css'; -@import 'includes/cascade-floating-panel.css'; - -@import 'includes/cascade-nav-bar.css'; -@import 'includes/cascade-tabs.css'; diff --git a/users/rei/confs/foot/frappe.ini b/users/rei/confs/foot/frappe.ini deleted file mode 100644 index b345283..0000000 --- a/users/rei/confs/foot/frappe.ini +++ /dev/null @@ -1,19 +0,0 @@ -[colors] -foreground=c6d0f5 # Text -background=303446 # Base -regular0=51576d # Surface 1 -regular1=e78284 # red -regular2=a6d189 # green -regular3=e5c890 # yellow -regular4=8caaee # blue -regular5=f4b8e4 # pink -regular6=81c8be # teal -regular7=b5bfe2 # Subtext 1 -bright0=626880 # Surface 2 -bright1=e78284 # red -bright2=a6d189 # green -bright3=e5c890 # yellow -bright4=8caaee # blue -bright5=f4b8e4 # pink -bright6=81c8be # teal -bright7=a5adce # Subtext 0 diff --git a/users/rei/confs/foot/macchiato.ini b/users/rei/confs/foot/macchiato.ini new file mode 100644 index 0000000..934c1cb --- /dev/null +++ b/users/rei/confs/foot/macchiato.ini @@ -0,0 +1,19 @@ +[colors] +foreground=cad3f5 # Text +background=24273a # Base +regular0=494d64 # Surface 1 +regular1=ed8796 # red +regular2=a6da95 # green +regular3=eed49f # yellow +regular4=8aadf4 # blue +regular5=f5bde6 # pink +regular6=8bd5ca # teal +regular7=b8c0e0 # Subtext 1 +bright0=5b6078 # Surface 2 +bright1=ed8796 # red +bright2=a6da95 # green +bright3=eed49f # yellow +bright4=8aadf4 # blue +bright5=f5bde6 # pink +bright6=8bd5ca # teal +bright7=a5adcb # Subtext 0 diff --git a/users/rei/confs/hypr/frappe.conf b/users/rei/confs/hypr/frappe.conf deleted file mode 100644 index cdffcab..0000000 --- a/users/rei/confs/hypr/frappe.conf +++ /dev/null @@ -1,29 +0,0 @@ -$rosewater = 0xfff2d5cf -$flamingo = 0xffeebebe -$pink = 0xfff4b8e4 -$mauve = 0xffca9ee6 -$red = 0xffe78284 -$maroon = 0xffea999c -$peach = 0xffef9f76 -$green = 0xffa6d189 -$teal = 0xff81c8be -$sky = 0xff99d1db -$sapphire = 0xff85c1dc -$blue = 0xff8caaee -$lavender = 0xffbabbf1 - -$text = 0xffc6d0f5 -$subtext1 = 0xffb5bfe2 -$subtext0 = 0xffa5adce - -$overlay2 = 0xff949cbb -$overlay1 = 0xff838ba7 -$overlay0 = 0xff737994 - -$surface2 = 0xff626880 -$surface1 = 0xff51576d -$surface0 = 0xff414559 - -$base = 0xff303446 -$mantle = 0xff292c3c -$crust = 0xff232634 diff --git a/users/rei/confs/hypr/hyprland.conf b/users/rei/confs/hypr/hyprland.conf index 0f1f4e9..bc4c54a 100644 --- a/users/rei/confs/hypr/hyprland.conf +++ b/users/rei/confs/hypr/hyprland.conf @@ -1,4 +1,4 @@ -source=~/.config/hypr/frappe.conf +source=~/.config/hypr/macchiato.conf monitor=HDMI-1,1920x1080@60,1920x0,1 monitor=eDP-1,1920x1080@60,1920x1080,1 @@ -20,7 +20,7 @@ general { gaps_out=10 border_size=5 - col.active_border=$sky + col.active_border=$pink col.inactive_border=$surface0 apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse) @@ -69,6 +69,7 @@ exec-once=waybar & windowrule=workspace 1 silent,firefox windowrule=workspace 2 silent,discord +windowrule=workspace 4 silent,Youtube Music windowrule=workspace special silent,title:^(Firefox — Sharing Indicator)$ bind=SUPER,Alt_R,exec,pkill --signal USR1 waybar diff --git a/users/rei/confs/hypr/hyprpaper.conf b/users/rei/confs/hypr/hyprpaper.conf index 28ebd6e..fdb6eb1 100644 --- a/users/rei/confs/hypr/hyprpaper.conf +++ b/users/rei/confs/hypr/hyprpaper.conf @@ -1,5 +1,4 @@ -preload = ~/media/pictures/Cat.png -preload = ~/media/pictures/winter-wall2.png +preload = ~/media/pictures/wallpaper.jpg -wallpaper = eDP-1,~/media/pictures/winter-wall2.png -wallpaper = HDMI-A-1,~/media/pictures/Cat.png +wallpaper = eDP-1,~/media/pictures/wallpaper.jpg +wallpaper = HDMI-A-1,~/media/pictures/wallpaper.jpg diff --git a/users/rei/confs/hypr/macchiato.conf b/users/rei/confs/hypr/macchiato.conf new file mode 100644 index 0000000..10d064d --- /dev/null +++ b/users/rei/confs/hypr/macchiato.conf @@ -0,0 +1,29 @@ +$rosewater = 0xfff4dbd6 +$flamingo = 0xfff0c6c6 +$pink = 0xfff5bde6 +$mauve = 0xffc6a0f6 +$red = 0xffed8796 +$maroon = 0xffee99a0 +$peach = 0xfff5a97f +$green = 0xffa6da95 +$teal = 0xff8bd5ca +$sky = 0xff91d7e3 +$sapphire = 0xff7dc4e4 +$blue = 0xff8aadf4 +$lavender = 0xffb7bdf8 + +$text = 0xffcad3f5 +$subtext1 = 0xffb8c0e0 +$subtext0 = 0xffa5adcb + +$overlay2 = 0xff939ab7 +$overlay1 = 0xff8087a2 +$overlay0 = 0xff6e738d + +$surface2 = 0xff5b6078 +$surface1 = 0xff494d64 +$surface0 = 0xff363a4f + +$base = 0xff24273a +$mantle = 0xff1e2030 +$crust = 0xff181926 diff --git a/users/rei/confs/nvim/lazy-lock.json b/users/rei/confs/nvim/lazy-lock.json index b106724..91b8eb5 100644 --- a/users/rei/confs/nvim/lazy-lock.json +++ b/users/rei/confs/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "Comment.nvim": { "branch": "master", "commit": "5f01c1a89adafc52bf34e3bf690f80d9d726715d" }, + "Comment.nvim": { "branch": "master", "commit": "45dc21a71ad1450606f5e98261badb28db59d74c" }, "FTerm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" }, "LuaSnip": { "branch": "master", "commit": "5570fd797eae0790affb54ea669a150cad76db5d" }, "autosave.nvim": { "branch": "dev", "commit": "bf824e7696fb15c5e853927be16abac1c4fb745a" }, @@ -15,24 +15,24 @@ "focus.nvim": { "branch": "master", "commit": "3d9df42aa4f9b572348418207b752f81adea09a5" }, "formatter.nvim": { "branch": "master", "commit": "8a4c961330cc4688087f23d18fa7d2f1af9a4902" }, "gitsigns.nvim": { "branch": "main", "commit": "2ab3bdf0a40bab53033048c6be75bda86316b55d" }, - "lazy.nvim": { "branch": "main", "commit": "dc150df4560ee381072f69e5931a050329869c31" }, + "lazy.nvim": { "branch": "main", "commit": "434b7d3edd3f9dd485a97edb5b8411e4e7109aea" }, "leap.nvim": { "branch": "main", "commit": "a5c9504290832e6bdbbb6265fd1ff02fc6485d20" }, "lspdiags.nvim": { "branch": "main", "commit": "57217b3f9c3e436f6a91b867ada0d50bc8ad4840" }, - "lualine.nvim": { "branch": "master", "commit": "bfa0d99ba6f98d077dd91779841f1c88b7b5c165" }, + "lualine.nvim": { "branch": "master", "commit": "fffbcb829288c3ca366f17cdb8d46aefb5c1d6f3" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "73a90f6a736b51168ed05d89ed8872f75b98471c" }, "neoscroll.nvim": { "branch": "master", "commit": "54c5c419f6ee2b35557b3a6a7d631724234ba97a" }, "neovim-session-manager": { "branch": "master", "commit": "f8c85da390c5d1ad3bfd229ac2ed805c5742263d" }, - "nui.nvim": { "branch": "main", "commit": "b12db5321c194c10eb34e610fb76ce2c058853fc" }, - "null-ls.nvim": { "branch": "main", "commit": "ef9010b2ac11e2068a8e1d5a4eff576289a1f9a4" }, - "nvim-autopairs": { "branch": "master", "commit": "b5994e6547d64f781cfca853a1aa6174d238fe0e" }, - "nvim-cmp": { "branch": "main", "commit": "8868cf9a09e5f3c2612a22ccb82dcc6d9f0d0d35" }, + "nui.nvim": { "branch": "main", "commit": "5d1ca66829d8fac9965cd18fcc2cd9aa49ba1ea5" }, + "null-ls.nvim": { "branch": "main", "commit": "b26851b3e7ac1c0c85666f8a74e36aef2acb89c6" }, + "nvim-autopairs": { "branch": "master", "commit": "03580d758231956d33c8dd91e2be195106a79fa4" }, + "nvim-cmp": { "branch": "main", "commit": "d09b0c396aaa078cdfe78316ec06940971136e85" }, "nvim-cokeline": { "branch": "master", "commit": "501f93ec84af0d505d95d3827cad470b9c5e86dc" }, - "nvim-lspconfig": { "branch": "master", "commit": "25f0c65bd8fddadbafd0048a68560bf160ceb98c" }, + "nvim-lspconfig": { "branch": "master", "commit": "efafc5d09f1815f29985108f0edfd1fe74b65458" }, "nvim-notify": { "branch": "master", "commit": "b005821516f1f37801a73067afd1cef2dbc4dfe8" }, "nvim-pqf": { "branch": "main", "commit": "d15582d3d0c09280f371fa5f21537cf4530ed330" }, - "nvim-surround": { "branch": "main", "commit": "f0077c3726d243eeaabd2ec280216e8c3ca7da9f" }, - "nvim-treesitter": { "branch": "master", "commit": "9efc2dffc3367e0c724b628675ca7cac13357dc6" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "e2ee8fd7259389deaa898d1216fdc6846a26c627" }, + "nvim-surround": { "branch": "main", "commit": "6aafeeda19a98768d1c17ff6dde5548bc77a1a2d" }, + "nvim-treesitter": { "branch": "master", "commit": "48a3da710369688df80beb2847dabbbd02e2180e" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "b062311ea6da061756ebb591d30f61c9e5b44141" }, "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, "nvim-ts-rainbow": { "branch": "master", "commit": "064fd6c0a15fae7f876c2c6dd4524ca3fad96750" }, "nvim-web-devicons": { "branch": "master", "commit": "05e1072f63f6c194ac6e867b567e6b437d3d4622" }, diff --git a/users/rei/confs/nvim/lua/theme/init.lua b/users/rei/confs/nvim/lua/theme/init.lua index 003960e..0331a48 100755 --- a/users/rei/confs/nvim/lua/theme/init.lua +++ b/users/rei/confs/nvim/lua/theme/init.lua @@ -1,4 +1,4 @@ -vim.g.catppuccin_flavour = 'frappe' +vim.g.catppuccin_flavour = 'macchiato' local colors = require('catppuccin.palettes').get_palette() require('catppuccin').setup({ @@ -23,7 +23,7 @@ require('catppuccin').setup({ path = vim.fn.stdpath('cache') .. '/catppuccin', }, custom_highlights = { - FloatBorder = { fg = colors.sky }, + FloatBorder = { fg = colors.pink }, }, }) diff --git a/users/rei/confs/rofi/powermenu.sh b/users/rei/confs/rofi/powermenu.sh index 693e6b4..9524552 100755 --- a/users/rei/confs/rofi/powermenu.sh +++ b/users/rei/confs/rofi/powermenu.sh @@ -12,7 +12,7 @@ $sleep $reboot $shutdown" | rofi -dmenu\ -i\ - -p " Power") + -p "Power") # Do something based on selected option if [ "$selected_option" == "$lock" ] then diff --git a/users/rei/confs/starship.toml b/users/rei/confs/starship.toml index cbfbd9b..02faa09 100644 --- a/users/rei/confs/starship.toml +++ b/users/rei/confs/starship.toml @@ -8,37 +8,35 @@ add_newline = false disabled = true [character] -success_symbol = " [](#99d1db bold)" -error_symbol = " [ﬦ](#e78284)" +success_symbol = " [ﬦ](#f5bde6 bold)" +error_symbol = " [ﬦ](#ed8796)" [hostname] -ssh_only = true -format = "[$hostname](bold blue) " -disabled = false +disabled = true [cmd_duration] min_time = 1 -format = "(fg:#303446 bg:#303446)[](fg:#8caaee bg:#303446)[ $duration](fg:#303446 bg:#8caaee)[](fg:#8caaee bg:none) " +format = "(fg:#24273a bg:#24273a)[](fg:#c6a0f6 bg:#24273a)[ $duration](fg:#24273a bg:#c6a0f6)[](fg:#c6a0f6 bg:none) " disabled = false -style = "fg:#8caaee bg:#303446" +style = "fg:#c6a0f6 bg:#24273a" [directory] -format = "(fg:#303446 bg:#303446)[](fg:#99d1db bg:#303446)[ $path](fg:#303446 bg:#99d1db)[](fg:#99d1db bg:none) " -style = "fg:#d9d7d6 bg:#303446" +format = "(fg:#24273a bg:#24273a)[](fg:#f5bde6 bg:#24273a)[ $path](fg:#24273a bg:#f5bde6)[](fg:#f5bde6 bg:none) " +style = "fg:#d9d7d6 bg:#24273a" truncation_length = 3 truncate_to_repo=true [nix_shell] -format = "(fg:#303446 bg:#303446)[](fg:#81c8be bg:#303446)[](fg:#303446 bg:#81c8be)[](fg:#81c8be bg:none) " -style = "fg:#81c8be bg:#303446" +format = "(fg:#24273a bg:#24273a)[](fg:#8bd5ca bg:#24273a)[](fg:#24273a bg:#8bd5ca)[](fg:#8bd5ca bg:none) " +style = "fg:#8bd5ca bg:#24273a" [git_branch] -format = "(fg:#303446 bg:#303446)[](fg:#85c1dc bg:#303446)[ $branch](fg:#282c34 bg:#85c1dc)[](fg:#85c1dc bg:none) " -style = "fg:#d9d7d6 bg:#303446" +format = "(fg:#24273a bg:#24273a)[](fg:#f4dbd6 bg:#24273a)[ $branch](fg:#282c34 bg:#f4dbd6)[](fg:#f4dbd6 bg:none) " +style = "fg:#f4dbd6 bg:#24273a" [git_status] -format="(fg:#303446 bg:#303446)[](fg:#99d1db bg:#303446)[ $all_status](fg:#303446 bg:#99d1db)[](fg:#99d1db bg:none) " -style = "fg:#d9d7d6 bg:#303446" +format="(fg:#24273a bg:#24273a)[](fg:#f0c6c6 bg:#24273a)[ $all_status](fg:#24273a bg:#f0c6c6)[](fg:#f0c6c6 bg:none) " +style = "fg:#f0c6c6 bg:#24273a" conflicted = "=" ahead ="${count}" behind = "${count}" diff --git a/users/rei/confs/waybar/frappe.css b/users/rei/confs/waybar/frappe.css deleted file mode 100644 index 18520fb..0000000 --- a/users/rei/confs/waybar/frappe.css +++ /dev/null @@ -1,37 +0,0 @@ -/* -* -* Catppuccin Frappe palette -* Maintainer: rubyowo -* -*/ - -@define-color base #303446; -@define-color mantle #292c3c; -@define-color crust #232634; - -@define-color text #c6d0f5; -@define-color subtext0 #a5adce; -@define-color subtext1 #b5bfe2; - -@define-color surface0 #414559; -@define-color surface1 #51576d; -@define-color surface2 #626880; - -@define-color overlay0 #737994; -@define-color overlay1 #838ba7; -@define-color overlay2 #949cbb; - -@define-color blue #8caaee; -@define-color lavender #babbf1; -@define-color sapphire #85c1dc; -@define-color sky #99d1db; -@define-color teal #81c8be; -@define-color green #a6d189; -@define-color yellow #e5c890; -@define-color peach #ef9f76; -@define-color maroon #ea999c; -@define-color red #e78284; -@define-color mauve #ca9ee6; -@define-color pink #f4b8e4; -@define-color flamingo #eebebe; -@define-color rosewater #f2d5cf; diff --git a/users/rei/confs/waybar/macchiato.css b/users/rei/confs/waybar/macchiato.css new file mode 100644 index 0000000..12bc89c --- /dev/null +++ b/users/rei/confs/waybar/macchiato.css @@ -0,0 +1,37 @@ +/* +* +* Catppuccin Mocha palette +* Maintainer: rubyowo +* +*/ + +@define-color base #24273a; +@define-color mantle #1e2030; +@define-color crust #181926; + +@define-color text #cad3f5; +@define-color subtext0 #a5adcb; +@define-color subtext1 #b8c0e0; + +@define-color surface0 #363a4f; +@define-color surface1 #494d64; +@define-color surface2 #5b6078; + +@define-color overlay0 #6e738d; +@define-color overlay1 #8087a2; +@define-color overlay2 #939ab7; + +@define-color blue #8aadf4; +@define-color lavender #b7bdf8; +@define-color sapphire #7dc4e4; +@define-color sky #91d7e3; +@define-color teal #8bd5ca; +@define-color green #a6da95; +@define-color yellow #eed49f; +@define-color peach #f5a97f; +@define-color maroon #ee99a0; +@define-color red #ed8796; +@define-color mauve #c6a0f6; +@define-color pink #f5bde6; +@define-color flamingo #f0c6c6; +@define-color rosewater #f4dbd6; diff --git a/users/rei/confs/waybar/style.css b/users/rei/confs/waybar/style.css index d30a5c7..bb289ff 100755 --- a/users/rei/confs/waybar/style.css +++ b/users/rei/confs/waybar/style.css @@ -1,4 +1,4 @@ -@import "frappe.css"; +@import "macchiato.css"; * { font-family: FantasqueSansMono Nerd Font; @@ -12,27 +12,28 @@ window#waybar { #workspaces { border-radius: 1rem; - background-color: @surface0; + background-color: @base; margin-top: 1rem; - margin-left: 7px; + margin: 7px 3px 0px 7px; } #workspaces button { - color: @lavender; + color: @mauve; border-radius: 1rem; padding-left: 6px; + margin: 5px 0; box-shadow: inset 0 -3px transparent; transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.68); background-color: transparent; } #workspaces button.active { - color: @sky; + color: @pink; border-radius: 1rem; } #workspaces button:hover { - color: @sapphire; + color: @flamingo; border-radius: 1rem; } @@ -44,7 +45,7 @@ window#waybar { #pulseaudio, #custom-lock, #custom-power { - background-color: @surface0; + background-color: @base; margin: 7px 3px 0px 7px; padding: 10px 5px 10px 5px; border-radius: 1rem; @@ -93,8 +94,8 @@ window#waybar { } tooltip { - background: @surface0; - border: 1px solid @sky; + background: @base; + border: 1px solid @pink; } tooltip label { diff --git a/users/rei/confs/ytmusic/frappe.css b/users/rei/confs/ytmusic/frappe.css deleted file mode 100644 index b3ac571..0000000 --- a/users/rei/confs/ytmusic/frappe.css +++ /dev/null @@ -1,378 +0,0 @@ -html:not(.style-scope) { - --accentColor: #99d1db; - - --dark-background: #292c3c; - --dark-foreground: #303446; - - --light-foreground: #c6d0f5; - --light-foreground-2: #b5bfe2; - --light-foreground-3: #a5adce; - - --scrollWidth: 0px; - - --idk-yet: inherit !important; - - --ytmusic-color-black1: var(--dark-foreground) !important; - --ytmusic-color-black4: var(--dark-background) !important; - - --ytmusic-color-blackpure: var(--idk-yet) !important; - --ytmusic-color-blackpure-alpha0: var(--idk-yet) !important; - --ytmusic-color-blackpure-alpha10: var(--idk-yet) !important; - --ytmusic-color-blackpure-alpha60: var(--idk-yet) !important; - - --ytmusic-color-grey1: var(--light-foreground-3) !important; - --ytmusic-color-grey2: var(--light-foreground-2) !important; - --ytmusic-color-grey3: var(--light-foreground) !important; - --ytmusic-color-grey4: var(--light-foreground-3) !important; - --ytmusic-color-grey5: var(--light-foreground) !important; - - --ytmusic-color-white1: var(--light-foreground) !important; - --ytmusic-color-white1-alpha10: var(--light-foreground-3) !important; - --ytmusic-color-white1-alpha15: var(--light-foreground-3) !important; - --ytmusic-color-white1-alpha20: var(--light-foreground-3) !important; - --ytmusic-color-white1-alpha30: var(--light-foreground-3) !important; - --ytmusic-color-white1-alpha50: var(--light-foreground-3) !important; - --ytmusic-color-white1-alpha70: var(--light-foreground) !important; - - --ytmusic-static-brand-red: var(--light-foreground) !important; - - /*loadingbar*/ - --yt-spec-themed-blue: var(--light-foreground-3) !important; - --yt-spec-dark-blue: var(--light-foreground) !important; - --yt-spec-text-secondary: var(--light-foreground) !important; - --ytmusic-setting-item-toggle-active: var(--light-foreground-2) !important; - - --ytmusic-brand-link-text: var(--idk-yet) !important; - --ytmusic-overlay-background-brand: var(--idk-yet) !important; - --ytmusic-focus-active: var(--idk-yet) !important; - - --ytmusic-detail-header: var(--idk-yet) !important; - --ytmusic-dialog-background-color: var(--dark-background) !important; - --yt-spec-brand-link-text: var(--light-foreground) !important; - - --ytmusic-caption-1_-_color: var(--light-foreground) !important; - - --ytmusic-scrollbar-width: var(--scrollWidth) !important; - --ytd-scrollbar-width: var(--scrollWidth) !important; - --ytd-scrollbar-scrubber_-_background: var(---dark-background); -} - -/*Unique to the desktop ytmdesktop app*/ -i.material-icons/*The icons they added; not present on the web version*/ { - color: var(--light-foreground) !important; -} -i.material-icons:hover { - color: var(--light-foreground) !important; -} -/*Unique to the desktop ytmdesktop app*/ -body { - background: var(--dark-background) !important; -} - -ytmusic-nav-bar { - background: var(--dark-foreground) !important; -} - -/*hide the youtube logo at the top left*/ -.yt-simple-endpoint[aria-label="Home"] { - visibility: hidden !important; -} - -/*Home, Explore, Library colors*/ -ytmusic-pivot-bar-item-renderer:hover, - ytmusic-pivot-bar-item-renderer.iron-selected/*highlighted word*/ { - color: var(--light-foreground-3) !important; -} -ytmusic-pivot-bar-item-renderer/*non-selected item*/ { - color: var(--light-foreground-3) !important; -} - -ytmusic-search-box, -ytmusic-search-box *:not([id="placeholder"]) { - color: var(--light-foreground) !important; - --iron-icon-fill-color: var(--accentColor) !important; -} - -ytmusic-search-box input::placeholder { - color: var(--light-foreground-2) !important; -} - -ytmusic-search-box #placeholder { - color: var(--light-foreground-3) !important; -} - -/*Next and previous button colors*/ -.ytmusic-search-box .navigation-icon .iron-icon .iron-icon path { - color: var(--light-foreground-3) !important; -} - -/*color 'new recommendations' pop-up*/ -a.ytmusic-content-update-chip { - color: var(--ytmusic-color-black4) !important; - background-color: var(--ytmusic-color-grey2) !important; -} - -ytmusic-detail-header-renderer { - background-color: var(--ytmusic-color-black4) !important; -} - -.title.ytmusic-detail-header-renderer { - color: var(--light-foreground) !important; -} - -ytmusic-player-page { - background-color: var(--ytmusic-color-black4) !important; -} -ytmusic-data-bound-header-renderer { - background-color: var(--dark-foreground) !important; -} -ytmusic-list-item-renderer { - background-color: var(--ytmusic-color-black1) !important; -} -ytmusic-responsive-list-item-renderer { - background-color: var(--ytmusic-color-black1) !important; -} -ytmusic-player-queue-item { - background-color: var(--ytmusic-color-black1) !important; -} -paper-tab.iron-selected.ytmusic-player-page/*Up Next color*/ { - /*depriciated*/ - color: var(--light-foreground) !important; -} -tp-yt-paper-tab.iron-selected.ytmusic-player-page/*ammended up next color Update*/ { - color: var(--light-foreground) !important; -} -tp-yt-paper-tab.ytmusic-player-page { - color: var(--light-foreground) !important; -} -tp-yt-paper-toast { - background-color: var(--dark-foreground) !important; - color: var(--light-foreground); -} - -paper-tabs.ytmusic-player-page/*up next line color*/ { - --paper-tabs-selection-bar-color: var(--light-foreground) !important; -} -#selectionBar.tp-yt-paper-tabs/*ammended up next line color Update*/ { - border-bottom: 2px solid var(--light-foreground) !important; -} - -yt-formatted-string.byline.style-scope.ytmusic-player-queue-item/*artist part in queue*/ { - color: var(--light-foreground) !important; -} -yt-formatted-string.duration.style-scope.ytmusic-player-queue-item/*length of songs in queue*/ { - color: var(--light-foreground-3) !important; -} - -/*color of the play bar background*/ -ytmusic-player-bar { - background: var(--dark-foreground) !important; -} - -/*color of the progressbar slider*/ -#progress-bar.ytmusic-player-bar { - --paper-slider-active-color: var(--ytmusic-color-white1) !important; -} -#progress-bar.ytmusic-player-bar[focused], -ytmusic-player-bar:hover #progress-bar.ytmusic-player-bar { - --paper-slider-knob-color: var(--ytmusic-color-white1) !important; - --paper-slider-knob-start-color: var(--ytmusic-color-white1) !important; - --paper-slider-knob-start-border-color: var( - --ytmusic-color-white1 - ) !important; -} -/*volume slider*/ -paper-slider#volume-slider { - --paper-slider-container-color: var(--light-foreground-3) !important; - --paper-slider-active-color: var(--light-foreground) !important; - --paper-slider-knob-color: var(--light-foreground) !important; -} -.volume-slider.ytmusic-player-bar, - .expand-volume-slider.ytmusic-player-bar/*ammended volume slider color for Update*/ { - --paper-slider-container-color: var(--light-foreground-3) !important; - --paper-slider-active-color: var(--light-foreground) !important; - --paper-slider-knob-color: var(--light-foreground) !important; -} - -/*play/pause/skip*/ -paper-icon-button#play-pause-button { - --iron-icon-fill-color: var(--accentColor) !important; -} -tp-yt-iron-icon#icon/*ammended play-pause button colors for Update*/ { - --iron-icon-fill-color: var(--accentColor) !important; -} - -.left-controls.ytmusic-player-bar paper-icon-button.ytmusic-player-bar, -.left-controls.ytmusic-player-bar .spinner-container.ytmusic-player-bar, -.toggle-player-page-button.ytmusic-player-bar { - --iron-icon-fill-color: var(--light-foreground) !important; -} -/*nav bar menu icon*/ -.menu.ytmusic-player-bar { - --iron-icon-fill-color: var(--light-foreground) !important; -} - -/*nav bar right button icon colors*/ -.right-controls-buttons.ytmusic-player-bar paper-icon-button.ytmusic-player-bar, -ytmusic-player-expanding-menu.ytmusic-player-bar - paper-icon-button.ytmusic-player-bar { - --paper-icon-button_-_color: var(--light-foreground) !important; -} - -.style-scope.yt-icon-button[aria-label="Add to playlist"]/*add to playlist button Update*/ { - color: var(--light-foreground); -} - -/*color of titles*/ -.title.ytmusic-carousel-shelf-basic-header-renderer, -.autoplay.ytmusic-tab-renderer .title.ytmusic-tab-renderer, -.song-title.ytmusic-player-queue-item, -.content-info-wrapper.ytmusic-player-bar .title.ytmusic-player-bar, -.text.ytmusic-menu-navigation-item-renderer, -.text.ytmusic-menu-service-item-renderer, -.text.ytmusic-toggle-menu-service-item-renderer { - color: var(--light-foreground) !important; -} - -/*Now playing circle*/ -div.content-wrapper.style-scope.ytmusic-play-button-renderer { - background: var(--accentColor) !important; -} - -/*lyrics*/ -.description.ytmusic-description-shelf-renderer { - color: var(--light-foreground) !important; -} - -/*subscribe button*/ -ytmusic-subscribe-button-renderer { - --ytmusic-subscribe-button-color: var(--accentColor) !important; -} - -yt-button-renderer[is-paper-button] { - background-color: var(--ytmusic-color-white1-alpha70) !important; -} - -paper-icon-button { - --paper-icon-button_-_color: var(--ytmusic-color-white1) !important; -} -/*shuffle and radio buttons*/ -.play-button.ytmusic-immersive-header-renderer, -.radio-button.ytmusic-immersive-header-renderer { - background-color: var(--light-foreground) !important; - color: var(--dark-foreground) !important; -} -/*add to library button*/ -ytmusic-data-bound-top-level-menu-item.ytmusic-data-bound-menu-renderer:not(:first-child) { - --yt-button-color: var(--ytmusic-color-white1) !important; - border: 1px solid var(--ytmusic-color-white1) !important; - border-radius: 5px !important; -} -/*shuffle playlist button*/ -yt-button-renderer.watch-button.ytmusic-menu-renderer { - color: var(--ytmusic-color-white1) !important; - background-color: var(--ytmusic-color-white1-alpha70) !important; -} -/*edit playlist button*/ -#top-level-buttons.ytmusic-menu-renderer - > .outline-button.ytmusic-menu-renderer, -.edit-playlist-button.ytmusic-menu-renderer, -ytmusic-toggle-button-renderer.ytmusic-menu-renderer { - --yt-button-color: var(--ytmusic-color-white1) !important; -} - -/*explicit badge*/ -yt-icon.ytmusic-inline-badge-renderer { - color: var(--light-foreground) !important; -} - -/*headers that aren't links*/ -.title.ytmusic-carousel-shelf-basic-header-renderer, -.subtitle.ytmusic-tab-renderer, -.icon.ytmusic-menu-navigation-item-renderer, -.time-info.ytmusic-player-bar { - color: var(--light-foreground-2) !important; -} -/*Songs header*/ -.title.ytmusic-header-renderer { - color: var(--light-foreground-3) !important; -} -yt-formatted-string.strapline.text.style-scope.ytmusic-carousel-shelf-basic-header-renderer { - color: var(--light-foreground-3) !important; -} - -/*Links*/ -yt-formatted-string[has-link-only_]:not([force-default-style]) - a.yt-simple-endpoint.yt-formatted-string { - color: var(--light-foreground) !important; -} -yt-formatted-string[has-link-only_]:not([force-default-style]) - a.yt-simple-endpoint.yt-formatted-string:hover { - color: var(--light-foreground-2) !important; -} -.title.ytmusic-two-row-item-renderer { - color: var(--light-foreground) !important; -} - -.av-toggle.ytmusic-av-toggle { - background-color: var(--dark-background) !important; -} - -ytmusic-av-toggle[playback-mode="ATV_PREFERRED"] - .song-button.ytmusic-av-toggle { - color: var(--dark-foreground) !important; -} - -ytmusic-av-toggle[playback-mode="OMV_PREFERRED"] - .video-button.ytmusic-av-toggle { - color: var(--dark-foreground) !important; -} - -ytmusic-av-toggle[playback-mode="ATV_PREFERRED"] - .video-button.ytmusic-av-toggle { - background-color: var(--dark-foreground) !important; - color: var(--light-foreground) !important; -} - -ytmusic-av-toggle[playback-mode="OMV_PREFERRED"] - .song-button.ytmusic-av-toggle { - background-color: var(--dark-foreground) !important; - color: var(--light-foreground) !important; -} - -/* scroll left and right carousel buttons */ -.previous-items-button.ytmusic-carousel, -.next-items-button.ytmusic-carousel { - background-color: var(--ytmusic-color-white1-alpha70) !important; - color: var(--ytmusic-color-black1) !important; -} - -/* play button that pops up over album art to play immediately */ -.content-wrapper.ytmusic-play-button-renderer, -ytmusic-play-button-renderer:hover - .content-wrapper.ytmusic-play-button-renderer, -ytmusic-play-button-renderer:focus - .content-wrapper.ytmusic-play-button-renderer { - background: var(--ytmusic-color-white1-alpha70) !important; - --ytmusic-play-button-icon-color: var(--ytmusic-color-black1) !important; - --paper-spinner-color: var(--yt-spec-themed-blue) !important; -} - -/* like button color */ -paper-icon-button.ytmusic-like-button-renderer { - color: var(--light-foreground) !important; -} - -/*settings highlighted*/ -.category-menu-item.iron-selected.ytmusic-settings-page { - background-color: var(--light-foreground) !important; -} - -/* some dropdown menus*/ -.dropdown-content { - background-color: var(--dark-foreground) !important; -} - -.cet-titlebar.cet-linux { - background-color: var(--dark-background)!important; -} diff --git a/users/rei/confs/ytmusic/macchiato.css b/users/rei/confs/ytmusic/macchiato.css new file mode 100644 index 0000000..2814be9 --- /dev/null +++ b/users/rei/confs/ytmusic/macchiato.css @@ -0,0 +1,1317 @@ +html:not(.style-scope) +{ + --ctp-rosewater: #f4dbd6; + --ctp-flamingo: #f0c6c6; + --ctp-pink: #f5bde6; + --ctp-mauve: #c6a0f6; + --ctp-red: #ed8796; + --ctp-maroon: #ee99a0; + --ctp-peach: #f5a97f; + --ctp-yellow: #eed49f; + --ctp-green: #a6da95; + --ctp-teal: #8bd5ca; + --ctp-sky: #91d7e3; + --ctp-sapphire: #7dc4e4; + --ctp-blue: #8aadf4; + --ctp-lavender: #b7bdf8; + --ctp-text: #cad3f5; + --ctp-base: #24273a; + --ctp-mantle: #1e2030; + --ctp-crust: #181926; + + --ctp-accent: var(--ctp-pink); + + --unthemed-yet: inherit !important; + + --ytmusic-scrollbar-width: 0px !important; + --ytd-scrollbar-width: 0px !important; + scrollbar-width: none !important; +} + +i.material-icons +{ + color: var(--ctp-text) !important; +} + +i.material-icons:hover +{ + color: var(--ctp-text) !important; +} + +body +{ + background: var(--ctp-base) !important; +} + +ytmusic-nav-bar +{ + background: var(--ctp-mantle) !important; +} + +.yt-simple-endpoint[aria-label="Home"] +{ + visibility:hidden !important; +} + +ytmusic-pivot-bar-item-renderer:hover, ytmusic-pivot-bar-item-renderer.iron-selected +{ + color: var(--ctp-accent) !important; +} + +ytmusic-pivot-bar-item-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-search-box +{ + color: var(--ctp-text) !important; +} + +a.ytmusic-content-update-chip +{ + color: var(--ctp-base) !important; + background-color: var(--ytmusic-color-grey2) !important; +} + +ytmusic-detail-header-renderer +{ + background-color: var(--ctp-base) !important; +} + +.title.ytmusic-detail-header-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-player-page +{ + background-color: var(--ctp-base) !important; +} + +ytmusic-data-bound-header-renderer +{ + background-color: var(--ctp-mantle) !important; +} + +ytmusic-list-item-renderer +{ + background-color: var(--ctp-base) !important; +} + +ytmusic-responsive-list-item-renderer +{ + background-color: var(--ctp-base) !important; +} + +ytmusic-player-queue-item +{ + background-color: var(--ctp-base) !important; +} +paper-tab.iron-selected.ytmusic-player-page +{ + color: var(--ctp-text) !important; +} + +tp-yt-paper-tab.iron-selected.ytmusic-player-page +{ + color: var(--ctp-text) !important; +} +tp-yt-paper-tab.ytmusic-player-page +{ + color: var(--ctp-text) !important; +} + +paper-tabs.ytmusic-player-page +{ + --paper-tabs-selection-bar-color: var(--ctp-text) !important; +} + +#selectionBar.tp-yt-paper-tabs +{ + border-bottom: 2px solid var(--ctp-text) !important; +} + +yt-formatted-string.byline.style-scope.ytmusic-player-queue-item +{ + color: var(--ctp-accent) !important; +} + +yt-formatted-string.duration.style-scope.ytmusic-player-queue-item +{ + color: var(--ctp-text) !important; +} + +ytmusic-player-bar +{ + background: var(--ctp-mantle) !important; +} + +#progress-bar.ytmusic-player-bar +{ + --paper-slider-active-color: var(--ctp-accent) !important; +} + +#progress-bar.ytmusic-player-bar[focused], ytmusic-player-bar:hover #progress-bar.ytmusic-player-bar +{ + --paper-slider-knob-color: var(--ctp-accent) !important; + --paper-slider-knob-start-color: var(--ctp-accent) !important; + --paper-slider-knob-start-border-color: var(--ctp-accent) !important; +} + +paper-slider#volume-slider +{ + --paper-slider-container-color: var(--ctp-text) !important; + --paper-slider-active-color: var(--ctp-text) !important; + --paper-slider-knob-color: var(--ctp-text) !important; +} + +.volume-slider.ytmusic-player-bar, .expand-volume-slider.ytmusic-player-bar +{ + --paper-slider-container-color: var(--ctp-text) !important; + --paper-slider-active-color: var(--ctp-text) !important; + --paper-slider-knob-color: var(--ctp-text) !important; +} + +paper-icon-button#play-pause-button +{ + --iron-icon-fill-color:var(--ctp-text) !important; +} + +tp-yt-iron-icon#icon +{ + --iron-icon-fill-color:var(--ctp-accent) !important; +} + +.left-controls.ytmusic-player-bar paper-icon-button.ytmusic-player-bar, .left-controls.ytmusic-player-bar .spinner-container.ytmusic-player-bar, .toggle-player-page-button.ytmusic-player-bar +{ + --iron-icon-fill-color: var(--ctp-text) !important; +} + +.menu.ytmusic-player-bar +{ + --iron-icon-fill-color: var(--ctp-text) !important; +} + +.right-controls-buttons.ytmusic-player-bar paper-icon-button.ytmusic-player-bar, ytmusic-player-expanding-menu.ytmusic-player-bar paper-icon-button.ytmusic-player-bar +{ + --paper-icon-button_-_color: var(--ctp-text) !important; +} + +.style-scope.yt-icon-button[aria-label="Add to playlist"] +{ + color: var(--ctp-text) +} + +.title.ytmusic-carousel-shelf-basic-header-renderer, .title.ytmusic-immersive-header-renderer, .description.ytmusic-immersive-header-renderer +{ + color: var(--ctp-text) !important; +} + +div.content-wrapper.style-scope.ytmusic-play-button-renderer +{ + background: var(--ctp-text) !important; +} + +ytmusic-subscribe-button-renderer +{ + --ytmusic-subscribe-button-color: var(--ctp-red) !important; +} + +yt-button-renderer[is-paper-button] +{ + background-color: var(--ctp-accent) !important; +} + +paper-icon-button +{ + --paper-icon-button_-_color: var(--ctp-text) !important; +} + +ytmusic-data-bound-top-level-menu-item.ytmusic-data-bound-menu-renderer:not(:first-child) +{ + --yt-button-color: var(--ctp-text) !important; + border: 1px solid var(--ctp-text) !important; + border-radius: 5px !important; +} + +yt-button-renderer.watch-button.ytmusic-menu-renderer +{ + color: var(--ctp-base) !important; + background-color: var(--ctp-accent) !important; +} + +#top-level-buttons.ytmusic-menu-renderer > .outline-button.ytmusic-menu-renderer, .edit-playlist-button.ytmusic-menu-renderer, ytmusic-toggle-button-renderer.ytmusic-menu-renderer +{ + --yt-button-color: var(--ctp-base) !important; + border: 0px solid var(--ctp-base) !important; +} + +yt-icon.ytmusic-inline-badge-renderer +{ + color: var(--ctp-text) !important; +} + +.title.ytmusic-carousel-shelf-basic-header-renderer, .title.ytmusic-immersive-header-renderer, .description.ytmusic-immersive-header-renderer +{ + color: var(--ctp-text) !important; +} + +.title.ytmusic-header-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.strapline.text.style-scope.ytmusic-carousel-shelf-basic-header-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string[has-link-only_]:not([force-default-style]) a.yt-simple-endpoint.yt-formatted-string +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string[has-link-only_]:not([force-default-style]) a.yt-simple-endpoint.yt-formatted-string:hover +{ + color: var(--ctp-text) !important; +} + +.previous-items-button.ytmusic-carousel, .next-items-button.ytmusic-carousel +{ + background-color: var(--ctp-accent) !important; + color: var(--ctp-base) !important; +} + +.content-wrapper.ytmusic-play-button-renderer, ytmusic-play-button-renderer:hover .content-wrapper.ytmusic-play-button-renderer, ytmusic-play-button-renderer:focus .content-wrapper.ytmusic-play-button-renderer +{ + background: var(--ctp-accent) !important; + --ytmusic-play-button-icon-color: var(--ctp-base) !important; + --paper-spinner-color: var(--yt-spec-themed-blue) !important; +} + +paper-icon-button.ytmusic-like-button-renderer +{ + color: var(--ctp-text) !important; +} + +.dropdown-content +{ + background-color: var(--ctp-base) !important; +} + +yt-formatted-string.title.style-scope.ytmusic-two-row-item-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.song-title.style-scope.ytmusic-player-queue-item +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.title.style-scope.ytmusic-player-bar +{ + color: var(--ctp-text) !important; +} + +span.time-info.style-scope.ytmusic-player-bar +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string#description.description.style-scope.ytmusic-detail-header-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string#text.style-scope.yt-button-renderer.style-default +{ + color: var(--ctp-base) !important; +} + +yt-formatted-string#text.style-scope.yt-button-renderer.style-text +{ + color: var(--ctp-base) !important; +} + +tp-yt-paper-toast#toast.toast-button.style-scope.yt-notification-action-renderer.paper-toast-open +{ + /* like button */ +} + +div#icon.tab-icon.style-scope.paper-icon-button.navigation-icon +{ + color: var(--ctp-text) !important; +} + +tp-yt-iron-icon#icon.style-scope.tp-yt-paper-icon-button +{ + color: var(--ctp-accent) !important; +} + +div.style-scope.ytmusic-pivot-bar-renderer.navigation-item +{ + --yt-endpoint-color: var(--ctp-accent) !important; + --yt-endpoint-hover-color: var(--ctp-accent) !important; + --yt-endpoint-visited-color: var(--ctp-accent) !important; +} + +a.yt-simple-endpoint.style-scope.ytmusic-chip-cloud-chip-renderer +{ + color: var(--ctp-text) !important; + background-color: var(--ctp-mantle) !important; +} + +div.label.style-scope.ytmusic-nerd-stats +{ + color: var(--ctp-text) !important; +} + +ytmusic-nerd-stats.style-scope.ytmusic-player-bar{ + color: var(--ctp-text) !important; + background-color: var(--ctp-base) !important; +} + +div.song-media-controls.style-scope.ytmusic-player +{ + color: var(--ctp-text) !important; +} + +div#header.style-scope.ytmusic-item-section-renderer +{ + background-color: var(--ctp-base) !important; +} + +a.yt-simple-endpoint.style-scope.yt-formatted-string +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.fixed-column.MUSIC_RESPONSIVE_LIST_ITEM_COLUMN_DISPLAY_PRIORITY_HIGH.style-scope.ytmusic-responsive-list-item-renderer +{ + color: var(--ctp-accent) !important; +} + +yt-formatted-string.subtitle.style-scope.ytmusic-detail-header-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.second-subtitle.style-scope.ytmusic-detail-header-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-like-button-renderer.style-scope.ytmusic-menu-renderer +{ + color: var(--ctp-accent) !important; +} + +tp-yt-paper-icon-button.ytmusic-like-button-renderer +{ + color: var(--ctp-accent) !important; +} + +yt-icon.icon.style-scope.ytmusic-menu-service-item-renderer +{ + color: var(--ctp-accent) !important; + fill: var(--ctp-accent) !important; +} + +div#navigation-endpoint.yt-simple-endpoint.style-scope.ytmusic-menu-navigation-item-renderer +{ + color: var(--ctp-text) !important; +} + +tp-yt-paper-listbox#items.style-scope.ytmusic-menu-popup-renderer +{ + color: var(--ctp-mantle) !important; + background-color: var(--ctp-mantle) !important; + border: solid 4px; +} + +yt-formatted-string.text.style-scope.ytmusic-menu-service-item-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.text.style-scope.ytmusic-menu-navigation-item-renderer +{ + color: var(--ctp-text) !important; +} + +div#ytmcustom-pip.text.style-scope.ytmusic-menu-navigation-item-renderer +{ + color: var(--ctp-text) !important; +} + +div#ytmcustom-download.text.style-scope.ytmusic-menu-navigation-item-renderer +{ + color: var(--ctp-text) !important; +} + +span.style-scope.yt-formatted-string +{ + color: var(--ctp-text) !important; +} + +g#XMLID_11_.st0 +{ + color: var(--ctp-accent) !important; +} + +div.icon.menu-icon.style-scope.ytmusic-menu-navigation-item-renderer +{ + fill: var(--ctp-accent) !important; + stroke: var(--ctp-accent) !important; +} + +h2.form-title.style-scope.ytmusic-playlist-form +{ + color: var(--ctp-text) !important; +} + +tp-yt-paper-tab.style-scope.ytmusic-playlist-form.iron-selected +{ + color: var(--ctp-accent) !important; +} + +div.tab-content.style-scope.tp-yt-paper-tab +{ + color: var(--ctp-text) !important; +} + +div.content.style-scope.ytmusic-playlist-form +{ + caret-color: var(--ctp-accent) !important; + background-color: var(--ctp-base) !important; + color: var(--ctp-base) !important; +} + +div#player-bar-background.style-scope.ytmusic-app-layout +{ + background-color: var(--ctp-base) !important; +} + +yt-formatted-string.subtitle.style-scope.ytmusic-two-row-item-renderer +{ + color: var(--ctp-text) !important; +} + +button.style-scope.ytmusic-navigation-button-renderer +{ + background: var(--ctp-mantle) !important; + color: var(--ctp-text) !important; +} + +ytmusic-navigation-button-renderer.style-scope.ytmusic-carousel +{ + --ytmusic-navigation-button-left-stripe-color: var(--ctp-accent) !important; +} + +yt-icon.ytmusic-navigation-button-renderer +{ + color: var(--ctp-accent) !important; +} + +yt-icon.style-scope.ytmusic-icon-link-renderer +{ + fill: var(--ctp-accent) !important; +} + +tp-yt-iron-icon.chromecast.style-scope.ytmusic-cast-button +{ + fill: var(--ctp-accent) !important; +} + +ytd-multi-page-menu-renderer.style-scope.ytmusic-popup-container +{ + color: var(--ctp-text) !important; + background-color: var(--ctp-base) !important; +} + +ytd-active-account-header-renderer.style-scope.ytd-multi-page-menu-renderer +{ + color: var(--ctp-text) !important; + background-color: var(--ctp-base) !important; +} + +yt-formatted-string#account-name.style-scope.ytd-active-account-header-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string#channel-handle.style-scope.ytd-active-account-header-renderer +{ + color: var(--ctp-accent) !important; +} + +yt-icon.ytd-compact-link-renderer +{ + color: var(--ctp-accent) !important; +} + +yt-formatted-string.style-scope.ytmusic-shelf-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.strapline.style-scope.ytmusic-shelf-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-search-box[has-query] input.ytmusic-search-box +{ + color: var(--ctp-text) !important; +} + +ytmusic-search-box[opened] input.ytmusic-search-box +{ + color: var(--ctp-text) !important; +} + +div.background-gradient.style-scope.ytmusic-browse-response +{ + background-image: linear-gradient(to bottom, var(--ctp-base), var(--ctp-base)) !important; +} + +ytmusic-search-suggestion +{ + background: var(--ctp-base) !important; + --iron-icon-fill-color: var(--ctp-accent) !important; +} + +a.yt-simple-endpoint.style-scope.ytmusic-responsive-list-item-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-search-suggestions-section.style-scope.ytmusic-search-box +{ + border-top: 1px solid var(--ctp-accent) !important; +} + +ytmusic-search-suggestions-section.style-scope.ytmusic-search-box +{ + background: var(--ctp-base) !important; +} + +div.search-box.style-scope.ytmusic-search-box +{ + background: var(--ctp-mantle) !important; +} + +yt-page-navigation-progress.style-scope.ytmusic-app +{ + --yt-page-navigation-container-color: var(--ctp-base) !important; + --yt-page-navigation-progress-color: var(--ctp-accent) !important; +} + +tp-yt-paper-progress#sliderBar.style-scope.tp-yt-paper-slider +{ + color: var(--ctp-mantle) !important; +} + +tp-yt-paper-slider#progress-bar.style-scope.ytmusic-player-bar +{ + --paper-slider-secondary-color: var(--ctp-crust) !important; + --paper-slider-container-color: var(--ctp-mantle) !important; +} + +img#img.style-scope.yt-img-shadow[src="https://www.gstatic.com/music/listening_review/HOME_RECAP_SHELF_AVATAR_BLACK_60x60.png"] +{ + content: url("https://raw.githubusercontent.com/catppuccin/youtubemusic/main/assets/icons/macchiato.png") !important; +} + +ytmusic-player-expanding-menu#expanding-menu.style-scope.ytmusic-player-bar +{ + background-color: var(--ctp-mantle) !important; +} + +yt-icon.icon.style-scope.ytmusic-menu-navigation-item-renderer +{ + fill: var(--ctp-accent) !important; +} + +yt-formatted-string.text.style-scope.ytmusic-toggle-menu-service-item-renderer +{ + color: var(--ctp-text) !important; +} + +yt-icon.icon.style-scope.ytmusic-toggle-menu-service-item-renderer +{ + fill: var(--ctp-accent) !important; +} + +yt-icon, .yt-icon-container.yt-icon { + width: 80% !important; + height: 80% !important; + padding-left: 10% !important; +} + +yt-formatted-string#label.style-scope.ytd-compact-link-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-upload-ineligible.style-scope.ytmusic-dialog +{ + background-color: var(--ctp-base) !important; +} + +div.title.style-scope.ytmusic-upload-ineligible +{ + color: var(--ctp-text) !important; +} + +div.message.style-scope.ytmusic-upload-ineligible +{ + color: var(--ctp-text) !important; +} + +a.style-scope.ytmusic-upload-ineligible +{ + color: var(--ctp-accent) !important; +} + +tp-yt-paper-button.switch-accounts.style-scope.ytmusic-upload-ineligible +{ + color: var(--ctp-text) !important; +} + +tp-yt-paper-button.dismiss.style-scope.ytmusic-upload-ineligible +{ + color: var(--ctp-text) !important; +} + +ytmusic-settings-page.style-scope.ytmusic-dialog +{ + background-color: var(--ctp-base) !important; + color: var(--ctp-text) !important; + border: 1px var(--ctp-accent) solid !important; +} + +ytmusic-settings-category-collection-renderer.style-scope.ytmusic-settings-page +{ + border: 1px var(--ctp-accent) solid !important; +} + +yt-formatted-string.title.style-scope.ytmusic-settings-page +{ + color: var(--ctp-text) !important; +} + +span.dialog-title.style-scope.ytmusic-settings-page +{ + color: var(--ctp-text) !important; +} + +yt-icon.icon.style-scope.ytmusic-settings-page +{ + color: var(--ctp-accent) !important; +} + +yt-formatted-string.summary.style-scope.ytmusic-setting-read-only-item-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.title.style-scope.ytmusic-setting-read-only-item-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.summary.style-scope.ytmusic-setting-boolean-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.title.style-scope.ytmusic-setting-boolean-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.tab.style-scope.ytmusic-item-section-tab-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-item-section-tab-renderer.iron-selected .tab.ytmusic-item-section-tab-renderer +{ + color: var(--ctp-text) !important; + border-bottom: 2px solid var(--ctp-text) !important; +} + +ytmusic-item-section-tabs-container.style-scope.ytmusic-item-section-tabbed-header-renderer +{ + color: var(--ctp-text) !important; +} + +div#end-items.style-scope.ytmusic-item-section-tabbed-header-renderer +{ + border-top: 1px solid var(--ctp-base) !important; +} + +ytmusic-dropdown-item-renderer.style-scope.ytmusic-dropdown-renderer +{ + background-color: var(--ctp-base) !important; + color: var(--ctp-text) !important; +} + +ytmusic-dropdown-item-renderer.style-scope.ytmusic-dropdown-renderer.iron-selected +{ + background-color: var(--ctp-mantle) !important; + color: var(--ctp-text) !important; +} + +yt-formatted-string.label.style-scope.ytmusic-dropdown-item-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-dropdown-renderer.style-scope.ytmusic-item-section-tabbed-header-renderer +{ + color: var(--ctp-text) !important; + background-color: var(--ctp-base) !important; + border: 1px solid var(--ctp-accent) !important; +} + +input.style-scope.tp-yt-paper-input +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.flex-column.style-scope.ytmusic-responsive-list-item-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.title.style-scope.ytmusic-responsive-list-item-renderer +{ + color: var(--ctp-text) !important; +} + +yt-icon.tab-icon.style-scope.ytmusic-message-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.text.style-scope.ytmusic-message-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.subtext.style-scope.ytmusic-message-renderer +{ + color: var(--ctp-text) !important; +} + +div#header.style-scope.ytmusic-item-section-renderer +{ + border-bottom: 1px solid var(--ctp-base) !important; + box-shadow: none !important; +} + +ytmusic-background-overlay-renderer#background.style-scope.ytmusic-item-thumbnail-overlay-renderer +{ + --ytmusic-background-overlay-background: linear-gradient(var(--ctp-base), #00000000) !important; +} + +yt-formatted-string#suggestion-cell-0x0.title.style-scope.ytmusic-search-suggestion +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string#suggestion-cell-1x0.title.style-scope.ytmusic-search-suggestion +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string#suggestion-cell-2x0.title.style-scope.ytmusic-search-suggestion +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string#suggestion-cell-3x0.title.style-scope.ytmusic-search-suggestion +{ + color: var(--ctp-text) !important; +} + +ytmusic-search-box.style-scope.ytmusic-nav-bar +{ + border: 1px solid var(--ctp-mantle) !important; +} + +img#img.style-scope.yt-img-shadow[src="https://www.gstatic.com/youtube/media/ytm/images/pbg/create-playlist-@210.png"] +{ + content: url("https://raw.githubusercontent.com/catppuccin/youtubemusic/main/assets/icons/macchiato-playlist.png") !important; +} + +ytmusic-tabs#tabs.style-scope.ytmusic-tabbed-search-results-renderer.stuck +{ + background-color: var(--ctp-base) !important; + box-shadow: none !important; +} + +div#tabs.tab-container.style-scope.ytmusic-tabs +{ + border-bottom: none !important; +} + +yt-formatted-string.tab.selected.style-scope.ytmusic-tabs +{ + color: var(--ctp-text) !important; + border-bottom: 2px solid var(--ctp-text) !important; +} + +yt-formatted-string.tab.style-scope.ytmusic-tabs +{ + color: var(--ctp-text) !important; +} + +span.italic.style-scope.yt-formatted-string +{ + color: var(--ctp-accent) !important; +} + +yt-formatted-string#corrected.style-scope.yt-search-query-correction +{ + color: var(--ctp-text) !important; +} + +a.yt-simple-endpoint.style-scope.ytmusic-chip-cloud-chip-renderer +{ + border: 1px solid var(--ctp-accent) !important; +} + +yt-formatted-string.title.style-scope.ytmusic-visual-header-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string#text.style-scope.yt-button-renderer.style-dark-on-white +{ + color: var(--ctp-base) !important; +} + +div.gradient-container.style-scope.ytmusic-visual-header-renderer +{ + background: var(--ctp-base) !important; +} + +tp-yt-paper-icon-button#next-items-button.next-items-button.style-scope.ytmusic-carousel-shelf-renderer +{ + border: solid 1px var(--ctp-accent) !important; +} + +tp-yt-paper-icon-button#previous-items-button.previous-items-button.style-scope.ytmusic-carousel-shelf-renderer +{ + border: solid 1px var(--ctp-accent) !important; +} + +tp-yt-paper-toggle-button[checked]:not([disabled]) .toggle-bar.tp-yt-paper-toggle-button +{ + background-color: var(--ctp-accent) !important; +} + +tp-yt-paper-toggle-button[checked]:not([disabled]) .toggle-button.tp-yt-paper-toggle-button +{ + background-color: var(--ctp-accent) !important; +} + +.toggle-bar.tp-yt-paper-toggle-button +{ + background-color: var(--ctp-text) !important; +} + +.toggle-button.tp-yt-paper-toggle-button +{ + background-color: var(--ctp-text) !important; +} + +.items.ytmusic-setting-category-collection-renderer>*.ytmusic-setting-category-collection-renderer +{ + border-bottom: none !important; +} + +.top-bar.ytmusic-settings-page +{ + border-bottom: none; +} + +div.style-scope.ytmusic-setting-single-option-menu-renderer +{ + color: var(--ctp-text) !important; +} + +span.style-scope.ytmusic-setting-single-option-menu-renderer +{ + color: var(--ctp-text) !important; +} + +div.unfocused-line.style-scope.tp-yt-paper-input-container +{ + background-color: var(--ctp-text) !important; +} + +.focused-line.tp-yt-paper-input-container +{ + border-color: var(--ctp-accent) !important; +} + +tp-yt-iron-icon.style-scope.tp-yt-paper-dropdown-menu +{ + color: var(--ctp-text) !important; +} + +ytd-multi-page-menu-renderer.style-scope.ytd-multi-page-menu-renderer +{ + background: var(--ctp-base) !important; +} + +ytd-simple-menu-header-renderer.style-scope.ytd-multi-page-menu-renderer +{ + background-color: var(--ctp-base) !important; +} + +yt-icon.style-scope.ytd-button-renderer +{ + fill: var(--ctp-text) !important; +} + +yt-formatted-string.style-scope.ytd-simple-menu-header-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string#email.style-scope.ytd-google-account-header-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string#name.style-scope.ytd-google-account-header-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.style-scope.ytd-account-item-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.style-scope.ytd-account-item-section-header-renderer +{ + color: var(--ctp-text) !important; +} + +ytd-account-item-renderer[enable-ring-for-active-account] yt-img-shadow.ytd-account-item-renderer +{ + border: 2px solid var(--ctp-accent) !important; +} + +ytmusic-player[player-ui-state_=MINIPLAYER] .song-media-controls.ytmusic-player +{ + background: linear-gradient(var(--ctp-base) 20%, #00000000 100%) !important; +} + +#thumbnail-corner-overlay.ytmusic-two-row-item-renderer>ytmusic-thumbnail-renderer.ytmusic-two-row-item-renderer +{ + color: var(--ctp-text) !important; + border: 1px solid var(--ctp-text) !important; +} + +.container.ytmusic-custom-index-column-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-custom-index-column-renderer[icon-color-style=CUSTOM_INDEX_COLUMN_ICON_COLOR_STYLE_GREY] .icon.ytmusic-custom-index-column-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-custom-index-column-renderer[icon-color-style=CUSTOM_INDEX_COLUMN_ICON_COLOR_STYLE_GREEN] .icon.ytmusic-custom-index-column-renderer +{ + color: var(--ctp-green) !important; +} + +ytmusic-custom-index-column-renderer[icon-color-style=CUSTOM_INDEX_COLUMN_ICON_COLOR_STYLE_RED] .icon.ytmusic-custom-index-column-renderer +{ + color: var(--ctp-red) !important; +} + +button#button.style-scope.ytmusic-sort-filter-button-renderer +{ + color: var(--ctp-text) !important; + background-color: var(--ctp-base) !important; + border: 1px solid var(--ctp-accent) !important; +} + +#container.ytmusic-multi-select-menu-renderer +{ + border: 1px solid var(--ctp-accent) !important; + background: var(--ctp-base) !important; +} + +#items.ytmusic-multi-select-menu-renderer +{ + background: var(--ctp-base) !important; +} + +yt-formatted-string.text.style-scope.ytmusic-menu-title-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.text.style-scope.ytmusic-multi-select-menu-item-renderer +{ + color: var(--ctp-text) !important; +} + +.title.ytmusic-setting-action-renderer +{ + color: var(--ctp-text) !important; +} + +.summary.ytmusic-setting-action-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.primary-text.style-scope.ytmusic-tastebuilder-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.secondary-text.style-scope.ytmusic-tastebuilder-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.primary-text.style-scope.ytmusic-tastebuilder-item-renderer +{ + color: var(--ctp-text) !important; +} + +div.overlay-effect.style-scope.ytmusic-tastebuilder-item-renderer +{ + background: linear-gradient(var(--ctp-base) 0%, #00000000 100%) !important; + color: var(--ctp-base) !important; +} + +yt-icon.ytmusic-tastebuilder-item-renderer +{ + color: var(--ctp-text) !important; +} + +yt-button-renderer #button.yt-button-renderer +{ + color: var(--ctp-base) !important; +} + +.buttons.ytmusic-tastebuilder-renderer +{ + background: var(--ctp-mantle) !important; +} + +input.ytmusic-search-box, #placeholder.ytmusic-search-box +{ + color: var(--ctp-text) !important; +} + +ytmusic-toggle-button-renderer #button.ytmusic-toggle-button-renderer +{ + background-color: var(--ctp-text) !important; +} + +ytmusic-responsive-list-item-renderer[show-checkbox] yt-checkbox-renderer.ytmusic-responsive-list-item-renderer +{ + --yt-spec-text-primary: var(--ctp-accent) !important; +} + +#input::placeholder +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.non-expandable.description.style-scope.ytmusic-description-shelf-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.footer.style-scope.ytmusic-description-shelf-renderer +{ + color: var(--ctp-text) !important; +} + +tp-yt-paper-icon-button.ytmusic-settings-button +{ + background-color: var(--ctp-text) !important; +} + +yt-img-shadow#avatar.style-scope.ytd-active-account-header-renderer.no-transition +{ + background-color: var(--ctp-text) !important; +} + +yt-multi-page-menu-section-renderer.style-scope.ytd-multi-page-menu-renderer +{ + border-bottom: none !important; +} + +ytd-active-account-header-renderer.style-scope.ytd-multi-page-menu-renderer +{ + border-bottom: none !important; +} + +ytd-multi-page-menu-renderer.style-scope.ytmusic-popup-container +{ + border: 1px solid var(--ctp-accent) !important; +} + +ytmusic-setting-category-collection-renderer.style-scope.ytmusic-settings-page +{ + border-left: none !important; +} + +tp-yt-paper-tabs.tab-header-container.style-scope.ytmusic-player-page +{ + border-bottom: none !important; +} + +ytmusic-item-thumbnail-overlay-renderer.thumbnail-overlay.style-scope.ytmusic-two-row-item-renderer +{ + background: #00000000 !important; +} + +yt-formatted-string.header.style-scope.ytmusic-description-shelf-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.description.style-scope.ytmusic-description-shelf-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-app-layout +{ + --ytmusic-fullscreen-player-overlay-gradient: linear-gradient(#00000000 0%, #00000000 75%, var(--ctp-base) 100%) !important; +} + +div.song-media-controls.style-scope.ytmusic-player +{ + background: linear-gradient(var(--ctp-base) 0%, #00000000 50%) !important; +} + +ytmusic-player-queue-item.style-scope.ytmusic-player-queue +{ + border-bottom: none !important; +} + +yt-multi-page-menu-section-renderer.style-scope.ytd-multi-page-menu-renderer +{ + border-top: none !important; +} + +div#container.style-scope.ytd-google-account-header-renderer +{ + border-bottom: none !important; +} + +ytd-account-section-list-renderer.style-scope.ytd-multi-page-menu-renderer +{ + border-top: none !important; +} + +yt-img-shadow +{ + background: var(--ctp-text) !important; +} + +ytmusic-responsive-list-item-renderer.style-scope.ytmusic-shelf-renderer +{ + border-bottom: none !important; +} + +ytmusic-responsive-list-item-renderer.style-scope.ytmusic-playlist-shelf-renderer +{ + border-bottom: none !important; +} + +yt-formatted-string.style-scope.ytmusic-grid-header-renderer +{ + color: var(--ctp-text) !important; +} + +ytmusic-navigation-button-renderer[button-style=STYLE_SOLID] button.ytmusic-navigation-button-renderer +{ + border-left: 6px solid var(--ctp-accent) !important; +} + +yt-confirm-dialog-renderer.style-scope.ytmusic-popup-container +{ + background: var(--ctp-mantle) !important; +} + +.buttons.yt-confirm-dialog-renderer +{ + border-top: none !important; +} + +yt-formatted-string#title.style-scope.yt-confirm-dialog-renderer +{ + color: var(--ctp-text) !important; +} + +yt-formatted-string.line-text.style-scope.yt-confirm-dialog-renderer +{ + color: var(--ctp-text) !important; +} + +div.value.style-scope.ytmusic-nerd-stats +{ + color: var(--ctp-text) !important; +} + +ytmusic-nerd-stats.style-scope.ytmusic-player +{ + background-color: var(--ctp-base) !important; +} + +tp-yt-iron-overlay-backdrop.opened +{ + color: var(--ctp-crust) !important; + background: var(--ctp-crust) !important; +} + +iron-label#iron-label-1.title.style-scope.ytmusic-tab-renderer +{ + color: var(--ctp-text) !important; +} + +div.subtitle.style-scope.ytmusic-tab-renderer +{ + color: var(--ctp-text) !important; +} + +/* Client-specific changes */ + +div.cet-titlebar.cet-linux.inactive +{ + background-color: var(--ctp-mantle) !important; + color: var(--ctp-text) !important; +} + +tp-yt-paper-item.category-menu-item.style-scope.ytmusic-settings-page.iron-selected +{ + background-color: var(--ctp-crust) !important; +} + +div.cet-titlebar.cet-linux +{ + background-color: var(--ctp-mantle) !important; + color: var(--ctp-text) !important; +} diff --git a/users/rei/confs/ytmusic/style.css b/users/rei/confs/ytmusic/style.css deleted file mode 100644 index 3906053..0000000 --- a/users/rei/confs/ytmusic/style.css +++ /dev/null @@ -1,5 +0,0 @@ -@import url("https://catppuccin.github.io/youtubemusic/src/frappe.css"); - -html:not(.style-scope) { - --accentColor: #99d1db !important; -} diff --git a/users/rei/confs/zsh/catppuccin_frappe-zsh-syntax-highlighting.zsh b/users/rei/confs/zsh/catppuccin_frappe-zsh-syntax-highlighting.zsh deleted file mode 100644 index 37284d0..0000000 --- a/users/rei/confs/zsh/catppuccin_frappe-zsh-syntax-highlighting.zsh +++ /dev/null @@ -1,74 +0,0 @@ -# Catppuccin Frappe Theme (for zsh-syntax-highlighting) -# -# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting -ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor) -typeset -gA ZSH_HIGHLIGHT_STYLES - -# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md -# -## General -### Diffs -### Markup -## Classes -## Comments -ZSH_HIGHLIGHT_STYLES[comment]='fg=#626880' -## Constants -## Entitites -## Functions/methods -ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[function]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[command]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6d189,italic' -ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#ef9f76,italic' -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#ef9f76' -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#ef9f76' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#ca9ee6' -## Keywords -## Built ins -ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6d189' -## Punctuation -ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#e78284' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#e78284' -ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#e78284' -ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#e78284' -## Serializable / Configuration Languages -## Storage -## Strings -ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#e5c890' -## Variables -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[assign]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#c6d0f5' -## No category relevant in spec -ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[path]='fg=#c6d0f5,underline' -ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#e78284,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#c6d0f5,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#e78284,underline' -ZSH_HIGHLIGHT_STYLES[globbing]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#ca9ee6' -#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?' -#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[redirection]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[arg0]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[default]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[cursor]='fg=#c6d0f5' diff --git a/users/rei/confs/zsh/catppuccin_macchiato-zsh-syntax-highlighting.zsh b/users/rei/confs/zsh/catppuccin_macchiato-zsh-syntax-highlighting.zsh new file mode 100644 index 0000000..de6f512 --- /dev/null +++ b/users/rei/confs/zsh/catppuccin_macchiato-zsh-syntax-highlighting.zsh @@ -0,0 +1,74 @@ +# Catppuccin Macchiato Theme (for zsh-syntax-highlighting) +# +# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting +ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor) +typeset -gA ZSH_HIGHLIGHT_STYLES + +# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md +# +## General +### Diffs +### Markup +## Classes +## Comments +ZSH_HIGHLIGHT_STYLES[comment]='fg=#5b6078' +## Constants +## Entitites +## Functions/methods +ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[function]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[command]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6da95,italic' +ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#f5a97f,italic' +ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#f5a97f' +ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#f5a97f' +ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#c6a0f6' +## Keywords +## Built ins +ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6da95' +## Punctuation +ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#ed8796' +ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#ed8796' +ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#ed8796' +ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#ed8796' +## Serializable / Configuration Languages +## Storage +## Strings +ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#eed49f' +ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#eed49f' +ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#eed49f' +ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#eed49f' +ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#eed49f' +## Variables +ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[assign]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#cad3f5' +## No category relevant in spec +ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[path]='fg=#cad3f5,underline' +ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#ed8796,underline' +ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#cad3f5,underline' +ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#ed8796,underline' +ZSH_HIGHLIGHT_STYLES[globbing]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#c6a0f6' +#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?' +#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?' +#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?' +#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?' +ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[redirection]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[arg0]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[default]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[cursor]='fg=#cad3f5' diff --git a/users/rei/env.nix b/users/rei/env.nix index 1de22b5..0a75836 100644 --- a/users/rei/env.nix +++ b/users/rei/env.nix @@ -3,7 +3,7 @@ pkgs, ... }: { - home.sessionVariables = { + home.sessionVariables = rec { EDITOR = "nvim"; GIT_EDITOR = "nvim"; TERMINAL = "foot"; diff --git a/users/rei/packages/catppuccin-gtk/default.nix b/users/rei/packages/catppuccin-gtk/default.nix index 71c97c2..11ca08e 100644 --- a/users/rei/packages/catppuccin-gtk/default.nix +++ b/users/rei/packages/catppuccin-gtk/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "catppuccin-gtk"; src = fetchzip { - url = "https://github.com/catppuccin/gtk/releases/download/v0.4.0/Catppuccin-Frappe-Standard-Sky-Dark.zip"; - sha256 = "sha256-4UTG7PdKiRPlNCXkBCzDr4RbyH+8M1UTSwOyk/kF3Y4="; + url = "https://github.com/catppuccin/gtk/releases/download/v0.4.0/Catppuccin-Macchiato-Standard-Pink-Dark.zip"; + sha256 = "sha256-qDXlGpFQNYiBrCHMmb5cp9t22pAacVJoaqcC96CSGbI="; stripRoot = false; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/themes - cp -r Catppuccin-Frappe-Standard-Sky-Dark $out/share/themes + cp -r Catppuccin-Macchiato-Standard-Pink-Dark $out/share/themes ''; meta = with lib; { diff --git a/users/rei/packages/default.nix b/users/rei/packages/default.nix index 62cb663..f249a8f 100644 --- a/users/rei/packages/default.nix +++ b/users/rei/packages/default.nix @@ -41,7 +41,7 @@ httpie (callPackage ./catppuccin-gtk {}) - (callPackage ./catppuccin-cursors {}).frappeSky + (callPackage ./catppuccin-cursors {}).macchiatoPink (callPackage ./grimblast {}) (callPackage ./hyprpicker {}) ]; diff --git a/wallpapers/wallpaper.jpg b/wallpapers/wallpaper.jpg new file mode 100644 index 0000000..fe3def5 Binary files /dev/null and b/wallpapers/wallpaper.jpg differ