updating flake, userChrome, and emacs.nix

.config/eww/scripts/geticons

@@ -1 +0,0 @@
-Subproject commit 2f0215d4e1003599a72a9b140ee3abe3c83fa799

.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;
+      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);
     }

.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;
+    width: 100%;
-    height: 100vh;
+    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 ----------------------------------------------------------------------------------------------------------------------------------

.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],

.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;
+    }
+  }
+}

.config/firefox/chrome/ShyFox/shy-sidebar.css

@@ -118,14 +118,16 @@ 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 */
     #sidebar-box,
+    #sidebar-main,
     #PersonalToolbar
     {
-    z-index: 2 !important;
+      z-index: 99 !important;
       width: var(--sdbr-wdt) !important;
 
       left: calc(
@@ -157,7 +159,7 @@ Styles for sidebar
     }
 
     /* styles for sidebar */
-  #sidebar-box{    
+    #sidebar-box, #sidebar-main{    
       height: calc(
         100vh
         - var(--bookmarks-hgt)
@@ -202,7 +204,7 @@ Styles for sidebar
     }
 
     /* add rounded corners to sidebar content */
-  #sidebar {border-radius: var(--big-rounding) !important;}
+    #sidebar{border-radius: var(--big-rounding) !important;}
 
     /* styles for bookmarks */
     #PersonalToolbar{
@@ -234,11 +236,14 @@ Styles for sidebar
     &: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,
+      #sidebar-main,
       #PersonalToolbar
       {
         opacity: 1 !important;
@@ -254,8 +259,8 @@ Styles for sidebar
         & > * {opacity: var(--dyn-opct);}
       }
     }
+  }
 }
-
 /*
 
 --- CUSTOMIZING PAGE --------------------------------------------------------------------------------------------------------------------------------
@@ -286,30 +291,31 @@ 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 */
+  #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 */
+  /* hide sidebar button on toolbar when sidebar opened */
-#main-window:not([customizing]):has(
+  #main-window:not([customizing]):has(
     #sidebar-box:not([hidden])
-) { 
+  ) { 
     #sidebar-button {display: none}
-}
+  }
 
-/* color the sidebar button red */
+  /* color the sidebar button red */
-#sidebar-button .toolbarbutton-icon {
+  #sidebar-button .toolbarbutton-icon {
     background-color: red !important;
     fill: white !important;
-}
+  }
 
-/* notification when sidebar is not opened */
+  /* notification when sidebar is not opened */
-#main-window[chromehidden=""]:has( 
+  #main-window[chromehidden=""]:has( 
     #sidebar-box[hidden="true"]
-) {
+  ) {
     --shyfox-string-open-sidebar: "Open sidebar!";
     &[lang="ru"]{--shyfox-string-open-sidebar: "Откройте боковую панель!";}
 
@@ -330,6 +336,8 @@ Styles when Sidebery is not opened
       border-radius: var(--big-rounding);
       padding: 10px;
     }
+  }
+
 }
 
 /* styles when Sidebery is not opened but sidebar is */
@@ -340,10 +348,12 @@ 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";}
   
+  @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,12 +389,13 @@ 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"]) 
-) {
+  ) {
 
     --shyfox-string-enable-native-tabs: "Enable native tabs";
     &[lang="ru"]{--shyfox-string-enable-native-tabs: "Включить нативные вкладки";}
@@ -452,4 +463,5 @@ Styles when Sidebery is not opened
         }
       }
     }
+  }
 }

.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,14 +145,24 @@ 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) */
+@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 */
     #TabsToolbar,
@@ -240,6 +254,7 @@ Tab bar has been transformed into vertical toolbar on the right side of the wind
       /* limit toolbar items width */
       & > toolbarbutton {margin-left: 1px !important;}
       & > *:not(#tabbrowser-tabs) {max-width: var(--toolbar-button-wdt) !important;}
+
     }
 
     /* styles for extensions button */
@@ -292,6 +307,7 @@ Tab bar has been transformed into vertical toolbar on the right side of the wind
         ) !important;
       }
     }
+  }
 }
 
 /*

.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")

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": {

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
+          # flycheck-clj-kondo
-          clojure-mode
+          # clojure-mode
-          cider
+          # 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 {