diff --git a/flake.lock b/flake.lock index 764db67..418a4d0 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1705328944, - "narHash": "sha256-joBgIN4n7fVKPjcmQpxq6iWHgflQ9/JwheWHt/410MY=", + "lastModified": 1705348229, + "narHash": "sha256-CssPema1sBxZkrT95KFuKCNNiqxNe1lnf2QNeXk88Xk=", "owner": "nix-community", "repo": "disko", - "rev": "38af7137e0cf57499f98db55e3b642038f51e849", + "rev": "d0b4408eaf782a1ada0a9133bb1cecefdd59c696", "type": "github" }, "original": { @@ -279,11 +279,11 @@ ] }, "locked": { - "lastModified": 1705269478, - "narHash": "sha256-j7Rp8Y3ckBHOlIzqe0g2+/BVce9SU/dVtn4Eb0rMuY4=", + "lastModified": 1705347059, + "narHash": "sha256-MSdJZDeyBIjf1SAZ7OvA44b00zUGTrDxkAm9vVR+XRk=", "owner": "nix-community", "repo": "home-manager", - "rev": "846200eb574faa2af808ed02e653c2b8ed51fd71", + "rev": "8c3b2a0cab64a464de9e41a470eecf1318ccff57", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705281787, - "narHash": "sha256-q1peRaGxQb05mzfSyB7D9PhVL8dK3YoVSGUKfKvXxoU=", + "lastModified": 1705368072, + "narHash": "sha256-e7Gn7daakWvEj/hQTw628zMGhAMH88thrmhmoB6RV6o=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2357e0e02e954ad5b3a85bae108fc4c8804e0d26", + "rev": "37b8bbc1717211338c446b7b926276bf8db234ac", "type": "github" }, "original": { @@ -450,11 +450,11 @@ }, "nur": { "locked": { - "lastModified": 1705328925, - "narHash": "sha256-GSuDQlgjiJRLVbODXlC+vlkYACltIUgv/cLrLSGp3wU=", + "lastModified": 1705371549, + "narHash": "sha256-kB9SMuShukqrrwVxr+RVpvwaD33GCktJWgGqv4cRm/I=", "owner": "nix-community", "repo": "NUR", - "rev": "0ab6855d6a38d57b7094945940de74cadba9b978", + "rev": "852fcb0fa38b3e3252d5d9548791ef038e40c758", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1031bde..8c8b867 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ # Theme Modules stylix.nixosModules.stylix - ./themes/targets/all-desktop.nix + ./themes/targets/all.nix ./themes/tokyonight # Host Module diff --git a/home/applications/browsers/default.nix b/home/applications/browsers/default.nix index 7890b8f..5c3aa7d 100644 --- a/home/applications/browsers/default.nix +++ b/home/applications/browsers/default.nix @@ -283,66 +283,90 @@ "widget.use-xdg-desktop-portal.file-picker" = 1; }; userChrome = '' - /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/hide_tabs_toolbar.css made available under Mozilla Public License v. 2.0 + /* Sidebery */ + #main-window[titlepreface*="🦊 "] .tabbrowser-tab { + visibility: collapse !important; + } + + #main-window[titlepreface*="🦊 "] .titlebar-button { + height: 40px !important; + } + + #main-window[titlepreface*="🦊 "] #nav-bar { + margin-top: -40px; + margin-right: 137px; + box-shadow: none !important; + } + #main-window[titlepreface*="🦊 "] #titlebar-spacer { + background-color: var(--chrome-secondary-background-color); + } + + #main-window[titlepreface*="🦊 "] #titlebar-buttonbox-container { + background-color: var(--chrome-secondary-background-color); + } + + #main-window[titlepreface*="🦊 "] .titlebar-color { + background-color: var(--toolbar-bgcolor); + } + + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar-header { + visibility: collapse; + } + + /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0 See the above repository for updates as well as full license text. */ - /* Hides tabs toolbar */ - /* For OSX use hide_tabs_toolbar_osx.css instead */ + /* Show sidebar only when the cursor is over it */ + /* The border controlling sidebar width will be removed so you'll need to modify these values to change width */ - /* Note, if you have either native titlebar or menubar enabled, then you don't really need this style. - * In those cases you can just use: #TabsToolbar{ visibility: collapse !important } - */ - - /* IMPORTANT */ - /* - Get window_control_placeholder_support.css - Window controls will be all wrong without it - */ - - :root[tabsintitlebar]{ --uc-toolbar-height: 40px; } - :root[tabsintitlebar][uidensity="compact"]{ --uc-toolbar-height: 32px } - #titlebar{ - will-change: unset !important; - transition: none !important; - opacity: 1 !important; - } - #TabsToolbar{ visibility: collapse !important } - - :root[sizemode="fullscreen"] #TabsToolbar > :is(#window-controls,.titlebar-buttonbox-container){ - visibility: visible !important; - z-index: 2; - } - - :root:not([inFullscreen]) #nav-bar{ - margin-top: calc(0px - var(--uc-toolbar-height,0px)); - } - - :root[tabsintitlebar] #toolbar-menubar[autohide="true"]{ - min-height: unset !important; - height: var(--uc-toolbar-height,0px) !important; + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] { + --uc-sidebar-width: 48px !important; + --uc-sidebar-hover-width: 250px; + --uc-autohide-sidebar-delay: 300ms; /* Wait 0.3s before hiding sidebar */ position: relative; + min-width: var(--uc-sidebar-width) !important; + width: var(--uc-sidebar-width) !important; + max-width: var(--uc-sidebar-width) !important; + z-index:1; } - #toolbar-menubar[autohide="false"]{ - margin-bottom: var(--uc-toolbar-height,0px) + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] > #sidebar-splitter { + display: none } - :root[tabsintitlebar] #toolbar-menubar[autohide="true"] #main-menubar{ - flex-grow: 1; - align-items: stretch; - background-color: var(--toolbar-bgcolor,--toolbar-non-lwt-bgcolor); - background-clip: padding-box; - border-right: 30px solid transparent; - border-image: linear-gradient(to left, transparent, var(--toolbar-bgcolor,--toolbar-non-lwt-bgcolor) 30px) 20 / 30px + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] > #sidebar { + transition: min-width 115ms linear var(--uc-autohide-sidebar-delay) !important; + min-width: var(--uc-sidebar-width) !important; + will-change: min-width; } - #toolbar-menubar:not([inactive]){ z-index: 2 } - #toolbar-menubar[autohide="true"][inactive] > #menubar-items { - opacity: 0; - pointer-events: none; - margin-left: var(--uc-window-drag-space-pre,0px) + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]:hover > #sidebar{ + min-width: var(--uc-sidebar-hover-width) !important; + transition-delay: 0ms !important } + /* Add sidebar divider and give it background */ + + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] > #sidebar, + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] > #sidebar-header { + background-color: var(--toolbar-bgcolor) !important; + /* border-inline: 1px solid var(--sidebar-border-color) !important;*/ + border-inline: 1px solid var(--chrome-content-separator-color) !important; + border-inline-width: 0px 1px; + } + #sidebar-box[positionend]{ + direction: rtl + } + #sidebar-box[positionend] > *{ + direction: ltr + } + + #sidebar-box[positionend]:-moz-locale-dir(rtl){ + direction: ltr + } + #sidebar-box[positionend]:-moz-locale-dir(rtl) > *{ + direction: rtl + } ''; }; /*