From c3de5f9330c0ca0af8d397c42577dd996d6e805e Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 13 Mar 2025 22:01:56 -0500 Subject: [PATCH] updating flake, userChrome, and emacs.nix --- .config/eww/scripts/geticons | 1 - .../chrome/ShyFox/shy-floating-search.css | 10 +- .config/firefox/chrome/ShyFox/shy-global.css | 11 +- .config/firefox/chrome/ShyFox/shy-navbar.css | 7 +- .../chrome/ShyFox/shy-sidebar-revamp.css | 101 ++++ .config/firefox/chrome/ShyFox/shy-sidebar.css | 488 +++++++++--------- .config/firefox/chrome/ShyFox/shy-toolbar.css | 284 +++++----- .config/firefox/chrome/userChrome.css | 1 + flake.lock | 24 + modules/emacs.nix | 24 +- 10 files changed, 550 insertions(+), 401 deletions(-) delete mode 160000 .config/eww/scripts/geticons create mode 100644 .config/firefox/chrome/ShyFox/shy-sidebar-revamp.css diff --git a/.config/eww/scripts/geticons b/.config/eww/scripts/geticons deleted file mode 160000 index 2f0215d..0000000 --- a/.config/eww/scripts/geticons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2f0215d4e1003599a72a9b140ee3abe3c83fa799 diff --git a/.config/firefox/chrome/ShyFox/shy-floating-search.css b/.config/firefox/chrome/ShyFox/shy-floating-search.css index ab8757c..aa50386 100644 --- a/.config/firefox/chrome/ShyFox/shy-floating-search.css +++ b/.config/firefox/chrome/ShyFox/shy-floating-search.css @@ -33,17 +33,17 @@ Cool floating search panel width: 64vw !important; /* cool translucent background */ - &:before{ + &::backdrop{ content: ""; position: fixed; pointer-events: none; border-radius: var(--rounding); - width: 200vw; - height: 200vh; + width: 100vw; + height: 100vh; - top: -30vh; - left: -30vw; + top: 0px; + left: 0px; background-color: color-mix(in srgb, var(--bg-col) 80%, transparent); } diff --git a/.config/firefox/chrome/ShyFox/shy-global.css b/.config/firefox/chrome/ShyFox/shy-global.css index 9099dc1..78294b9 100644 --- a/.config/firefox/chrome/ShyFox/shy-global.css +++ b/.config/firefox/chrome/ShyFox/shy-global.css @@ -194,8 +194,8 @@ Styles for dialogs e.g. "confirm deleting extension" position: fixed; z-index: -1; - width: 100vw; - height: 100vh; + width: 100%; + height: 100%; left: 0px; top: 0px; @@ -568,6 +568,13 @@ File Edit View History Bookmarks Tools Help outline: 0px solid transparent; } +/* background color fix */ +#browser:not(.browser-toolbox-background) { + :root[lwtheme] & { + background-image: none !important; + } +} + /* --- ACCENT COLOR ---------------------------------------------------------------------------------------------------------------------------------- diff --git a/.config/firefox/chrome/ShyFox/shy-navbar.css b/.config/firefox/chrome/ShyFox/shy-navbar.css index 5190f33..bfe5573 100644 --- a/.config/firefox/chrome/ShyFox/shy-navbar.css +++ b/.config/firefox/chrome/ShyFox/shy-navbar.css @@ -49,12 +49,17 @@ Navigation bar on top of the window border-top: 0px solid transparent !important; top: 0px; - left: var(--left-margin) !important; right: auto !important; & > * {opacity: var(--dyn-opct);} } +@media not (-moz-bool-pref: "sidebar.revamp") { + #nav-bar { + left: var(--left-margin) !important; + } +} + /* centered navbar text */ #urlbar:not(:is( [breakout][breakout-extend], diff --git a/.config/firefox/chrome/ShyFox/shy-sidebar-revamp.css b/.config/firefox/chrome/ShyFox/shy-sidebar-revamp.css new file mode 100644 index 0000000..b718f12 --- /dev/null +++ b/.config/firefox/chrome/ShyFox/shy-sidebar-revamp.css @@ -0,0 +1,101 @@ +@media (-moz-bool-pref: "sidebar.revamp") { + + @media not (-moz-bool-pref: "sidebar.verticalTabs") { + #browser #tabbrowser-tabbox { + margin-left: var(--margin) !important; + } + } + + @media (-moz-bool-pref: "sidebar.verticalTabs") { + #browser #tabbrowser-tabbox { + margin-right: var(--toolbar-button-wdt) !important; + } + } + + #browser #tabbrowser-tabbox[sidebar-shown] { + margin-left: 0 !important; + } + + #browser #sidebar-box { + padding-block-end: 0 !important; + top: 0 !important; + height: unset !important; + margin-top: var(--top-margin) !important; + margin-bottom: var(--bottom-margin) !important; + transition: var(--transition) !important; + + #sidebar { + border-radius: var(--big-rounding) !important; + } + } + + #browser #sidebar-main { + margin-top: var(--buttonbox-right-hgt) !important; + } + + #browser #sidebar-main { + &:not(:has([expanded])) { + width: var(--toolbar-button-wdt) !important; + } + + &:has([expanded]) { + margin-inline-end: var(--space-small) !important; + } + } + + #browser #sidebar-box browser#sidebar { + margin: unset !important; + } + + moz-button[view*="view"], moz-button[extension] { + --button-outer-padding-inline-start: var(--toolbarbutton-outer-padding) !important; + --button-outer-padding-inline-end: var(--toolbarbutton-outer-padding) !important; + --button-size-icon: calc(var(--size-item-small) + (36px - 16px)) !important; + --button-padding-icon: calc((var(--tab-min-height) - 16px) / 2) !important; + --button-outer-padding-block-start: 0 !important; + --button-outer-padding-block-end: 0 !important; + --button-border-radius: var(--rounding) !important; + margin-inline: var(--toolbarbutton-outer-padding) !important; + margin-block: 3px !important; + } + + moz-button[view="viewCustomizeSidebar"] { + margin-bottom: 5px !important; + } + + /* Native vertical tabs */ + @media (-moz-bool-pref: "sidebar.verticalTabs") { + #vertical-tabs { + .tab-background { + margin-inline-start: var(--toolbar-start-end-padding) !important; + margin-inline-end: var(--toolbarbutton-outer-padding) !important; + } + + .tab-content { + padding-inline: calc(var(--tab-inline-padding) - var(--tab-inner-inline-margin) + var(--toolbar-start-end-padding)) !important; + } + + #tabs-newtab-button { + margin-inline-start: var(--toolbar-start-end-padding) !important; + margin-inline-end: var(--toolbarbutton-outer-padding) !important; + } + + #tabbrowser-tabs[expanded] { + .tabbrowser-tab { + padding-block: 1px 2px !important; + } + + &:first-child { + padding-block: 3px 2px !important; + } + } + } + } + + /* When in Clean mode*/ + #main-window[titlepreface*="‍"]{ + #sidebar-main, #sidebar-launcher-splitter, #sidebar-box, #sidebar-splitter { + display: none !important; + } + } +} \ No newline at end of file diff --git a/.config/firefox/chrome/ShyFox/shy-sidebar.css b/.config/firefox/chrome/ShyFox/shy-sidebar.css index 7d4f00e..2d3493b 100644 --- a/.config/firefox/chrome/ShyFox/shy-sidebar.css +++ b/.config/firefox/chrome/ShyFox/shy-sidebar.css @@ -118,144 +118,149 @@ Styles for sidebar */ -/* activate style when sidebar hidden or clean mode enabled (and not in customizing page) */ -#main-window:is([titlepreface*="᠎"], [titlepreface*="‍"]):not([customizing]){ - - /* styles for both sidebar and bookmaarks toolbar */ - #sidebar-box, - #PersonalToolbar - { - z-index: 2 !important; - width: var(--sdbr-wdt) !important; - - left: calc( - var(--left-margin) - + var(--panel-hide-ldg) - - var(--sdbr-wdt) - ) !important; +@media not (-moz-bool-pref: "sidebar.revamp") { + /* activate style when sidebar hidden or clean mode enabled (and not in customizing page) */ + #main-window:is([titlepreface*="᠎"], [titlepreface*="‍"]):not([customizing]){ + + /* styles for both sidebar and bookmaarks toolbar */ + #sidebar-box, + #sidebar-main, + #PersonalToolbar + { + z-index: 99 !important; + width: var(--sdbr-wdt) !important; - border-radius: var(--big-rounding) !important; - - /* hover target (invisible box between window edge and panel) */ - &::before{ - content: ""; - position: absolute; - z-index: -999; - background-color: var(--debug-col); - - width: 150%; - height: 100%; - right: 0px; - top: 0px; - } - - /* make all panel content invisible (it will visible when hover) */ - & > * { - transition: var(--transition) !important; - opacity: 0; - } - } - - /* styles for sidebar */ - #sidebar-box{ - height: calc( - 100vh - - var(--bookmarks-hgt) - - var(--little-gap) - - var(--top-margin) - - var(--bottom-margin) - - var(--margin) * 2 - ) !important; - - top: calc( - var(--top-margin) - + var(--margin) - + var(--bookmarks-hgt) + var(--little-gap) - ); - - /* indication bar (line on window edge) */ - &::after{ - content: ""; - position: absolute; - transition: var(--transition); - left: calc( - 100% - - var(--panel-hide-ldg) - - var(--margin) - + var(--hide-bar-padding) - ); - - width: calc(var(--margin) - var(--hide-bar-padding) * 2 ); + var(--left-margin) + + var(--panel-hide-ldg) + - var(--sdbr-wdt) + ) !important; + + border-radius: var(--big-rounding) !important; + + /* hover target (invisible box between window edge and panel) */ + &::before{ + content: ""; + position: absolute; + z-index: -999; + background-color: var(--debug-col); + + width: 150%; + height: 100%; + right: 0px; + top: 0px; + } + + /* make all panel content invisible (it will visible when hover) */ + & > * { + transition: var(--transition) !important; + opacity: 0; + } + } + + /* styles for sidebar */ + #sidebar-box, #sidebar-main{ height: calc( - 100% - - var(--hide-bar-wdt-pad) - + var(--bookmarks-hgt) - + var(--little-gap) + 100vh + - var(--bookmarks-hgt) + - var(--little-gap) + - var(--top-margin) + - var(--bottom-margin) + - var(--margin) * 2 + ) !important; + + top: calc( + var(--top-margin) + + var(--margin) + + var(--bookmarks-hgt) + var(--little-gap) ); - - bottom: calc(var(--hide-bar-wdt-pad) / 2); - border-radius: var(--rounding); - background-color: var(--bt-col); - opacity: var(--hide-bar-opct); - } - } - - /* add rounded corners to sidebar content */ - #sidebar {border-radius: var(--big-rounding) !important;} - - /* styles for bookmarks */ - #PersonalToolbar{ - top: calc(var(--top-margin) + var(--margin)); - margin-left: 0px !important; - overflow: visible !important; - padding-inline: 2px !important; - - /* hover target between sidebar and bookmarks toolbar */ - &::after{ - content: ""; - z-index: 1; - position: absolute; - - background-color: var(--debug-col); - opacity: 1 !important; - - height: calc(var(--little-gap) + 4px); - bottom: calc(-2px - var(--little-gap)); - - width: 150%; - - right: 0px; - } - } + /* indication bar (line on window edge) */ + &::after{ + content: ""; + position: absolute; + transition: var(--transition); - /* show sidebar on hover or focus (if not in clean mode) */ - &:not([titlepreface*="‍"]):has( + left: calc( + 100% + - var(--panel-hide-ldg) + - var(--margin) + + var(--hide-bar-padding) + ); + + width: calc(var(--margin) - var(--hide-bar-padding) * 2 ); + height: calc( + 100% + - var(--hide-bar-wdt-pad) + + var(--bookmarks-hgt) + + var(--little-gap) + ); + + bottom: calc(var(--hide-bar-wdt-pad) / 2); + border-radius: var(--rounding); + background-color: var(--bt-col); + opacity: var(--hide-bar-opct); + } + } + + /* add rounded corners to sidebar content */ + #sidebar{border-radius: var(--big-rounding) !important;} + + /* styles for bookmarks */ + #PersonalToolbar{ + top: calc(var(--top-margin) + var(--margin)); + margin-left: 0px !important; + overflow: visible !important; + + padding-inline: 2px !important; + + /* hover target between sidebar and bookmarks toolbar */ + &::after{ + content: ""; + z-index: 1; + position: absolute; + + background-color: var(--debug-col); + opacity: 1 !important; + + height: calc(var(--little-gap) + 4px); + bottom: calc(-2px - var(--little-gap)); + + width: 150%; + + right: 0px; + } + } + + /* show sidebar on hover or focus (if not in clean mode) */ + &:not([titlepreface*="‍"]):has( #sidebar-box:hover, #sidebar-box:focus-within, + #sidebar-main:hover, + #sidebar-main:focus-within, #PersonalToolbar:hover, #PersonalToolbar *:not(#firefox-view-button)[open], #sidebar-switcher-target[aria-expanded="true"] - ) { - #sidebar-box, - #PersonalToolbar - { - opacity: 1 !important; - left: calc(var(--left-margin) + var(--margin)) !important; - - background-color: var(--bg-col) !important; - - border: var(--outline) !important; - outline: var(--shadow) !important; - - &::after{opacity: 0} - - & > * {opacity: var(--dyn-opct);} + ) { + #sidebar-box, + #sidebar-main, + #PersonalToolbar + { + opacity: 1 !important; + left: calc(var(--left-margin) + var(--margin)) !important; + + background-color: var(--bg-col) !important; + + border: var(--outline) !important; + outline: var(--shadow) !important; + + &::after{opacity: 0} + + & > * {opacity: var(--dyn-opct);} + } } } } - /* --- CUSTOMIZING PAGE -------------------------------------------------------------------------------------------------------------------------------- @@ -286,50 +291,53 @@ Styles when Sidebery is not opened */ -/* hide sidebar header when Sidebery opened */ -#main-window:not([customizing]):has( - #sidebar-box:not([hidden])[sidebarcommand*="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] -) { - #sidebar-header {display: none} -} - -/* hide sidebar button on toolbar when sidebar opened */ -#main-window:not([customizing]):has( - #sidebar-box:not([hidden]) -) { - #sidebar-button {display: none} -} - -/* color the sidebar button red */ -#sidebar-button .toolbarbutton-icon { - background-color: red !important; - fill: white !important; -} - -/* notification when sidebar is not opened */ -#main-window[chromehidden=""]:has( - #sidebar-box[hidden="true"] -) { - --shyfox-string-open-sidebar: "Open sidebar!"; - &[lang="ru"]{--shyfox-string-open-sidebar: "Откройте боковую панель!";} - - &::before{ - content: var(--shyfox-string-open-sidebar); - position: fixed; - z-index: 9999; - - font-weight: bold; - - top: calc(var(--margin) + var(--toolbar-item-hgt)); - left: calc(var(--margin) * 2); - - background-color: var(--tb-col); - color: var(--bt-col); - outline: 3px solid red; - - border-radius: var(--big-rounding); - padding: 10px; +@media not (-moz-bool-pref: "sidebar.revamp") { + /* hide sidebar header when Sidebery opened */ + #main-window:not([customizing]):has( + #sidebar-box:not([hidden])[sidebarcommand*="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] + ) { + #sidebar-header {display: none} } + + /* hide sidebar button on toolbar when sidebar opened */ + #main-window:not([customizing]):has( + #sidebar-box:not([hidden]) + ) { + #sidebar-button {display: none} + } + + /* color the sidebar button red */ + #sidebar-button .toolbarbutton-icon { + background-color: red !important; + fill: white !important; + } + + /* notification when sidebar is not opened */ + #main-window[chromehidden=""]:has( + #sidebar-box[hidden="true"] + ) { + --shyfox-string-open-sidebar: "Open sidebar!"; + &[lang="ru"]{--shyfox-string-open-sidebar: "Откройте боковую панель!";} + + &::before{ + content: var(--shyfox-string-open-sidebar); + position: fixed; + z-index: 9999; + + font-weight: bold; + + top: calc(var(--margin) + var(--toolbar-item-hgt)); + left: calc(var(--margin) * 2); + + background-color: var(--tb-col); + color: var(--bt-col); + outline: 3px solid red; + + border-radius: var(--big-rounding); + padding: 10px; + } + } + } /* styles when Sidebery is not opened but sidebar is */ @@ -340,9 +348,11 @@ Styles when Sidebery is not opened --shyfox-string-to-manage-tabs-open-sidebery: "To manage tabs, open Sidebery in this menu"; &[lang="ru"]{--shyfox-string-to-manage-tabs-open-sidebery: "Для работы с вкладками откройте Sidebery";} - #sidebar { - border: var(--outline) !important; - margin: 0 calc(var(--margin) / 1.5) !important; + @media not (-moz-bool-pref: "sidebar.revamp") { + #sidebar { + border: var(--outline) !important; + margin: 0 calc(var(--margin) / 1.5) !important; + } } &[titlepreface*="᠎"] {#sidebar {margin-bottom: calc(var(--margin) / 1.5) !important;}} @@ -379,76 +389,78 @@ Styles when Sidebery is not opened } } -/* assign the button to move the sidebar left and right to enable and disable native tabs for emergencies */ +@media not (-moz-bool-pref: "sidebar.revamp") { + /* assign the button to move the sidebar left and right to enable and disable native tabs for emergencies */ -/* if Sidebery is not opened but sidebar is */ -#main-window:has( - #sidebar-box:not([hidden]):not([sidebarcommand*="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]) -) { - - --shyfox-string-enable-native-tabs: "Enable native tabs"; - &[lang="ru"]{--shyfox-string-enable-native-tabs: "Включить нативные вкладки";} - - #sidebarMenu-popup #sidebar-reverse-position{ - /* remove original text from this button */ - .menu-text {display: none !important;} - - &::after{ - content: var(--shyfox-string-enable-native-tabs) !important; - padding-inline: 5px; - } - } - - /* add rounded corners to sidebar content */ - #sidebar {border-radius: var(--big-rounding) !important;} - - /* sidebar on left (native tabs disabled, default) */ - &:has(#sidebar-box[style*="order: 2"]){ - /* there is no styles */ - } - - /* sidebar on right (native tabs enabled) */ - &:has(#sidebar-box[style*="order: 4"]){ - - /* add checkmark to button to indicate state */ - #sidebarMenu-popup #sidebar-reverse-position {background-image: url("../icons/menu-check.svg") !important;} - - /* native tabs styling */ - #tabbrowser-tabs{ - --tabsbar-wdt: calc( - ( - 100vw - - var(--margin) * 2 - - var(--left-margin) - - var(--right-margin) - ) / 1.5 - ); - - display: flex !important; - position: fixed !important; - - width: var(--tabsbar-wdt) !important; - height: 45px !important; - padding: 0 !important; - - left: calc(var(--left-margin) + var(--margin)) !important; - top: calc(var(--top-margin) + var(--margin)) !important; - - background-color: var(--tb-col) !important; - border-radius: var(--big-rounding) !important; - border: var(--outline) !important; - outline: var(--shadow) !important; - transition: var(--transition) !important; - - .tabbrowser-tab:not([pinned]){ - min-width: 150px !important; - .tab-close-button{display: flex !important;} + /* if Sidebery is not opened but sidebar is */ + #main-window:has( + #sidebar-box:not([hidden]):not([sidebarcommand*="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]) + ) { + + --shyfox-string-enable-native-tabs: "Enable native tabs"; + &[lang="ru"]{--shyfox-string-enable-native-tabs: "Включить нативные вкладки";} + + #sidebarMenu-popup #sidebar-reverse-position{ + /* remove original text from this button */ + .menu-text {display: none !important;} + + &::after{ + content: var(--shyfox-string-enable-native-tabs) !important; + padding-inline: 5px; } - - /* pinned tabs */ - .tabbrowser-tab[pinned]{ - position: initial !important; - margin-inline: 0px !important; + } + + /* add rounded corners to sidebar content */ + #sidebar {border-radius: var(--big-rounding) !important;} + + /* sidebar on left (native tabs disabled, default) */ + &:has(#sidebar-box[style*="order: 2"]){ + /* there is no styles */ + } + + /* sidebar on right (native tabs enabled) */ + &:has(#sidebar-box[style*="order: 4"]){ + + /* add checkmark to button to indicate state */ + #sidebarMenu-popup #sidebar-reverse-position {background-image: url("../icons/menu-check.svg") !important;} + + /* native tabs styling */ + #tabbrowser-tabs{ + --tabsbar-wdt: calc( + ( + 100vw + - var(--margin) * 2 + - var(--left-margin) + - var(--right-margin) + ) / 1.5 + ); + + display: flex !important; + position: fixed !important; + + width: var(--tabsbar-wdt) !important; + height: 45px !important; + padding: 0 !important; + + left: calc(var(--left-margin) + var(--margin)) !important; + top: calc(var(--top-margin) + var(--margin)) !important; + + background-color: var(--tb-col) !important; + border-radius: var(--big-rounding) !important; + border: var(--outline) !important; + outline: var(--shadow) !important; + transition: var(--transition) !important; + + .tabbrowser-tab:not([pinned]){ + min-width: 150px !important; + .tab-close-button{display: flex !important;} + } + + /* pinned tabs */ + .tabbrowser-tab[pinned]{ + position: initial !important; + margin-inline: 0px !important; + } } } } diff --git a/.config/firefox/chrome/ShyFox/shy-toolbar.css b/.config/firefox/chrome/ShyFox/shy-toolbar.css index c0e0a78..2383aff 100644 --- a/.config/firefox/chrome/ShyFox/shy-toolbar.css +++ b/.config/firefox/chrome/ShyFox/shy-toolbar.css @@ -16,6 +16,7 @@ Tab bar has been transformed into vertical toolbar on the right side of the wind /* hide some things */ #tabbrowser-tabs, /* native tabs */ #alltabs-button, /* all tabs button */ +.private-browsing-indicator-with-label, #private-browsing-indicator-with-label, /* private mode indicator */ .titlebar-spacer @@ -129,6 +130,9 @@ Tab bar has been transformed into vertical toolbar on the right side of the wind cursor: vertical-text !important; } } + + /* omit margin */ + & > .toolbaritem-combined-buttons {margin-inline: 0 !important;} } /* space for window controls */ @@ -141,155 +145,167 @@ Tab bar has been transformed into vertical toolbar on the right side of the wind } } +@media (-moz-bool-pref: "sidebar.verticalTabs") { + #TabsToolbar, + #PanelUI-menu-button, + #unified-extensions-button + { + margin-top: var(--buttonbox-right-hgt) !important; + } +} + /* --- TOOLBAR HIDDEN ---------------------------------------------------------------------------------------------------------------------------------- */ -/* activate style when toolbar hidden or clean mode enabled (and not in customizing page) */ -#main-window:is([titlepreface*="​"], [titlepreface*="‍"]):not([customizing]){ - - /* styles for tabs toolbar and buttons */ - #TabsToolbar, - #PanelUI-menu-button, - #unified-extensions-button - { - top: calc( - var(--margin) - + var(--top-margin) - ); - - right: calc( - var(--right-margin) - + var(--panel-hide-ldg) - - var(--toolbar-button-wdt) - ); - - bottom: auto; - z-index: 3 !important; - } - - /* styles for tabs toolbar */ - #TabsToolbar{ - top: calc( - var(--margin) - + var(--top-margin) - - 3px - ); +@media not (-moz-bool-pref: "sidebar.verticalTabs") { + /* activate style when toolbar hidden or clean mode enabled (and not in customizing page) */ + #main-window:is([titlepreface*="​"], [titlepreface*="‍"]):not([customizing]){ - border-radius: var(--big-rounding); - - /* hover target (invisible box between window edge and panel) */ - &::before{ - content: ""; - position: absolute; - z-index: -999; - background-color: var(--debug-col); - - width: 500%; - height: 100%; - left: 0px; - top: 0px; - } - - /* indication bar (line on window edge) */ - &::after{ - content: ""; - position: absolute; - transition: var(--transition); - - right: calc( - 100% - - var(--panel-hide-ldg) - - var(--margin) - + var(--hide-bar-padding) - ); - width: calc(var(--margin) - var(--hide-bar-padding) * 2); - height: calc(100% - var(--hide-bar-wdt-pad)); - top: calc(var(--hide-bar-wdt-pad) / 2); - - border-radius: var(--rounding); - background-color: var(--bt-col); - opacity: var(--hide-bar-opct); - } - } - - /* make all panel content invisible (it will visible when hover) */ - :is(#PanelUI-menu-button, #unified-extensions-button) > *, - #TabsToolbar-customization-target > *:not(#tabbrowser-tabs) { - transition: var(--transition) !important; - opacity: 0; - } - - #TabsToolbar-customization-target{ - /* make the toolbar height dynamic */ - position: relative !important; - top: 0px !important; - padding-bottom: 3px !important; - - /* styled spacer */ - toolbarspring{ - background-color: color-mix(in srgb, var(--bt-col) 15%, var(--debug-col-2)) !important; - border-radius: var(--rounding) !important; - max-height: 1px !important; - padding: 1px !important; - scale: 0.75; - } - - /* limit toolbar items width */ - & > toolbarbutton {margin-left: 1px !important;} - & > *:not(#tabbrowser-tabs) {max-width: var(--toolbar-button-wdt) !important;} - } - - /* styles for extensions button */ - #unified-extensions-button {margin-top: var(--toolbar-item-hgt) !important;} - - /* show toolbar on hover or focus (if not in clean mode) */ - &:not([titlepreface*="‍"]):has( - #TabsToolbar:hover - .titlebar-buttonbox-container:not(:hover), - #TabsToolbar-customization-target *:not(#firefox-view-button, tab)[open], - #TabsToolbar-customization-target #searchbar:focus-within, - #PanelUI-menu-button[open], - #PanelUI-menu-button:hover, - #unified-extensions-button[open], - #unified-extensions-button:hover - ) { + /* styles for tabs toolbar and buttons */ #TabsToolbar, #PanelUI-menu-button, #unified-extensions-button { - right: calc(var(--right-margin) + var(--margin)); - - & > *:not(.titlebar-buttonbox-container), #TabsToolbar-customization-target > * {opacity: 1 !important;} + top: calc( + var(--margin) + + var(--top-margin) + ); + + right: calc( + var(--right-margin) + + var(--panel-hide-ldg) + - var(--toolbar-button-wdt) + ); + + bottom: auto; + z-index: 3 !important; } + + /* styles for tabs toolbar */ #TabsToolbar{ - width: calc(var(--toolbar-button-wdt) + 4px) !important; - padding-right: 0px !important; - - background-color: var(--tb-col) !important; - - border: var(--outline) !important; - outline: var(--shadow) !important; - - &::after{opacity: 0} + top: calc( + var(--margin) + + var(--top-margin) + - 3px + ); + + border-radius: var(--big-rounding); + + /* hover target (invisible box between window edge and panel) */ + &::before{ + content: ""; + position: absolute; + z-index: -999; + background-color: var(--debug-col); + + width: 500%; + height: 100%; + left: 0px; + top: 0px; + } + + /* indication bar (line on window edge) */ + &::after{ + content: ""; + position: absolute; + transition: var(--transition); + + right: calc( + 100% + - var(--panel-hide-ldg) + - var(--margin) + + var(--hide-bar-padding) + ); + width: calc(var(--margin) - var(--hide-bar-padding) * 2); + height: calc(100% - var(--hide-bar-wdt-pad)); + top: calc(var(--hide-bar-wdt-pad) / 2); + + border-radius: var(--rounding); + background-color: var(--bt-col); + opacity: var(--hide-bar-opct); + } } - - #PanelUI-menu-button, - #unified-extensions-button{ - margin-right: 2px !important; + + /* make all panel content invisible (it will visible when hover) */ + :is(#PanelUI-menu-button, #unified-extensions-button) > *, + #TabsToolbar-customization-target > *:not(#tabbrowser-tabs) { + transition: var(--transition) !important; + opacity: 0; } - } - - /* downloads progress indicator bar */ - &:has(#downloads-button[progress="true"]){ - #TabsToolbar::after{ - background: linear-gradient( - to top, - var(--shy-color) 0 var(--shy-download-pcent), - var(--bt-col) var(--shy-download-pcent) 100% - ) !important; + + #TabsToolbar-customization-target{ + /* make the toolbar height dynamic */ + position: relative !important; + top: 0px !important; + padding-bottom: 3px !important; + + /* styled spacer */ + toolbarspring{ + background-color: color-mix(in srgb, var(--bt-col) 15%, var(--debug-col-2)) !important; + border-radius: var(--rounding) !important; + max-height: 1px !important; + padding: 1px !important; + scale: 0.75; + } + + /* limit toolbar items width */ + & > toolbarbutton {margin-left: 1px !important;} + & > *:not(#tabbrowser-tabs) {max-width: var(--toolbar-button-wdt) !important;} + + } + + /* styles for extensions button */ + #unified-extensions-button {margin-top: var(--toolbar-item-hgt) !important;} + + /* show toolbar on hover or focus (if not in clean mode) */ + &:not([titlepreface*="‍"]):has( + #TabsToolbar:hover + .titlebar-buttonbox-container:not(:hover), + #TabsToolbar-customization-target *:not(#firefox-view-button, tab)[open], + #TabsToolbar-customization-target #searchbar:focus-within, + #PanelUI-menu-button[open], + #PanelUI-menu-button:hover, + #unified-extensions-button[open], + #unified-extensions-button:hover + ) { + #TabsToolbar, + #PanelUI-menu-button, + #unified-extensions-button + { + right: calc(var(--right-margin) + var(--margin)); + + & > *:not(.titlebar-buttonbox-container), #TabsToolbar-customization-target > * {opacity: 1 !important;} + } + #TabsToolbar{ + width: calc(var(--toolbar-button-wdt) + 4px) !important; + padding-right: 0px !important; + + background-color: var(--tb-col) !important; + + border: var(--outline) !important; + outline: var(--shadow) !important; + + &::after{opacity: 0} + } + + #PanelUI-menu-button, + #unified-extensions-button{ + margin-right: 2px !important; + } + } + + /* downloads progress indicator bar */ + &:has(#downloads-button[progress="true"]){ + #TabsToolbar::after{ + background: linear-gradient( + to top, + var(--shy-color) 0 var(--shy-download-pcent), + var(--bt-col) var(--shy-download-pcent) 100% + ) !important; + } } } } diff --git a/.config/firefox/chrome/userChrome.css b/.config/firefox/chrome/userChrome.css index 1c5e25a..13e6f09 100644 --- a/.config/firefox/chrome/userChrome.css +++ b/.config/firefox/chrome/userChrome.css @@ -9,3 +9,4 @@ @import url("ShyFox/shy-compact.css"); @import url("ShyFox/shy-icons.css"); @import url("ShyFox/shy-floating-search.css"); +@import url("ShyFox/shy-sidebar-revamp.css") diff --git a/flake.lock b/flake.lock index 4123b19..a522426 100644 --- a/flake.lock +++ b/flake.lock @@ -432,11 +432,19 @@ ] }, "locked": { +<<<<<<< HEAD "lastModified": 1741378606, "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=", "owner": "nix-community", "repo": "home-manager", "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2", +======= + "lastModified": 1741914680, + "narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef", +>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix) "type": "github" }, "original": { @@ -518,11 +526,19 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { +<<<<<<< HEAD "lastModified": 1741360124, "narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", "rev": "5be89641d8b9190460af05d59f6dbe4cb8695399", +======= + "lastModified": 1741919923, + "narHash": "sha256-ZBKD3Rd8fCu8TaGr2bkHqai3bqxKuUBOFLLMWThcGKM=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "24785e84d4b3844936caffe2c56994bdef9a9300", +>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix) "type": "github" }, "original": { @@ -612,11 +628,19 @@ }, "nixpkgs-stable_3": { "locked": { +<<<<<<< HEAD "lastModified": 1741196730, "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", "owner": "nixos", "repo": "nixpkgs", "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", +======= + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", +>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix) "type": "github" }, "original": { diff --git a/modules/emacs.nix b/modules/emacs.nix index 89a891b..0ead82a 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -5,22 +5,6 @@ enable = true; package = with import pkgs.path { system = "x86_64-linux"; - overlays = [ - (final: prev: { - gtk3 = prev.gtk3.overrideAttrs { - src = final.fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "gtk"; - rev = - "360fb0fe78073260095d77ec32bd38b5ff764623"; - hash = "sha256-k7G0a/W5LCw/Yto20CYwUZoVh6ebdYIji00JS3RCaQ8="; - }; - }; - }) - - inputs.emacs.overlay - ]; }; ((emacsPackagesFor pkgs.emacs-pgtk).emacsWithPackages (epkgs: with epkgs; [ @@ -70,9 +54,9 @@ rustic ron-mode melpaPackages.slint-mode - flycheck-clj-kondo - clojure-mode - cider + # flycheck-clj-kondo + # clojure-mode + # cider melpaPackages.evil melpaPackages.evil-collection melpaPackages.ellama @@ -83,7 +67,7 @@ org-super-agenda websocket # org-roam-ui - org-present + # org-present org-modern # (org-re-reveal.overrideAttrs (o: { # src = pkgs.fetchgit {