diff --git a/common/modules/neovim/default.nix b/common/modules/neovim/default.nix index 3a48dc9..814b58d 100644 --- a/common/modules/neovim/default.nix +++ b/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" [ - (lib.strings.fileContents ./config/base.vim) - '' - lua << EOF - ${lib.strings.fileContents ./config/config.lua} - EOF - '' - ]; + extraConfig = with lib.strings; '' + ${fileContents ./config/base.vim} + ''; + 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" - "sha256-e8gn4pJYALaQ6sGA66SFf8p6VLJBPxT/BimQhOd5eBs=") + "046e2cf04e08ece927bacbfb87c5b35c0b636546" + "sha256-bhoep8aTYje5K/dZ/XmpwBPn4PBEMPrmw33QJdfFe6M=") gitsigns-nvim lualine-nvim (plugin "echasnovski" diff --git a/flake.lock b/flake.lock index dcf7edd..592f87a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698254710, - "narHash": "sha256-1wwckx7Cp1XWRIMsYE3FZss3l7VWYQoFEv428mtTokg=", + "lastModified": 1698279263, + "narHash": "sha256-NVtdt2F1Hcd0g76wj1fgcsyRV6KCHrVyDKAI8a0sKlU=", "owner": "Aylur", "repo": "ags", - "rev": "e98c6446e6f4cbbc94edd97073f8c2b1dd753f99", + "rev": "59377ec1eb48887a41b596f9ecf125013f213383", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1698255124, - "narHash": "sha256-lnQGi8Op8/RkvCBBaDT71+u8VAYl5dFU54Fw/D6x8nA=", + "lastModified": 1698282310, + "narHash": "sha256-9n9+7qvhSKU+3mwY7h2Btr2lOT83r/VHWuk7XgaUKhI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "6650e4ba85568a687b1de79eb7375cabfa68e848", + "rev": "07714dd5bd9ff60e10170e11b535409e1bbc92ef", "type": "github" }, "original": { @@ -325,11 +325,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1698138555, - "narHash": "sha256-HOzLvbRnHtpNQJJN52JYKnTm0d9K508QKsEFLbxjRHk=", + "lastModified": 1698277349, + "narHash": "sha256-uEBZSQEn4mDowhdH0QIDGORFtzqY7y4K+bZpiSRc6x0=", "owner": "neovim", "repo": "neovim", - "rev": "1094d0c0dbd0f37ccc0f1d18c73c6066e5690664", + "rev": "f2fc44550fbe5b7ebfedc2b155dc41e93f49aedb", "type": "github" }, "original": { @@ -345,14 +345,16 @@ "flake-parts": "flake-parts", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1698192055, - "narHash": "sha256-YC5IWqMTwdFxrIWYfdhW3SWmb356VtzcXt8fc49PCos=", + "lastModified": 1698278488, + "narHash": "sha256-wIAyepCJao8wqKi1Pi9014r7rc7dHxkwdlfE92XFMjM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d3ea1553487b52fe7603c830994475f51cd619db", + "rev": "11e493ce9fdab9bf7462c5a343a940858387b35a", "type": "github" }, "original": { @@ -386,7 +388,7 @@ "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -421,7 +423,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1698109854, @@ -444,11 +446,11 @@ ] }, "locked": { - "lastModified": 1698256525, - "narHash": "sha256-Yu4kCGLpFYnRk8YabNTKcubvtmiHG5w+LZzd81P0S5Y=", + "lastModified": 1698268001, + "narHash": "sha256-eEuToIWGxCR33bPovd3N0epA5C0sYMmAJ8tfXZHbSn8=", "owner": "nix-community", "repo": "nix-melt", - "rev": "08ca0b2cc2bc33ad921962e33edbdf7a9236a1ff", + "rev": "024ef7da4da4665d1c83564e223c56c039cadf42", "type": "github" }, "original": { @@ -459,11 +461,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -529,14 +531,14 @@ "flake-compat": "flake-compat_2", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1698254019, - "narHash": "sha256-qxwCFqhaxqtkZJPzUxIWhg/Ydy77Gf9ICZLu6IrGIhU=", + "lastModified": 1698268396, + "narHash": "sha256-E4++3+TMybScXB+HkzQ+A7zxHPsbDpkU68x00uWR9mk=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "1b4898bdadbe0f6ae0dee95b2055be32d123366a", + "rev": "86f4d7375a30cf2f876334d9f59238b90c9772a2", "type": "github" }, "original": { @@ -546,22 +548,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1697915759, - "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1697886341, "narHash": "sha256-AdE67xPty9M9wn36nPVp6aDntIdigrs7UbyaGv1VAaM=", @@ -577,13 +563,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -593,7 +579,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1697677194, "narHash": "sha256-lN2eJCsOzjhxrvTQsNcW7r0E9hMJ7ABrKDQWpmYFRkM=", @@ -609,13 +595,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -627,11 +613,11 @@ }, "nur": { "locked": { - "lastModified": 1698253808, - "narHash": "sha256-00mJdl0SYfSO/zQYpOaBV3sSZfQbl8cahI7CewTbEtA=", + "lastModified": 1698291781, + "narHash": "sha256-FxVdeVL8HJEZdzR0eJam02LYncTXlC3yEJAHaZ2/7Jo=", "owner": "nix-community", "repo": "NUR", - "rev": "923a29e2916f1d2589d933018b80b9ca2c4e39be", + "rev": "c551e2a67a36e5bcc713ed1c71456fc4b9e24b96", "type": "github" }, "original": { @@ -670,7 +656,7 @@ "nh": "nh", "nix-gaming": "nix-gaming", "nix-melt": "nix-melt", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", "nurl": "nurl" diff --git a/flake.nix b/flake.nix index 765859c..fce6d16 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + neovim-nightly-overlay = { + url = "github:nix-community/neovim-nightly-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nh = { url = "github:viperML/nh"; diff --git a/modules/firefox/custom.css b/modules/firefox/custom.css index cd86950..448b5fa 100644 --- a/modules/firefox/custom.css +++ b/modules/firefox/custom.css @@ -4,31 +4,32 @@ display: none !important; } -#appMenu-popup { - position: fixed !important; - top: 0px !important; - left: 0px !important; - margin: 0 !important; +/* https://github.com/Godiesc/firefox-gx/blob/main/Tricks/README.md */ +/* Extensions button into the "left-sidebar" - Immovable */ + +:root:not([chromehidden~="toolbar"],[sizemode="fullscreen"]) #PersonalToolbar { + --padding-top-left-sidebar: 110px !important; /* 182px to one-line config */ } -#appMenu-popup panelview { - border-width: 2px 6px !important; - border-radius: 5% 0 0 5% !important; - border-image: var(--panel-separator-zap-gradient4) 1 !important; +:root:not([chromehidden~="toolbar"], [sizemode="fullscreen"]) #unified-extensions-button { + --toolbarbutton-hover-background: transparent !important; + --toolbarbutton-active-background: transparent !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 { - border-width: 0 !important; - border-radius: 0px !important; +:root:not([chromehidden~="toolbar"], [sizemode="fullscreen"]) #unified-extensions-button:hover, +:root:not([chromehidden~="toolbar"], [sizemode="fullscreen"]) #unified-extensions-button[open] { + transform: scale(1.12) !important; + transition: ease-in-out !important; } -slot { - margin: 0 !important; - border-radius: 5% 0 0 5% !important; -} - -@media screen { - :root:not([chromehidden~="toolbar"]) #PersonalToolbar { - margin-top: -106.5px !important; - } +:root:not([chromehidden~="toolbar"], [sizemode="fullscreen"]) #unified-extensions-button:active { + transform: scale(1.0) !important; + transition-duration: 0ms !important; } diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix index 7c5370e..9c1db0e 100644 --- a/modules/firefox/default.nix +++ b/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; diff --git a/modules/firefox/firefox-gx.nix b/modules/firefox/firefox-gx.nix index aac5818..57b6b83 100644 --- a/modules/firefox/firefox-gx.nix +++ b/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 '';