aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjack <[email protected]>2022-11-10 12:38:37 -0700
committerjack <[email protected]>2022-11-10 12:38:37 -0700
commit474574c6bad4839712643552213c7359f28fe97e (patch)
treefa4e7e8ae128abc50a39c2bf7ec24f8cff33f5be
parent8354ee29ff206ef602c0118aea676d71c6f69117 (diff)
downloaddots-474574c6bad4839712643552213c7359f28fe97e.tar.gz
dots-474574c6bad4839712643552213c7359f28fe97e.zip
spicetify & sway update
-rw-r--r--.config/spicetify/Extensions/catppuccin-mocha.js39
-rw-r--r--.config/spicetify/Themes/catppuccin-mocha/color.ini234
-rw-r--r--.config/spicetify/Themes/catppuccin-mocha/user.css272
-rw-r--r--.config/spicetify/Themes/catppuccin/color.ini22
-rw-r--r--.config/spicetify/Themes/catppuccin/user.css622
-rw-r--r--.config/spicetify/config-xpui.ini8
-rw-r--r--.config/sway/config5
-rw-r--r--README.md2
8 files changed, 554 insertions, 650 deletions
diff --git a/.config/spicetify/Extensions/catppuccin-mocha.js b/.config/spicetify/Extensions/catppuccin-mocha.js
new file mode 100644
index 00000000..f752f384
--- /dev/null
+++ b/.config/spicetify/Extensions/catppuccin-mocha.js
@@ -0,0 +1,39 @@
+// Color map
+let colorPalette = {
+ rosewater: "#f5e0dc",
+ flamingo: "#f2cdcd",
+ pink: "#f5c2e7",
+ maroon: "#eba0ac",
+ red: "#f38ba8",
+ peach: "#fab387",
+ yellow: "#f9e2af",
+ green: "#a6e3a1",
+ teal: "#94e2d5",
+ blue: "#89b4fa",
+ sky: "#89dceb",
+ lavender: "#b4befe",
+ white: "#d9e0ee"
+}
+
+// waitForElement borrowed from:
+// https://github.com/morpheusthewhite/spicetify-themes/blob/master/Dribbblish/dribbblish.js
+function waitForElement(els, func, timeout = 100) {
+ const queries = els.map(el => document.querySelector(el));
+ if (queries.every(a => a)) {
+ func(queries);
+ } else if (timeout > 0) {
+ setTimeout(waitForElement, 300, els, func, --timeout);
+ }
+}
+
+// Return the color label for a given hex color value
+function getKeyByValue(object, value) {
+ return Object.keys(object).find(key => object[key] === value.trim());
+}
+
+// Used to select matching equalizer-animated-COLOR.gif
+waitForElement([".Root"], (root) => {
+ let spiceEq = getComputedStyle(document.querySelector(":root")).getPropertyValue("--spice-equalizer");
+ let eqColor = getKeyByValue(colorPalette, spiceEq);
+ root[0].classList.add(`catppuccin-eq-${eqColor}`);
+});
diff --git a/.config/spicetify/Themes/catppuccin-mocha/color.ini b/.config/spicetify/Themes/catppuccin-mocha/color.ini
new file mode 100644
index 00000000..b583aafe
--- /dev/null
+++ b/.config/spicetify/Themes/catppuccin-mocha/color.ini
@@ -0,0 +1,234 @@
+[rosewater]
+text = F5E0DC
+subtext = CDD6F4
+accent = FAE3B0
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 414559
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6C7086
+tab-active = 313244
+notification = 313244
+notification-error = F38BA8
+equalizer = F5E0DC
+misc = 585B70
+
+[flamingo]
+text = F2CDCD
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = F2CDCD
+misc = 585B70
+
+[mauve]
+text = CBA6F7
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = CBA6F7
+misc = 585B70
+
+[pink]
+text = F5C2E7
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = F5C2E7
+misc = 585B70
+
+[maroon]
+text = EBA0AC
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = EBA0AC
+misc = 585B70
+
+[red]
+text = F38BA8
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = F38BA8
+misc = 585B70
+
+[peach]
+text = FAB387
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = FAB387
+misc = 585B70
+
+[yellow]
+text = F9E2AF
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = F9E2AF
+misc = 585B70
+
+[green]
+text = A6E3A1
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = A6E3A1
+misc = 585B70
+
+[teal]
+text = 94E2D5
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = 94E2D5
+misc = 585B70
+
+[blue]
+text = 89B4FA
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = 89B4FA
+misc = 585B70
+
+[sky]
+text = 89DCEB
+subtext = CDD6F4
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = 89DCEB
+misc = 585B70
+
+[lavender]
+text = B4BEFE
+subtext = BAC2DE
+main = 1E1E2E
+sidebar = 181825
+player = 11111B
+card = 313244
+shadow = 181825
+selected-row = 585B70
+button = 7F849C
+button-active = 9399B2
+button-disabled = 6E6C7E
+tab-active = 313244
+notification = 313244
+notification-error = F28FAD
+equalizer = B4BEFE
+misc = 585B70
diff --git a/.config/spicetify/Themes/catppuccin-mocha/user.css b/.config/spicetify/Themes/catppuccin-mocha/user.css
new file mode 100644
index 00000000..b0f04de2
--- /dev/null
+++ b/.config/spicetify/Themes/catppuccin-mocha/user.css
@@ -0,0 +1,272 @@
+/* Color Pallette */
+/* Note: These variables should be used ONLY when needed across ALL of the color palettes. */
+:root {
+ /* Morning */
+ --flamingo: #f2cdcd;
+ --mauve: #cba6f7;
+ --pink: #f5c2e7;
+ --maroon: #eba0ac;
+ --red: #f38ba8;
+ --peach: #fab387;
+ --yellow: #f9e2af;
+ --green: #a6e3a1;
+ --teal: #94e2d5;
+ --blue: #89b4fa;
+ --sky: #89dceb;
+ /* Night */
+ /* --black-0: #161320; */
+ --crust: #11111B;
+ /* --black-1: #1A1826; */
+ --mantle: #181825;
+ /* --black-2: #1E1E2E; */
+ --base: #1E1E2E;
+ /* --black-3: #302D41; */
+ --surface0: #313244;
+ /* --black-4: #575268; */
+ --surface1: #45475A;
+ /* --gray-0: #6E6C7E; */
+ --overlay0: #6C7086;
+ /* --gray-1: #988BA2; */
+ ---overlay1: #7f849C;
+ /* --gray-2: #C3BAC6; */
+ --overlay2: #9399B2;
+ /* --white: #D9E0EE; */
+ --white: #d9e0ee;
+ --lavender: #b4befe;
+ --rosewater: #f5e0dc;
+}
+
+/* Buttons */
+.main-playButton-PlayButton.main-playButton-primary {
+ color: var(--spice-player);
+}
+
+.main-button-primary {
+ background-color: var(--spice-main);
+}
+.main-button-primary:active,
+.main-button-primary:focus,
+.main-button-primary:hover {
+ background-color: var(--spice-sidebar);
+}
+
+.main-view-container button:hover > div[class^='ButtonInner-sc-'] {
+ background-color: var(--spice-button);
+}
+
+.control-button-heart[aria-checked="true"],
+.main-addButton-active,
+.main-addButton-active:focus,
+.main-addButton-active:hover {
+ color: var(--red);
+}
+
+.main-addButton-active:hover {
+ -webkit-transform: scale(1.06);
+ transform: scale(1.06);
+}
+
+/* Progress bar */
+.x-progressBar-progressBarBg > div > div {
+ background-color: var(--spice-text);
+}
+
+/* Top bars */
+.main-entityHeader-backgroundColor,
+.main-actionBarBackground-background,
+.main-view-container main[aria-label="Spotify – Web Player"] > div:first-child {
+ display: none;
+}
+
+.main-topBar-background {
+ background-color: var(--spice-main) !important;
+}
+
+.main-entityHeader-withBackgroundImage {
+ background-color: rgba(var(--spice-rgb-player), 0.2);
+}
+
+/* Sidebar */
+.main-navBar-navBar li:hover > div,
+.main-navBar-navBar li:hover > a:not(.main-navBar-navBarLinkActive),
+.spicetify-playlist-list li:hover {
+ background-color: var(--spice-main);
+}
+
+#spicetify-sticky-list li:hover > div {
+ border-radius: 4px;
+}
+
+/* Scrollbar */
+.os-theme-spotify > .os-scrollbar-horizontal,
+.os-theme-spotify > .os-scrollbar-vertical {
+ padding: 4px;
+}
+
+.os-theme-spotify.os-host-transition
+ > .os-scrollbar-horizontal
+ > .os-scrollbar-track
+ > .os-scrollbar-handle,
+.os-theme-spotify.os-host-transition
+ > .os-scrollbar-vertical
+ > .os-scrollbar-track
+ > .os-scrollbar-handle {
+ background-color: var(--decorative-base);
+ border-radius: 6px;
+}
+
+::-webkit-scrollbar {
+ width: 0.5em;
+}
+::-webkit-scrollbar-thumb {
+ background-color: #575268;
+ border-radius: 4px;
+}
+
+/* Home */
+.main-home-homeHeader {
+ display: none;
+}
+
+.main-home-content
+ > section:first-child
+ > .main-gridContainer-gridContainer
+ > div {
+ background-color: var(--spice-card);
+}
+.main-home-content
+ > section:first-child
+ > .main-gridContainer-gridContainer
+ > div:hover {
+ background-color: var(--spice-misc);
+}
+
+.main-gridContainer-gridContainer > div,
+.main-gridContainer-gridContainer > div > div > div {
+ border-radius: 6px;
+}
+
+/* Cards */
+.main-card-card {
+ border-radius: 6px;
+}
+
+.main-card-imageContainer {
+ margin: -16px -16px 16px -16px;
+}
+
+.main-cardImage-imageWrapper,
+.main-cardImage-image {
+ border-radius: 6px 6px 0 0;
+}
+
+/* Settings */
+input:checked~.x-toggle-indicatorWrapper {
+ background-color: var(---overlay1);
+}
+
+input:hover:not([disabled]):not(:active)~.x-toggle-indicatorWrapper {
+ background-color: var(--spice-button-active);
+}
+
+select option:checked {
+ color: var(--spice-text);
+ font-weight: bold;
+}
+
+/* Animated equalizer */
+/* EQ color classes are specified here in case the js extension is not moved over
+ * The default green eq will be used in this case */
+.catppuccin-eq-rosewater .main-trackList-playingIcon,
+.catppuccin-eq-flamingo .main-trackList-playingIcon,
+.catppuccin-eq-mauve .main-trackList-playingIcon,
+.catppuccin-eq-pink .main-trackList-playingIcon,
+.catppuccin-eq-maroon .main-trackList-playingIcon,
+.catppuccin-eq-red .main-trackList-playingIcon,
+.catppuccin-eq-peach .main-trackList-playingIcon,
+.catppuccin-eq-yellow .main-trackList-playingIcon,
+.catppuccin-eq-green .main-trackList-playingIcon,
+.catppuccin-eq-teal .main-trackList-playingIcon,
+.catppuccin-eq-blue .main-trackList-playingIcon,
+.catppuccin-eq-sky .main-trackList-playingIcon,
+.catppuccin-eq-lavender .main-trackList-playingIcon,
+.catppuccin-eq-white .main-trackList-playingIcon {
+ background-size: cover;
+ padding-left: 100%;
+}
+
+.catppuccin-eq-rosewater .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-rosewater.gif");
+}
+.catppuccin-eq-flamingo .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-flamingo.gif");
+}
+.catppuccin-eq-mauve .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-mauve.gif");
+}
+.catppuccin-eq-pink .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-pink.gif");
+}
+.catppuccin-eq-maroon .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-maroon.gif");
+}
+.catppuccin-eq-red .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-red.gif");
+}
+.catppuccin-eq-peach .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-peach.gif");
+}
+.catppuccin-eq-yellow .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-yellow.gif");
+}
+.catppuccin-eq-green .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-green.gif");
+}
+.catppuccin-eq-teal .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-teal.gif");
+}
+.catppuccin-eq-blue .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-blue.gif");
+}
+.catppuccin-eq-sky .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-sky.gif");
+}
+.catppuccin-eq-lavender .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-lavender.gif");
+}
+.catppuccin-eq-lavender .main-trackList-playingIcon {
+ background-image: url("equalizer-animated-white.gif");
+}
+
+/* For that small dot on podcasts that notify us of new episodes */
+.main-home-content
+ > section:first-child
+ > .main-gridContainer-gridContainer
+ > div
+ span[aria-label],
+span[aria-label="New episode"],
+span[aria-label="New Podcast Episode"] {
+ background: var(--spice-accent, var(--spice-text));
+}
+
+/* Modals */
+.GenericModal[aria-label="Already added"] > div {
+ background-color: var(--spice-card);
+ color: var(--spice-subtext);
+}
+
+.GenericModal[aria-label="Already added"] button:first-child {
+ color: var(--spice-button-active);
+}
+
+.GenericModal[aria-label="Already added"] button:first-child:hover {
+ color: var(--spice-notification-error);
+}
+
+.GenericModal[aria-label="Already added"] button:last-child:hover > div {
+ background-color: var(--spice-button);
+}
+
+.main-rootlist-rootlistItemLink:link, .main-rootlist-rootlistItemLink:visited {
+ z-index: 1;
+}
diff --git a/.config/spicetify/Themes/catppuccin/color.ini b/.config/spicetify/Themes/catppuccin/color.ini
deleted file mode 100644
index 6959131f..00000000
--- a/.config/spicetify/Themes/catppuccin/color.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[Catppuccin]
-; https://github.com/catppuccin/catppuccin
-text = a4b9ef
-subtext = c3bac6
-button-text = dadae8
-main = 1e1e28
-sidebar = 1b1923
-player = 1e1e28
-card = 1e1e28
-shadow = 15121c
-selected-row = 332e41
-sub-button = a4b9ef
-button = a4b9ef
-button-active = a4b9ef
-button-disabled = 1b1923
-sidebar-button = a4b9ef
-play-button = a4b9ef
-tab-active = 1e1e28
-notification = 1e1e28
-notification-error = 1e1e28
-playback-bar = a4b9ef
-misc = dadae8
diff --git a/.config/spicetify/Themes/catppuccin/user.css b/.config/spicetify/Themes/catppuccin/user.css
deleted file mode 100644
index fe315dc8..00000000
--- a/.config/spicetify/Themes/catppuccin/user.css
+++ /dev/null
@@ -1,622 +0,0 @@
-/* Version 14/10/21 */
-
-
-/* TOPBAR */
-
-/* fix topbar bug */
-.main-entityHeader-topbarContent.main-entityHeader-topbarContentFadeIn > * {
- opacity: unset !important;
-}
-
-/* unset colors of history buttons */
-.main-topBar-historyButtons .main-topBar-button {
- background-color: unset;
-}
-
-/* change appearance of search icon on 'search' tab */
-.x-searchInput-searchInputSearchIcon svg {
- color: var(--spice-text);
- height: 17px !important;
- stroke: var(--spice-text);
- stroke-width: 10px;
-}
-
-[role='searchbox']::placeholder {
- color: rgba(var(--spice-rgb-text), 0.5);
-}
-
-/* add topbar transition */
-.queue-tabBar-headerItemLink {
- transition-duration: 0.15s;
-}
-
-/* remove topbar background colour */
-.main-topBar-background {
- background-color: unset !important;
-}
-
-/* resize play-button on topbar */
-.main-topBar-overlay {
- background-color: var(--spice-player);
-}
-
-
-.main-topBar-topbarContent .main-playButton-primary {
- --size: 35px !important;
-}
-
-/* simplify profile menu */
-.main-userWidget-displayName,
-.main-userWidget-notificationIndicator {
- display: none;
-}
-
-.main-avatar-userIcon {
- color: white;
-}
-
-.main-userWidget-box {
- color: var(--spice-subtext);
- background-color: transparent !important;
-}
-
-.main-userWidget-chevron {
- display: none;
-}
-
-/* NAVBAR */
-
-/* navbar bug fix */
-ul.main-navBar-entryPoints > div.GlueDropTarget{
- padding: 0 8px;
-}
-ul.main-navBar-entryPoints > div.GlueDropTarget >* {
- padding: 0 16px;
- height: 40px;
- border-radius: 4px;
-}
-ul.main-navBar-entryPoints > div.GlueDropTarget >*.active {
- background: var(--spice-card);
-}
-
-/* remove divider gradient */
-.main-rootlist-rootlistDividerGradient {
- display: none;
-}
-
-/* change color of divider */
-.main-rootlist-rootlistDivider {
- background-color: rgba(var(--spice-rgb-button-disabled), 0.8);
-}
-
-/* add gradient to navbar */
-.Root__nav-bar {
- background-image: linear-gradient(
- to bottom left,
- var(--spice-sidebar) 0%,
- var(--spice-player) 100%
- ) !important;
-}
-
-/* change color of navbar playing icon */
-[aria-label='Playing'] {
- color: var(--spice-text);
-}
-
-/* change color of navbar icons */
-.main-likedSongsButton-likedSongsIcon {
- background: var(--spice-text);
- color: var(--spice-sidebar);
-}
-
-.main-yourEpisodesButton-yourEpisodesIcon {
- background: var(--spice-text);
-}
-
-.main-yourEpisodesButton-yourEpisodesIcon path {
- fill: var(--spice-sidebar);
-}
-
-/* remove opacity of navbar buttons */
-.main-collectionLinkButton-collectionLinkButton .main-collectionLinkButton-icon, .main-collectionLinkButton-collectionLinkButton .main-collectionLinkButton-collectionLinkText, .main-createPlaylistButton-button {
- opacity: unset;
-}
-
-/* change top margin of navbar options */
-.main-navBar-entryPoints > div:first-of-type {
- margin-top: 20px;
-}
-/* change colors of active tab */
-.main-navBar-navBarLinkActive {
- background-color: var(--spice-sidebar-button);
-}
-
-.main-navBar-navBarLinkActive,
-.main-navBar-navBarLinkActive:focus,
-.main-navBar-navBarLinkActive:hover {
- color: var(--spice-button-text) !important;
-}
-
-
-/* PLAYBACK-BAR */
-
-/* shift bar up when connect bar is visible */
-.now-playing-bar-container>div:first-child:nth-last-child(2) .playback-bar, .main-nowPlayingBar-container>div:first-child:nth-last-child(2) .playback-bar {
- bottom: 107px;
-}
-
-
-/* round cover art when collapsed */
-.main-coverSlotCollapsed-container .cover-art-image {
- border-radius: 10%;
- transition-duration: 0.15s;
-}
-
-.main-coverSlotExpandedCollapseButton-collapseButton {
- right: 10px !important;
- top: 10px !important;
-}
-
-/* hide and move progress time location */
-.playback-bar__progress-time-elapsed.main-type-finale {
- opacity: 0;
- position: absolute;
- bottom: 13px;
- left: 0;
- transition-duration: 0.15s;
-}
-
-.main-playbackBarRemainingTime-container {
- opacity: 0;
- position: absolute;
- bottom: 13px;
- right: 0;
- transition-duration: 0.15s;
-}
-
-/* show time on hover */
-.playback-bar:hover .playback-bar__progress-time-elapsed.main-type-finale,
-.playback-bar:hover .main-playbackBarRemainingTime-container {
- opacity: 1;
-}
-
-/* move progress bar */
-.playback-bar {
- width: 100%;
- bottom: 83px;
- position: absolute;
-}
-
-.player-controls__buttons {
- transform: translateY(6px);
- align-items: center;
-}
-
-/* change progress bar color */
-.playback-bar .progress-bar__fg {
- background-color: var(--spice-playback-bar);
-}
-
-/* change appearance of play-button */
-.main-playPauseButton-button {
- background-color: var(--spice-player);
- color: var(--spice-text);
- transition-duration: 0.15s !important;
-}
-
-.main-playPauseButton-button svg {
- height: 21px;
- width: 21px;
-}
-
-.main-playPauseButton-button:focus, .main-playPauseButton-button:hover {
- transform: scale(1) !important;
- -webkit-transform: scale(1) !important;
-}
-
-/* change progress bar slider color */
-.progress-bar__slider {
- background-color: var(--spice-subtext);
-}
-
-/* BUDDY FEED */
-
-/* change text color */
-.main-buddyFeed-activityMetadata .main-buddyFeed-artistAndTrackName a,
-.main-buddyFeed-activityMetadata .main-buddyFeed-username a,
-.main-buddyFeed-activityMetadata .main-buddyFeed-playbackContextLink,
-p.main-buddyFeed-timestamp.main-type-finale,
-.main-buddyFeed-findFriendsButton .main-buddyFeed-findFriendsIcon {
- color: var(--spice-subtext);
-}
-
-/* add gradient */
-.main-buddyFeed-buddyFeed {
- background-image: linear-gradient(
- to bottom left,
- var(--spice-sidebar) 0%,
- var(--spice-player) 100%
- ) !important;
-}
-
-/* hide buddyfeed scrollbar */
-.main-buddyFeed-scrollableArea > .os-scrollbar {
- display: none;
-}
-
-/* MAIN */
-
-
-/* hide banner ads */
-.main-leaderboardComponent-container {
- display: none;
-}
-
-.desktoproutes-homepage-takeover-ad-hptoComponent-parentContainer,
-.desktoproutes-homepage-takeover-ad-hptoComponent-container {
- display: none !important;
-}
-
-/* hide upgrade button */
-.main-topBar-UpgradeButton {
- display: none;
-}
-
- /* remove vector (circle) from input bar to allow padding to be reduced */
- .jnJioQZqKVcbP_kkmTQ2 {
- opacity: 0;
- }
-
-/* change input box appearance */
-input {
- background-color: unset !important;
- border-bottom: solid 1px var(--spice-text) !important;
- border-radius: 0 !important;
- padding: 6px 10px !important;
- color: var(--spice-text) !important;
-}
-
-/* remove background color from main headers */
-.main-home-homeHeader,
-.x-441-entityHeader-overlay,
-.main-actionBarBackground-background,
-.main-entityHeader-overlay,
-.main-entityHeader-backgroundColor {
- background-color: unset !important;
- background-image: unset !important;
-}
-
-/* change playlist image shadow */
-.main-entityHeader-shadow {
- box-shadow: 0 5px 10px rgba(var(--spice-rgb-shadow), 0.5) !important;
-}
-
-/* change playlist image border-radius */
-.main-entityHeader-image {
- border-radius: 10%;
-}
-
-/* change playing icon from gif to svg */
-.main-trackList-playingIcon {
- -webkit-mask-image: url("data:image/svg+xml,%3Csvg id='playing-icon' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 22 24'%3E%3Cdefs%3E%3Cstyle%3E %23playing-icon %7B fill: %2320BC54; %7D @keyframes play %7B 0%25 %7Btransform: scaleY(1);%7D 3.3%25 %7Btransform: scaleY(0.9583);%7D 6.6%25 %7Btransform: scaleY(0.9166);%7D 9.9%25 %7Btransform: scaleY(0.8333);%7D 13.3%25 %7Btransform: scaleY(0.7083);%7D 16.6%25 %7Btransform: scaleY(0.5416);%7D 19.9%25 %7Btransform: scaleY(0.4166);%7D 23.3%25 %7Btransform: scaleY(0.25);%7D 26.6%25 %7Btransform: scaleY(0.1666);%7D 29.9%25 %7Btransform: scaleY(0.125);%7D 33.3%25 %7Btransform: scaleY(0.125);%7D 36.6%25 %7Btransform: scaleY(0.1666);%7D 39.9%25 %7Btransform: scaleY(0.1666);%7D 43.3%25 %7Btransform: scaleY(0.2083);%7D 46.6%25 %7Btransform: scaleY(0.2916);%7D 49.9%25 %7Btransform: scaleY(0.375);%7D 53.3%25 %7Btransform: scaleY(0.5);%7D 56.6%25 %7Btransform: scaleY(0.5833);%7D 59.9%25 %7Btransform: scaleY(0.625);%7D 63.3%25 %7Btransform: scaleY(0.6666);%7D 66.6%25 %7Btransform: scaleY(0.6666);%7D 69.9%25 %7Btransform: scaleY(0.6666);%7D 73.3%25 %7Btransform: scaleY(0.6666);%7D 76.6%25 %7Btransform: scaleY(0.7083);%7D 79.9%25 %7Btransform: scaleY(0.75);%7D 83.3%25 %7Btransform: scaleY(0.8333);%7D 86.6%25 %7Btransform: scaleY(0.875);%7D 89.9%25 %7Btransform: scaleY(0.9166);%7D 93.3%25 %7Btransform: scaleY(0.9583);%7D 96.6%25 %7Btransform: scaleY(1);%7D %7D %23bar1 %7B transform-origin: bottom; animation: play 0.9s -0.51s infinite; %7D %23bar2 %7B transform-origin: bottom; animation: play 0.9s infinite; %7D %23bar3 %7B transform-origin: bottom; animation: play 0.9s -0.15s infinite; %7D %23bar4 %7B transform-origin: bottom; animation: play 0.9s -0.75s infinite; %7D %3C/style%3E%3C/defs%3E%3Ctitle%3Eplaying-icon%3C/title%3E%3Crect id='bar1' class='cls-1' width='4' height='24'/%3E%3Crect id='bar2' class='cls-1' x='6' width='4' height='24'/%3E%3Crect id='bar3' class='cls-1' x='12' width='4' height='24'/%3E%3Crect id='bar4' class='cls-1' x='18' width='4' height='24'/%3E%3C/svg%3E");
- background: var(--spice-button);
- content-visibility: hidden;
- -webkit-mask-repeat: no-repeat;
-}
-
-/* change appearance of 'playlist' tag */
-.main-entityTitle-subtitle.main-entityTitle-small.main-entityTitle-uppercase.main-entityTitle-bold {
- border: 2px var(--spice-text) solid;
- border-radius: 3px;
- width: fit-content;
- display: inline;
- text-align: center;
- padding: 0 5px;
-}
-
-/* change scrollbar appearance */
-.os-theme-spotify.os-host-transition
- > .os-scrollbar-vertical
- > .os-scrollbar-track
- > .os-scrollbar-handle {
- border-radius: 4px;
- width: 6px;
- background-color: var(--spice-button-disabled)
-}
-
-.os-theme-spotify.os-host-transition
- > .os-scrollbar-vertical
- > .os-scrollbar-track {
- width: 6px;
-}
-
-/* add border under header row */
-.main-trackList-trackListHeaderRow {
- border-bottom: 1px solid rgba(var(--spice-rgb-button-disabled), 0.8);
-}
-
-/* change appearance of main/topbar play-button */
-.main-playButton-PlayButton.main-playButton-primary {
- color: var(--spice-main);
- background-color: var(--spice-play-button);
- box-shadow: var(--spice-shadow) 0 5px 4px 0px;
- transition-duration: 0.15s !important;
-}
-
-/* change appearance of download button */
-.x-downloadButton-button {
- box-shadow: var(--spice-shadow) 0 5px 4px 0px;
- background: var(--spice-player);
- border-radius: 50%;
-}
-
-/* change text color on category cards in 'search' tab */
-a.x-categoryCard-CategoryCard,
-a.x-heroCategoryCard-HeroCategoryCard {
- color: var(--spice-subtext);
-}
-
-/* recolor sub-buttons */
-.main-moreButton-button {
- color: var(--spice-sub-button);
-}
-
-.x-downloadButton-button {
- color: var(--spice-sub-button) !important;
-}
-
-.x-downloadButton-button:hover {
- color: var(--spice-text) !important;
-}
-
-.main-addButton-button {
- color: var(--spice-sub-button);
-}
-
-.main-entityHeader-metaDataText {
- color: var(--spice-sub-button);
-}
-
-.x-sortBox-sortDropdown {
- background-color: var(--spice-selected-row) !important;
-}
-
-.x-filterBox-searchIconContainer {
- color: var(--spice-sub-button) !important;
-}
-
-.x-filterBox-expandButton:focus,
-.x-filterBox-expandButton:hover {
- background-color: var(--spice-selected-row) !important;
-}
-
-.x-sortBox-sortDropdown,
-.x-filterBox-expandButton {
- color: var(--spice-text) !important;
-}
-
-/* change background color of 'home' tab shortcut items */
-.view-homeShortcutsGrid-shortcut {
- background-color: rgba(var(--spice-rgb-selected-row), 0.6) !important;
-}
-
-.view-homeShortcutsGrid-shortcut:focus-within,
-.view-homeShortcutsGrid-shortcut:hover,
-.view-homeShortcutsGrid-shortcut[data-context-menu-open='true'] {
- background-color: var(--spice-selected-row) !important;
-}
-
-/* 'see more' button fix */
-
-.artist-popularTrackList-seeMore {
- color: rgba(var(--spice-rgb-text), 0.7);
-}
-
-/* card background color for editing playlist details */
-.main-playlistEditDetailsModal-descriptionTextarea {
- background: var(--spice-card);
-}
-
-.main-playlistEditDetailsModal-textElementLabel {
- display: none;
-}
-
-/* change color of search icon for new playlists */
-.playlist-inlineSearchBox-searchIcon {
- fill: var(--spice-text) !important;
-}
-
-/* change appearance of verified artist badge */
-.artist-artistVerifiedBadge-badge {
- border: 2px solid var(--spice-text);
- border-radius: 3px;
- width: fit-content;
- text-align: center;
- padding: 0 5px;
-}
-
-span.artist-artistVerifiedBadge-badge path:nth-child(1) {
- display: none;
-}
-
-span.artist-artistVerifiedBadge-badge path:last-child {
- fill: var(--spice-text) !important;
- stroke: var(--spice-text);
-}
-
-.artist-artistVerifiedBadge-badge span {
- font-weight: bold;
-}
-
-/* change text color of hero card on 'library' tab */
-.main-heroCard-card a,
-.collection-collectionEntityHeroCard-descriptionContainer {
- color: var(--spice-subtext) !important;
-}
-
-/* CONTEXT MENU */
-
-
-/* change hover color when selecting in context menu */
-.main-contextMenu-menuItemButton:not(.main-contextMenu-disabled):focus,
-.main-contextMenu-menuItemButton:not(.main-contextMenu-disabled):hover {
- background-color: rgba(0,0,0,.2) !important;
-}
-
-.main-contextMenu-menuItemButton[aria-expanded=true] {
- background-color: rgba(0,0,0,.2) !important;
-}
-
-/* disabled options */
-.main-contextMenu-disabled > span {
- color: rgba(var(--spice-rgb-text), 0.5);
-}
-
-/* dividers between option subgroups */
-.main-contextMenu-menuItem:not(:first-child)
- > .main-contextMenu-dividerBefore:before {
- border-bottom: 1px solid rgba(var(--spice-rgb-button-disabled), 0.5);
-}
-
-/* confirmation box appearance fixes */
-.main-deleteFolderDialog-buttonContainer,
-.main-deletePlaylistDialog-buttonContainer {
- justify-content: space-between !important;
-}
-
-.main-deletePlaylistDialog-container {
- background-color: var(--spice-player);
-}
-
-.main-deletePlaylistDialog-container > *:not(div) {
- color: var(--spice-text);
-}
-
-.main-deletePlaylistDialog-buttonContainer > *:not(div) {
- color: var(--spice-text);
-}
-
-.main-button-primary:hover {
- background-color: var(--spice-button);
-}
-
-.main-button-primary {
- color: white !important;
-}
-
-/* change colors on 'duplicate track' dialog */
-.main-duplicateTracksDialog-container {
- background-color: var(--spice-card);
- color: var(--spice-subtext);
-}
-
-.main-duplicateTracksDialog-secondaryButton {
- color: var(--spice-text);
-}
-
-/* TRACKS GRID */
-
-
-/* change color of track titles */
-.main-trackList-rowTitle {
- color: var(--spice-subtext);
-}
-
-/* change color of 'explicit' badge */
-.main-tag-container {
- background-color: var(--spice-subtext);
-}
-
-/* change background color of selected row */
-.main-trackList-trackListRow.main-trackList-selected, .main-trackList-trackListRow.main-trackList-selected:hover {
- background-color: rgba(var(--spice-rgb-selected-row), 0.8) !important;
-}
-
-.main-trackList-trackListRow:focus-within,
-.main-trackList-trackListRow:hover {
- background-color: rgba(var(--spice-rgb-selected-row), 0.4);
-}
-
-/* When song is currently playing */
-.main-trackList-active .main-type-mesto,
-.main-trackList-active .main-trackList-rowSubTitle,
-.main-trackList-active .main-trackList-rowSubTitle a,
-.main-trackList-active .main-trackList-rowMarker {
- color: var(--spice-button) !important;
-}
-
-.main-trackList-active .main-tag-container {
- background-color: var(--spice-button);
-}
-
-/* When song is hovered/selected */
-.main-trackList-trackListRow.main-trackList-selected:not(.main-trackList-active)
- .main-tag-container,
-.main-trackList-trackListRow:hover:not(.main-trackList-disabled):not(.main-trackList-active)
- .main-tag-container {
- background-color: var(--spice-text);
-}
-
-.main-trackList-trackListRow.main-trackList-selected:not(.main-trackList-active)
- .main-trackList-rowTitle,
-.main-trackList-trackListRow:hover:not(.main-trackList-disabled):not(.main-trackList-active)
- .main-trackList-rowTitle {
- color: var(--spice-text);
-}
-
-.main-trackList-trackListRow.main-trackList-selected:not(.main-trackList-active)
- .main-trackList-rowSubTitle,
-.main-trackList-trackListRow:hover:not(.main-trackList-disabled):not(.main-trackList-active)
- .main-trackList-rowSubTitle {
- color: var(--spice-text) !important;
-}
-
-.main-trackList-trackListRow.main-trackList-selected:not(.main-trackList-active)
- .main-trackList-rowSubTitle a,
-.main-trackList-trackListRow:hover:not(.main-trackList-disabled):not(.main-trackList-active)
- .main-trackList-rowSubTitle a {
- color: unset !important;
-}
-
-.main-trackList-trackListRow.main-trackList-selected:not(.main-trackList-active)
- .main-trackList-rowSectionVariable a,
-.main-trackList-trackListRow:hover:not(.main-trackList-disabled):not(.main-trackList-active)
- .main-trackList-rowSectionVariable a {
- color: var(--spice-text) !important;
-}
-
-
-/* NOTIFICATION */
-
-
-._9eb5acf729a98d62135ca21777fef244-scss {
- color: var(--spice-card);
-}
-
-
-
-/* TEMPORARY */
-
-/* change progress bar color */
-.dt2nNuPMSEfD8Pv4Na9G {
- background-color: var(--spice-playback-bar) !important;
-}
-
-/* change delete playlist dialog box colors */
-._XjIr3Jebi9c96f7h74J {
- background-color: var(--spice-player);
-}
-
-._XjIr3Jebi9c96f7h74J > *:not(div) {
- color: var(--spice-text);
-}
-
-.reDC8RlgDXoQ_bz0umLz > *:not(div) {
- color: white;
-}
-
-.main-deleteFolderDialog-buttonContainer,
-.reDC8RlgDXoQ_bz0umLz {
- justify-content: space-between !important;
-}
-
diff --git a/.config/spicetify/config-xpui.ini b/.config/spicetify/config-xpui.ini
index b7bbc0f8..c4005a5c 100644
--- a/.config/spicetify/config-xpui.ini
+++ b/.config/spicetify/config-xpui.ini
@@ -1,13 +1,13 @@
[Setting]
prefs_path = /home/jack/.config/spotify/prefs
inject_css = 1
-overwrite_assets = 0
+overwrite_assets = 1
replace_colors = 1
spotify_launch_flags =
check_spicetify_upgrade = 0
spotify_path = /opt/spotify/spotify-client/
-current_theme = catppuccin
-color_scheme = Catppuccin
+current_theme = catppuccin-mocha
+color_scheme = lavender
[Preprocesses]
expose_apis = 1
@@ -19,7 +19,7 @@ remove_rtl_rule = 1
[AdditionalOptions]
home_config = 1
experimental_features = 1
-extensions =
+extensions = catppuccin-mocha.js
custom_apps =
sidebar_config = 1
diff --git a/.config/sway/config b/.config/sway/config
index 43d26dd4..e8c140ff 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -31,6 +31,11 @@ exec gentoo-pipewire-launcher
### Input configuration (man 5 sway-input)
# You can get the names of your inputs by running: swaymsg -t get_inputs
+input "1452:588:Apple_Inc._Apple_Internal_Keyboard_/_Trackpad" {
+ xkb_layout us,ru
+ xkb_options grp:ctrls_toggle
+}
+
input "1452:588:bcm5974" {
dwt enabled
tap enabled
diff --git a/README.md b/README.md
index eeb202f5..4c8b78d3 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,6 @@
![zathura](/img/zathura.png)
#### browser
![firefox](/img/browser.png)
-#### spotify
-![spotify](/img/spotify.png)
#### programs/tools:
- window manager: [sway](https://swaywm.org)
- bar: [waybar](https://github.com/Alexays/Waybar)