feat: update firefox to 119

common/modules/neovim/default.nix

@@ -32,35 +32,41 @@ in
 
     neovim = {
       enable = true;
+      defaultEditor = true;
       viAlias = true;
       vimAlias = true;
       package = pkgs.neovim-nightly;
 
-      extraConfig = builtins.concatStringsSep "\n" [
+      extraConfig = with lib.strings; ''
-        (lib.strings.fileContents ./config/base.vim)
+        ${fileContents ./config/base.vim}
-        ''
+      '';
-          lua << EOF
-          ${lib.strings.fileContents ./config/config.lua}
-          EOF
-        ''
-      ];
 
+      extraLuaConfig = with lib.strings; ''
+        ${fileContents ./config/config.lua}
+      '';
+
+      withNodeJs = true;
       extraPackages = with pkgs; [
-        tree-sitter
         nodejs_latest
+        nodePackages.npm
+        nodePackages.neovim
         gradle
-        bat
-        stylelint
 
-        python311Packages.pylint
+        bat
+
+        stylelint
         nil
       ];
+      extraPython3Packages = with pkgs.python311Packages; [
+        pylint
+      ];
 
       coc = {
         enable = true;
         settings = {
           "colors.enable" = true;
           "coc.preferences.formatOnType" = true;
+          "inlayHint.enable" = false;
 
           "eslint.format.enable" = true;
           "eslint.autoFixOnSave" = true;
@@ -123,15 +129,15 @@ in
         fzfWrapper
         fzf-vim
 
-        nvim-treesitter.withAllGrammars
         nvim-treesitter
+        nvim-treesitter.withAllGrammars
         nvim-autopairs
 
         dracula-nvim
         (plugin "lukas-reineke"
                 "indent-blankline.nvim"
-                "0fe34b4c1b926e106d105d3ae88ef6cbf6743572"
+                "046e2cf04e08ece927bacbfb87c5b35c0b636546"
-                "sha256-e8gn4pJYALaQ6sGA66SFf8p6VLJBPxT/BimQhOd5eBs=")
+                "sha256-bhoep8aTYje5K/dZ/XmpwBPn4PBEMPrmw33QJdfFe6M=")
         gitsigns-nvim
         lualine-nvim
         (plugin "echasnovski"

modules/firefox/custom.css

@@ -4,31 +4,32 @@
   display: none !important;
 }
 
-#appMenu-popup {
+/* https://github.com/Godiesc/firefox-gx/blob/main/Tricks/README.md */
-  position: fixed !important;
+/* Extensions button into the "left-sidebar" - Immovable */
-  top: 0px !important;
+
-  left: 0px !important;
+:root:not([chromehidden~="toolbar"],[sizemode="fullscreen"]) #PersonalToolbar {
-  margin: 0 !important;
+    --padding-top-left-sidebar: 110px !important; /* 182px to one-line config */
 }
 
-#appMenu-popup panelview {
+:root:not([chromehidden~="toolbar"], [sizemode="fullscreen"]) #unified-extensions-button {
-  border-width: 2px 6px !important;
+    --toolbarbutton-hover-background: transparent !important;
-  border-radius: 5% 0 0 5% !important;
+    --toolbarbutton-active-background: transparent !important;
-  border-image: var(--panel-separator-zap-gradient4) 1 !important;
+    position: fixed;
+    display: flex;
+    top: 50px !important;
+    left: inherit !important;
+    z-index: 2 !important;
+    fill: var(--general-color) !important;
+    width: calc(var(--uc-vertical-toolbar-width) - 4px) !important;
 }
 
-#unified-extensions-panel panelview {
+:root:not([chromehidden~="toolbar"], [sizemode="fullscreen"]) #unified-extensions-button:hover,
-  border-width: 0 !important;
+:root:not([chromehidden~="toolbar"], [sizemode="fullscreen"]) #unified-extensions-button[open] {
-  border-radius: 0px !important;
+    transform: scale(1.12) !important;
+    transition: ease-in-out !important;
 }
 
-slot {
+:root:not([chromehidden~="toolbar"], [sizemode="fullscreen"]) #unified-extensions-button:active {
-  margin: 0 !important;
+    transform: scale(1.0) !important;
-  border-radius: 5% 0 0 5% !important;
+    transition-duration: 0ms !important;
-}
-
-@media screen {
-  :root:not([chromehidden~="toolbar"]) #PersonalToolbar {
-    margin-top: -106.5px !important;
-  }
 }

modules/firefox/default.nix

@@ -25,12 +25,20 @@ in
       extraConfig = builtins.readFile "${firefox-gx}/user.js";
 
       settings = {
+        # Theme
+        "firefoxgx.tab-shapes" = true;
+        "firefoxgx.left-sidebar" = true;
+        "userChrome.tab.bottom_rounded_corner" = true;
+        "userChrome.tab.bottom_rounded_corner.wave" = false;
+        "userChrome.tab.bottom_rounded_corner.australis" = true;
+
         # Open previous windows and tabs
         "browser.startup.page" = 3;
 
         # Prefs
         "layout.css.devPixelsPerPx" = 1.12;
         "browser.tabs.firefox-view" = false;
+        "browser.tabs.firefox-view-next" = false;
         "browser.search.widget.inNavBar" = true;
         "browser.toolbars.bookmarks.visibility" = "always";
         "browser.toolbars.bookmarks.showInPrivateBrowsing" = true;

modules/firefox/firefox-gx.nix

@@ -1,7 +1,7 @@
 { lib, stdenvNoCC, fetchFromGitHub }:
 let
   pname = "firefox-gx";
-  version = "8.4";
+  version = "8.5";
 in
 stdenvNoCC.mkDerivation {
   inherit pname version;
@@ -10,24 +10,17 @@ stdenvNoCC.mkDerivation {
     owner = "Godiesc";
     repo = pname;
     rev = "v.${version}";
-    sha256 = "sha256-Izb2dLIThLAXJ+Z6fNyRli3v3kV1upyDY0wA2VNVi+o=";
+    sha256 = "sha256-llffq16PZz5GxkLIJDeWN1d04SCCJFqwCLzOrxgwhYI=";
   };
 
   installPhase = ''
     # Personal changes
     sed -i 's/var(--fuchsia))/var(--purple))/' ./chrome/components/ogx_root-personal.css
 
+    # Fix new tab background for nix
     substituteInPlace ./chrome/components/ogx_root-personal.css \
       --replace '../images/newtab/wallpaper-dark.png' "$out/chrome/images/newtab/private-dark.png"
 
-    mv ./Extras/Tab-Shapes/ogx_tab-shapes.css ./chrome/components
-    rm ./user.js
-    mv ./Extras/Tab-Shapes/user.js ./
-    sed -i 's/rounded_corner.chrome",        true/rounded_corner.chrome",        false/' ./user.js
-    sed -i 's/rounded_corner.wave",          false/rounded_corner.wave",          true/' ./user.js
-
-    mv ./Extras/Left-SideBar/ogx_left-sidebar.css ./chrome/components
-
     mkdir -p $out
     cp -r ./* $out
   '';