updating flake, userChrome, and emacs.nix
This commit is contained in:
parent
cef3749d87
commit
c3de5f9330
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 2f0215d4e1003599a72a9b140ee3abe3c83fa799
|
|
||||||
|
|
@ -33,17 +33,17 @@ Cool floating search panel
|
||||||
width: 64vw !important;
|
width: 64vw !important;
|
||||||
|
|
||||||
/* cool translucent background */
|
/* cool translucent background */
|
||||||
&:before{
|
&::backdrop{
|
||||||
content: "";
|
content: "";
|
||||||
position: fixed;
|
position: fixed;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
border-radius: var(--rounding);
|
border-radius: var(--rounding);
|
||||||
|
|
||||||
width: 200vw;
|
width: 100vw;
|
||||||
height: 200vh;
|
height: 100vh;
|
||||||
|
|
||||||
top: -30vh;
|
top: 0px;
|
||||||
left: -30vw;
|
left: 0px;
|
||||||
|
|
||||||
background-color: color-mix(in srgb, var(--bg-col) 80%, transparent);
|
background-color: color-mix(in srgb, var(--bg-col) 80%, transparent);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -194,8 +194,8 @@ Styles for dialogs e.g. "confirm deleting extension"
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: -1;
|
z-index: -1;
|
||||||
|
|
||||||
width: 100vw;
|
width: 100%;
|
||||||
height: 100vh;
|
height: 100%;
|
||||||
|
|
||||||
left: 0px;
|
left: 0px;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
|
|
@ -568,6 +568,13 @@ File Edit View History Bookmarks Tools Help
|
||||||
outline: 0px solid transparent;
|
outline: 0px solid transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* background color fix */
|
||||||
|
#browser:not(.browser-toolbox-background) {
|
||||||
|
:root[lwtheme] & {
|
||||||
|
background-image: none !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
--- ACCENT COLOR ----------------------------------------------------------------------------------------------------------------------------------
|
--- ACCENT COLOR ----------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -49,12 +49,17 @@ Navigation bar on top of the window
|
||||||
border-top: 0px solid transparent !important;
|
border-top: 0px solid transparent !important;
|
||||||
|
|
||||||
top: 0px;
|
top: 0px;
|
||||||
left: var(--left-margin) !important;
|
|
||||||
right: auto !important;
|
right: auto !important;
|
||||||
|
|
||||||
& > * {opacity: var(--dyn-opct);}
|
& > * {opacity: var(--dyn-opct);}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media not (-moz-bool-pref: "sidebar.revamp") {
|
||||||
|
#nav-bar {
|
||||||
|
left: var(--left-margin) !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* centered navbar text */
|
/* centered navbar text */
|
||||||
#urlbar:not(:is(
|
#urlbar:not(:is(
|
||||||
[breakout][breakout-extend],
|
[breakout][breakout-extend],
|
||||||
|
|
|
||||||
101
.config/firefox/chrome/ShyFox/shy-sidebar-revamp.css
Normal file
101
.config/firefox/chrome/ShyFox/shy-sidebar-revamp.css
Normal file
|
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -118,144 +118,149 @@ Styles for sidebar
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* activate style when sidebar hidden or clean mode enabled (and not in customizing page) */
|
@media not (-moz-bool-pref: "sidebar.revamp") {
|
||||||
#main-window:is([titlepreface*=""], [titlepreface*=""]):not([customizing]){
|
/* 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 */
|
/* styles for both sidebar and bookmaarks toolbar */
|
||||||
#sidebar-box,
|
#sidebar-box,
|
||||||
#PersonalToolbar
|
#sidebar-main,
|
||||||
{
|
#PersonalToolbar
|
||||||
z-index: 2 !important;
|
{
|
||||||
width: var(--sdbr-wdt) !important;
|
z-index: 99 !important;
|
||||||
|
width: var(--sdbr-wdt) !important;
|
||||||
left: calc(
|
|
||||||
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{
|
|
||||||
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(
|
left: calc(
|
||||||
100%
|
var(--left-margin)
|
||||||
- var(--panel-hide-ldg)
|
+ var(--panel-hide-ldg)
|
||||||
- var(--margin)
|
- var(--sdbr-wdt)
|
||||||
+ var(--hide-bar-padding)
|
) !important;
|
||||||
);
|
|
||||||
|
|
||||||
width: calc(var(--margin) - var(--hide-bar-padding) * 2 );
|
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(
|
height: calc(
|
||||||
100%
|
100vh
|
||||||
- var(--hide-bar-wdt-pad)
|
- var(--bookmarks-hgt)
|
||||||
+ var(--bookmarks-hgt)
|
- var(--little-gap)
|
||||||
+ 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);
|
/* indication bar (line on window edge) */
|
||||||
border-radius: var(--rounding);
|
&::after{
|
||||||
background-color: var(--bt-col);
|
content: "";
|
||||||
opacity: var(--hide-bar-opct);
|
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 );
|
||||||
|
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 */
|
/* add rounded corners to sidebar content */
|
||||||
#sidebar {border-radius: var(--big-rounding) !important;}
|
#sidebar{border-radius: var(--big-rounding) !important;}
|
||||||
|
|
||||||
/* styles for bookmarks */
|
/* styles for bookmarks */
|
||||||
#PersonalToolbar{
|
#PersonalToolbar{
|
||||||
top: calc(var(--top-margin) + var(--margin));
|
top: calc(var(--top-margin) + var(--margin));
|
||||||
margin-left: 0px !important;
|
margin-left: 0px !important;
|
||||||
overflow: visible !important;
|
overflow: visible !important;
|
||||||
|
|
||||||
padding-inline: 2px !important;
|
padding-inline: 2px !important;
|
||||||
|
|
||||||
/* hover target between sidebar and bookmarks toolbar */
|
/* hover target between sidebar and bookmarks toolbar */
|
||||||
&::after{
|
&::after{
|
||||||
content: "";
|
content: "";
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
||||||
background-color: var(--debug-col);
|
background-color: var(--debug-col);
|
||||||
opacity: 1 !important;
|
opacity: 1 !important;
|
||||||
|
|
||||||
height: calc(var(--little-gap) + 4px);
|
height: calc(var(--little-gap) + 4px);
|
||||||
bottom: calc(-2px - var(--little-gap));
|
bottom: calc(-2px - var(--little-gap));
|
||||||
|
|
||||||
width: 150%;
|
width: 150%;
|
||||||
|
|
||||||
right: 0px;
|
right: 0px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* show sidebar on hover or focus (if not in clean mode) */
|
/* show sidebar on hover or focus (if not in clean mode) */
|
||||||
&:not([titlepreface*=""]):has(
|
&:not([titlepreface*=""]):has(
|
||||||
#sidebar-box:hover,
|
#sidebar-box:hover,
|
||||||
#sidebar-box:focus-within,
|
#sidebar-box:focus-within,
|
||||||
|
#sidebar-main:hover,
|
||||||
|
#sidebar-main:focus-within,
|
||||||
#PersonalToolbar:hover,
|
#PersonalToolbar:hover,
|
||||||
#PersonalToolbar *:not(#firefox-view-button)[open],
|
#PersonalToolbar *:not(#firefox-view-button)[open],
|
||||||
#sidebar-switcher-target[aria-expanded="true"]
|
#sidebar-switcher-target[aria-expanded="true"]
|
||||||
) {
|
) {
|
||||||
#sidebar-box,
|
#sidebar-box,
|
||||||
#PersonalToolbar
|
#sidebar-main,
|
||||||
{
|
#PersonalToolbar
|
||||||
opacity: 1 !important;
|
{
|
||||||
left: calc(var(--left-margin) + var(--margin)) !important;
|
opacity: 1 !important;
|
||||||
|
left: calc(var(--left-margin) + var(--margin)) !important;
|
||||||
|
|
||||||
background-color: var(--bg-col) !important;
|
background-color: var(--bg-col) !important;
|
||||||
|
|
||||||
border: var(--outline) !important;
|
border: var(--outline) !important;
|
||||||
outline: var(--shadow) !important;
|
outline: var(--shadow) !important;
|
||||||
|
|
||||||
&::after{opacity: 0}
|
&::after{opacity: 0}
|
||||||
|
|
||||||
& > * {opacity: var(--dyn-opct);}
|
& > * {opacity: var(--dyn-opct);}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
--- CUSTOMIZING PAGE --------------------------------------------------------------------------------------------------------------------------------
|
--- CUSTOMIZING PAGE --------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
@ -286,50 +291,53 @@ Styles when Sidebery is not opened
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* hide sidebar header when Sidebery opened */
|
@media not (-moz-bool-pref: "sidebar.revamp") {
|
||||||
#main-window:not([customizing]):has(
|
/* hide sidebar header when Sidebery opened */
|
||||||
#sidebar-box:not([hidden])[sidebarcommand*="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]
|
#main-window:not([customizing]):has(
|
||||||
) {
|
#sidebar-box:not([hidden])[sidebarcommand*="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]
|
||||||
#sidebar-header {display: none}
|
) {
|
||||||
}
|
#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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 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 */
|
/* 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";
|
--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";}
|
&[lang="ru"]{--shyfox-string-to-manage-tabs-open-sidebery: "Для работы с вкладками откройте Sidebery";}
|
||||||
|
|
||||||
#sidebar {
|
@media not (-moz-bool-pref: "sidebar.revamp") {
|
||||||
border: var(--outline) !important;
|
#sidebar {
|
||||||
margin: 0 calc(var(--margin) / 1.5) !important;
|
border: var(--outline) !important;
|
||||||
|
margin: 0 calc(var(--margin) / 1.5) !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&[titlepreface*=""] {#sidebar {margin-bottom: 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 */
|
/* if Sidebery is not opened but sidebar is */
|
||||||
#main-window:has(
|
#main-window:has(
|
||||||
#sidebar-box:not([hidden]):not([sidebarcommand*="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"])
|
#sidebar-box:not([hidden]):not([sidebarcommand*="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"])
|
||||||
) {
|
) {
|
||||||
|
|
||||||
--shyfox-string-enable-native-tabs: "Enable native tabs";
|
--shyfox-string-enable-native-tabs: "Enable native tabs";
|
||||||
&[lang="ru"]{--shyfox-string-enable-native-tabs: "Включить нативные вкладки";}
|
&[lang="ru"]{--shyfox-string-enable-native-tabs: "Включить нативные вкладки";}
|
||||||
|
|
||||||
#sidebarMenu-popup #sidebar-reverse-position{
|
#sidebarMenu-popup #sidebar-reverse-position{
|
||||||
/* remove original text from this button */
|
/* remove original text from this button */
|
||||||
.menu-text {display: none !important;}
|
.menu-text {display: none !important;}
|
||||||
|
|
||||||
&::after{
|
&::after{
|
||||||
content: var(--shyfox-string-enable-native-tabs) !important;
|
content: var(--shyfox-string-enable-native-tabs) !important;
|
||||||
padding-inline: 5px;
|
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;}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* pinned tabs */
|
/* add rounded corners to sidebar content */
|
||||||
.tabbrowser-tab[pinned]{
|
#sidebar {border-radius: var(--big-rounding) !important;}
|
||||||
position: initial !important;
|
|
||||||
margin-inline: 0px !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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ Tab bar has been transformed into vertical toolbar on the right side of the wind
|
||||||
/* hide some things */
|
/* hide some things */
|
||||||
#tabbrowser-tabs, /* native tabs */
|
#tabbrowser-tabs, /* native tabs */
|
||||||
#alltabs-button, /* all tabs button */
|
#alltabs-button, /* all tabs button */
|
||||||
|
.private-browsing-indicator-with-label,
|
||||||
#private-browsing-indicator-with-label, /* private mode indicator */
|
#private-browsing-indicator-with-label, /* private mode indicator */
|
||||||
.titlebar-spacer
|
.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;
|
cursor: vertical-text !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* omit margin */
|
||||||
|
& > .toolbaritem-combined-buttons {margin-inline: 0 !important;}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* space for window controls */
|
/* 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 ----------------------------------------------------------------------------------------------------------------------------------
|
--- TOOLBAR HIDDEN ----------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* activate style when toolbar hidden or clean mode enabled (and not in customizing page) */
|
@media not (-moz-bool-pref: "sidebar.verticalTabs") {
|
||||||
#main-window:is([titlepreface*=""], [titlepreface*=""]):not([customizing]){
|
/* 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 */
|
/* 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
|
|
||||||
);
|
|
||||||
|
|
||||||
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
|
|
||||||
) {
|
|
||||||
#TabsToolbar,
|
#TabsToolbar,
|
||||||
#PanelUI-menu-button,
|
#PanelUI-menu-button,
|
||||||
#unified-extensions-button
|
#unified-extensions-button
|
||||||
{
|
{
|
||||||
right: calc(var(--right-margin) + var(--margin));
|
top: calc(
|
||||||
|
var(--margin)
|
||||||
|
+ var(--top-margin)
|
||||||
|
);
|
||||||
|
|
||||||
& > *:not(.titlebar-buttonbox-container), #TabsToolbar-customization-target > * {opacity: 1 !important;}
|
right: calc(
|
||||||
|
var(--right-margin)
|
||||||
|
+ var(--panel-hide-ldg)
|
||||||
|
- var(--toolbar-button-wdt)
|
||||||
|
);
|
||||||
|
|
||||||
|
bottom: auto;
|
||||||
|
z-index: 3 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* styles for tabs toolbar */
|
||||||
#TabsToolbar{
|
#TabsToolbar{
|
||||||
width: calc(var(--toolbar-button-wdt) + 4px) !important;
|
top: calc(
|
||||||
padding-right: 0px !important;
|
var(--margin)
|
||||||
|
+ var(--top-margin)
|
||||||
|
- 3px
|
||||||
|
);
|
||||||
|
|
||||||
background-color: var(--tb-col) !important;
|
border-radius: var(--big-rounding);
|
||||||
|
|
||||||
border: var(--outline) !important;
|
/* hover target (invisible box between window edge and panel) */
|
||||||
outline: var(--shadow) !important;
|
&::before{
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
z-index: -999;
|
||||||
|
background-color: var(--debug-col);
|
||||||
|
|
||||||
&::after{opacity: 0}
|
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,
|
/* make all panel content invisible (it will visible when hover) */
|
||||||
#unified-extensions-button{
|
:is(#PanelUI-menu-button, #unified-extensions-button) > *,
|
||||||
margin-right: 2px !important;
|
#TabsToolbar-customization-target > *:not(#tabbrowser-tabs) {
|
||||||
|
transition: var(--transition) !important;
|
||||||
|
opacity: 0;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* downloads progress indicator bar */
|
#TabsToolbar-customization-target{
|
||||||
&:has(#downloads-button[progress="true"]){
|
/* make the toolbar height dynamic */
|
||||||
#TabsToolbar::after{
|
position: relative !important;
|
||||||
background: linear-gradient(
|
top: 0px !important;
|
||||||
to top,
|
padding-bottom: 3px !important;
|
||||||
var(--shy-color) 0 var(--shy-download-pcent),
|
|
||||||
var(--bt-col) var(--shy-download-pcent) 100%
|
/* styled spacer */
|
||||||
) !important;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,3 +9,4 @@
|
||||||
@import url("ShyFox/shy-compact.css");
|
@import url("ShyFox/shy-compact.css");
|
||||||
@import url("ShyFox/shy-icons.css");
|
@import url("ShyFox/shy-icons.css");
|
||||||
@import url("ShyFox/shy-floating-search.css");
|
@import url("ShyFox/shy-floating-search.css");
|
||||||
|
@import url("ShyFox/shy-sidebar-revamp.css")
|
||||||
|
|
|
||||||
24
flake.lock
24
flake.lock
|
|
@ -432,11 +432,19 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
<<<<<<< HEAD
|
||||||
"lastModified": 1741378606,
|
"lastModified": 1741378606,
|
||||||
"narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=",
|
"narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "95711f926676018d279ba09fe7530d03b5d5b3e2",
|
"rev": "95711f926676018d279ba09fe7530d03b5d5b3e2",
|
||||||
|
=======
|
||||||
|
"lastModified": 1741914680,
|
||||||
|
"narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef",
|
||||||
|
>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix)
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -518,11 +526,19 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
<<<<<<< HEAD
|
||||||
"lastModified": 1741360124,
|
"lastModified": 1741360124,
|
||||||
"narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=",
|
"narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=",
|
||||||
"owner": "lilyinstarlight",
|
"owner": "lilyinstarlight",
|
||||||
"repo": "nixos-cosmic",
|
"repo": "nixos-cosmic",
|
||||||
"rev": "5be89641d8b9190460af05d59f6dbe4cb8695399",
|
"rev": "5be89641d8b9190460af05d59f6dbe4cb8695399",
|
||||||
|
=======
|
||||||
|
"lastModified": 1741919923,
|
||||||
|
"narHash": "sha256-ZBKD3Rd8fCu8TaGr2bkHqai3bqxKuUBOFLLMWThcGKM=",
|
||||||
|
"owner": "lilyinstarlight",
|
||||||
|
"repo": "nixos-cosmic",
|
||||||
|
"rev": "24785e84d4b3844936caffe2c56994bdef9a9300",
|
||||||
|
>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix)
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -612,11 +628,19 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_3": {
|
"nixpkgs-stable_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
|
<<<<<<< HEAD
|
||||||
"lastModified": 1741196730,
|
"lastModified": 1741196730,
|
||||||
"narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=",
|
"narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3",
|
"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"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -5,22 +5,6 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
package = with import pkgs.path {
|
package = with import pkgs.path {
|
||||||
system = "x86_64-linux";
|
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:
|
((emacsPackagesFor pkgs.emacs-pgtk).emacsWithPackages (epkgs:
|
||||||
with epkgs; [
|
with epkgs; [
|
||||||
|
|
@ -70,9 +54,9 @@
|
||||||
rustic
|
rustic
|
||||||
ron-mode
|
ron-mode
|
||||||
melpaPackages.slint-mode
|
melpaPackages.slint-mode
|
||||||
flycheck-clj-kondo
|
# flycheck-clj-kondo
|
||||||
clojure-mode
|
# clojure-mode
|
||||||
cider
|
# cider
|
||||||
melpaPackages.evil
|
melpaPackages.evil
|
||||||
melpaPackages.evil-collection
|
melpaPackages.evil-collection
|
||||||
melpaPackages.ellama
|
melpaPackages.ellama
|
||||||
|
|
@ -83,7 +67,7 @@
|
||||||
org-super-agenda
|
org-super-agenda
|
||||||
websocket
|
websocket
|
||||||
# org-roam-ui
|
# org-roam-ui
|
||||||
org-present
|
# org-present
|
||||||
org-modern
|
org-modern
|
||||||
# (org-re-reveal.overrideAttrs (o: {
|
# (org-re-reveal.overrideAttrs (o: {
|
||||||
# src = pkgs.fetchgit {
|
# src = pkgs.fetchgit {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue