From 8f5b3e86e3968b98f3cb6153d668d2e5c7b41313 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Fri, 7 Mar 2025 18:19:35 -0500 Subject: [PATCH] more updates --- flake.lock | 114 +++++++++--------- flake.nix | 12 +- overlays/betterlockscreen.nix | 2 - overlays/bypass-paywalls-clean.nix | 9 +- overlays/default.nix | 16 +++ overlays/pkgs.nix | 19 +-- pkgs/misc/bypass-paywalls-clean/package.nix | 11 +- .../nmasur/presets/programs/_1password.nix | 2 +- .../nmasur/presets/programs/firefox.nix | 2 +- templates/default.nix | 2 +- 10 files changed, 101 insertions(+), 88 deletions(-) delete mode 100644 overlays/betterlockscreen.nix create mode 100644 overlays/default.nix diff --git a/flake.lock b/flake.lock index d9e733d..d292107 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "base16-nvim-src": { "flake": false, "locked": { - "lastModified": 1716483968, - "narHash": "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=", + "lastModified": 1740184667, + "narHash": "sha256-r7JPksjINhisViWIAXZJphDQKoPtFBB/vVnkA45r1/w=", "owner": "RRethy", "repo": "base16-nvim", - "rev": "6ac181b5733518040a33017dde654059cd771b7c", + "rev": "3f13e15c53ea2aaf79c24ceab725309d87f0619c", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1737162735, - "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=", + "lastModified": 1741229100, + "narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08", + "rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1737038063, - "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1737120639, - "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=", + "lastModified": 1741378606, + "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=", "owner": "nix-community", "repo": "home-manager", - "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887", + "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1732920695, - "narHash": "sha256-1fxvJZUznwrmEtYqpPuWi2tPcL9kj6v7p1J7ZZncAPE=", + "lastModified": 1739821351, + "narHash": "sha256-QlVtMzAhECs9Esq3txqVW7/vM78ipB5IcI8uyCbTP7A=", "owner": "hraban", "repo": "mac-app-util", - "rev": "548672d0cb661ce11d08ee8bde92b87d2a75c872", + "rev": "c00d5b21ca1fdab8acef65e696795f0f15ec1158", "type": "github" }, "original": { @@ -307,7 +307,7 @@ "nextcloud-external": { "flake": false, "locked": { - "lastModified": 1729501349, + "lastModified": 1729501365, "narHash": "sha256-OV6HhFBzmnQBO5btGEnqmKlaUMY7/t2Qm3XebclpBlM=", "type": "tarball", "url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz" @@ -320,7 +320,7 @@ "nextcloud-news": { "flake": false, "locked": { - "lastModified": 1729667621, + "lastModified": 1729667622, "narHash": "sha256-pnvyMZQ+NYMgH0Unfh5S19HdZSjnghgoUDAoi2KIXNI=", "type": "tarball", "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz" @@ -333,7 +333,7 @@ "nextcloud-snappymail": { "flake": false, "locked": { - "lastModified": 1737171597, + "lastModified": 1728502660, "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=", "type": "tarball", "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz" @@ -351,11 +351,11 @@ ] }, "locked": { - "lastModified": 1732820845, - "narHash": "sha256-YPXk41l4PzKb5rtcxkYhymwjHJG95fxl4iXIzXnftr8=", + "lastModified": 1740943170, + "narHash": "sha256-A0F7T/euSMen004cVQN/ZkMpLkgLXDs+mq/merhd+0Y=", "owner": "gytis-ivaskevicius", "repo": "nix2vim", - "rev": "e2c511ea553418dd432005875c649b09d56b7e58", + "rev": "a562f32ff2393d0ed198103c65a3035bcdf83d4d", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "lastModified": 1740947705, + "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "rev": "507911df8c35939050ae324caccc7cf4ffb76565", "type": "github" }, "original": { @@ -402,11 +402,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -441,11 +441,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737170882, - "narHash": "sha256-Km700i1Eg72bFsU2X2ZgH4qEgx6SrdZFJURJGTSQH2M=", + "lastModified": 1741383898, + "narHash": "sha256-hIiLfvj0qZjBLhk5eBhIv8SZJ+bI8d06Hxp480mJ1aI=", "owner": "nix-community", "repo": "nur", - "rev": "62cdd681201843553ec740a85ccf2f0a6fca75c6", + "rev": "54352c3c3110f34e71a2ae9a0210aa6955555760", "type": "github" }, "original": { @@ -457,11 +457,11 @@ "nvim-lint-src": { "flake": false, "locked": { - "lastModified": 1736154173, - "narHash": "sha256-OChCLXHAqa129NiGfmwddq0Hj5F9AtC3TmFbnNCZqfo=", + "lastModified": 1738838825, + "narHash": "sha256-E/KcQr4RM4gz+ItENI9e7hMicyBKyzoIaDO5D1VDYSw=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44", + "rev": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "nvim-tree-lua-src": { "flake": false, "locked": { - "lastModified": 1737156486, - "narHash": "sha256-b8YOOIYML9aKy4Y7S+iLKIaTfCqrxK1wB/ZaeFRCUmo=", + "lastModified": 1740787655, + "narHash": "sha256-KSrY1K64yC6dPDd3DF15bVWs2N7B0BPS9enfmJgTzC4=", "owner": "kyazdani42", "repo": "nvim-tree.lua", - "rev": "fca0b67c0b5a31727fb33addc4d9c100736a2894", + "rev": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4", "type": "github" }, "original": { @@ -564,11 +564,11 @@ "snipe-nvim-src": { "flake": false, "locked": { - "lastModified": 1736108869, - "narHash": "sha256-sJ71eiE0XmMJkhNCkbY82R4eHzBOOKFrPa+nxLc1f8s=", + "lastModified": 1740838551, + "narHash": "sha256-KbZuHll6VFcdSAC9fBLVfTnympKveDaiSoxZOt3GMJQ=", "owner": "leath-dub", "repo": "snipe.nvim", - "rev": "0d0a482ac713370196e4fc0025d5aaac5030104d", + "rev": "f43a1f0090de03d48ce5c55df630c1aa4d0b4291", "type": "github" }, "original": { @@ -627,11 +627,11 @@ "telescope-project-nvim-src": { "flake": false, "locked": { - "lastModified": 1733083023, - "narHash": "sha256-qEORRWYKBpK7fn7se8g+5uuVBJNu0T4JHSc0C2QzNDY=", + "lastModified": 1740138545, + "narHash": "sha256-a8eKjkn73Ki0Z4XWZLsxDSFWwPQJ6Ks3ZD2ClRgk/JY=", "owner": "nvim-telescope", "repo": "telescope-project.nvim", - "rev": "1d7920e799fc5001dffc7bd10909a86e0358eaf4", + "rev": "ce2c9fe209a68c7a924acde42d94ed8a2b2a52c5", "type": "github" }, "original": { @@ -643,11 +643,11 @@ "tiny-inline-diagnostic-nvim-src": { "flake": false, "locked": { - "lastModified": 1736959343, - "narHash": "sha256-11+Z54shcy5oRevfTOu3dt5DtXhnYaH9zvktH6Lvxjs=", + "lastModified": 1740730693, + "narHash": "sha256-pPs4EUpSYCM+MTv2k2kfLEX9pX7CXhED90h3rf6vUUs=", "owner": "rachartier", "repo": "tiny-inline-diagnostic.nvim", - "rev": "aaa6f0dd097f8ca2478cad259e61b7cb26ec0eb8", + "rev": "de01d4c9cd032d4dac69bf64d5a184fbe62e1fd1", "type": "github" }, "original": { @@ -676,11 +676,11 @@ "tree-sitter-bash": { "flake": false, "locked": { - "lastModified": 1731338420, - "narHash": "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE=", + "lastModified": 1738310128, + "narHash": "sha256-ODWgFpCLLPgzNYXFhfAVvDXPr5bW8/49ezsaS9MOWMk=", "owner": "tree-sitter", "repo": "tree-sitter-bash", - "rev": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e", + "rev": "0c46d792d54c536be5ff7eb18eb95c70fccdb232", "type": "github" }, "original": { @@ -709,11 +709,11 @@ "tree-sitter-lua": { "flake": false, "locked": { - "lastModified": 1729494737, - "narHash": "sha256-v+fFcIOv+bu+2IGI/Lh/Xbqd5BzbBjaa51ECd0hG7Ow=", + "lastModified": 1738303275, + "narHash": "sha256-mE84uI5AKbLvX5CM7NvA59Z8Ux+QFdqVjZf4hi06NAM=", "owner": "MunifTanjim", "repo": "tree-sitter-lua", - "rev": "34e60e7f45fc313463c68090d88d742a55d1bd7a", + "rev": "68d29aa745b68ae22cbbdb5dcb68c20232521ff6", "type": "github" }, "original": { @@ -742,11 +742,11 @@ "tree-sitter-python": { "flake": false, "locked": { - "lastModified": 1736288149, - "narHash": "sha256-IIAL2qteFPBCPmDK1N2EdDgpI4CwfMuuVL8t5tYueLU=", + "lastModified": 1738275152, + "narHash": "sha256-t9etfZcrliF7f9hfiomh2U9P+3ufAm8iSK1y9rOhP7s=", "owner": "tree-sitter", "repo": "tree-sitter-python", - "rev": "409b5d671eb0ea4972eeacaaca24bbec1acf79b1", + "rev": "710796b8b877a970297106e5bbc8e2afa47f86ec", "type": "github" }, "original": { @@ -817,11 +817,11 @@ ] }, "locked": { - "lastModified": 1736095716, - "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", + "lastModified": 1741192150, + "narHash": "sha256-wB140alXVla1Rw/kENerUoma2qO1Jy5IYWbmiSqmJu0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", + "rev": "0e4ccdb8181da2c6193c047b50ffee5f1a3b6dc1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 84bc7dd..241beef 100644 --- a/flake.nix +++ b/flake.nix @@ -258,12 +258,12 @@ inputs.nur.overlays.default inputs.nix2vim.overlay # inputs.jujutsu.overlays.default # Fix: https://github.com/martinvonz/jj/issues/4784 - (import ./overlays/neovim-plugins.nix inputs) - (import ./overlays/tree-sitter.nix inputs) - (import ./overlays/mpv-scripts.nix inputs) - (import ./overlays/nextcloud-apps.nix inputs) - (import ./overlays/pkgs.nix) - ]; + # (import ./overlays/neovim-plugins.nix inputs) + # (import ./overlays/tree-sitter.nix inputs) + # (import ./overlays/mpv-scripts.nix inputs) + # (import ./overlays/nextcloud-apps.nix inputs) + # (import ./overlays/pkgs.nix) + ] ++ (import ./overlays inputs); # System types to support. supportedSystems = [ diff --git a/overlays/betterlockscreen.nix b/overlays/betterlockscreen.nix deleted file mode 100644 index 936f826..0000000 --- a/overlays/betterlockscreen.nix +++ /dev/null @@ -1,2 +0,0 @@ -# Disable dunst so that it's not attempting to reach a non-existent dunst service -_final: prev: { betterlockscreen = prev.betterlockscreen.override { withDunst = false; }; } diff --git a/overlays/bypass-paywalls-clean.nix b/overlays/bypass-paywalls-clean.nix index ff29900..543c6c6 100644 --- a/overlays/bypass-paywalls-clean.nix +++ b/overlays/bypass-paywalls-clean.nix @@ -9,13 +9,14 @@ inputs: _final: prev: { in prev.stdenv.mkDerivation rec { pname = "bypass-paywalls-clean"; - version = "3.6.6.0"; + version = "4.0.6.0"; src = builtins.fetchGit { - url = "https://gitflic.ru/magnolia1234/bpc_uploads"; + url = "https://gitflic.ru/project/magnolia1234/bpc_uploads.git"; # owner = "magnolia1234"; # repo = "bpc_uploads"; - rev = "365832a498fa58cb124e74e3836edc182178c6de"; - sha256 = "0000000000000000000000000000000000000000000000000000"; + ref = "main"; + rev = "a3012f84bad9719760150832803f2ea07af8dae3"; + # sha256 = "0000000000000000000000000000000000000000000000000000"; }; preferLocalBuild = true; allowSubstitutes = true; diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..096fbdd --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,16 @@ +# Return a list of all overlays + +inputs: + +let + lib = inputs.nixpkgs.lib; +in + +lib.pipe (lib.filesystem.listFilesRecursive ./.) [ + # Get only files ending in .nix + (builtins.filter (name: lib.hasSuffix ".nix" name)) + # Remove this file + (builtins.filter (name: name != ./default.nix)) + # Import each overlay file + (map (file: (import file) inputs)) +] diff --git a/overlays/pkgs.nix b/overlays/pkgs.nix index 0a88cd4..b78a862 100644 --- a/overlays/pkgs.nix +++ b/overlays/pkgs.nix @@ -1,14 +1,15 @@ -_final: prev: +_inputs: _final: prev: let - listToAttrsByField = - field: list: - builtins.listToAttrs ( - map (v: { - name = v.${field}; - value = v; - }) list - ); + # TODO: Remove + # listToAttrsByField = + # field: list: + # builtins.listToAttrs ( + # map (v: { + # name = v.${field}; + # value = v; + # }) list + # ); listToAttrsByPnameOrName = list: diff --git a/pkgs/misc/bypass-paywalls-clean/package.nix b/pkgs/misc/bypass-paywalls-clean/package.nix index 7486a12..941350b 100644 --- a/pkgs/misc/bypass-paywalls-clean/package.nix +++ b/pkgs/misc/bypass-paywalls-clean/package.nix @@ -5,20 +5,17 @@ pkgs.stdenv.mkDerivation rec { pname = "bypass-paywalls-clean"; - version = "4.0.5.3"; + version = "4.0.6.0"; src = builtins.fetchGit { - url = "https://gitflic.ru/magnolia1234/bpc_uploads"; + url = "https://gitflic.ru/project/magnolia1234/bpc_uploads.git"; ref = "main"; - # owner = "magnolia1234"; - # repo = "bpc_uploads"; - rev = "365832a498fa58cb124e74e3836edc182178c6de"; - # sha256 = "0000000000000000000000000000000000000000000000000000"; + rev = "a3012f84bad9719760150832803f2ea07af8dae3"; }; preferLocalBuild = true; allowSubstitutes = true; buildCommand = '' dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" mkdir -p "$dst" - install -v -m644 "${src}" "$dst/magnolia@12.34.xpi" + install -v -m644 "${src}/bypass_paywalls_clean-${version}.xpi" "$dst/magnolia@12.34.xpi" ''; } diff --git a/platforms/home-manager/modules/nmasur/presets/programs/_1password.nix b/platforms/home-manager/modules/nmasur/presets/programs/_1password.nix index e04f7da..6d870e2 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/_1password.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/_1password.nix @@ -25,7 +25,7 @@ in ] ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]); # Firefox extension - programs.firefox.profiles.default.extensions = [ + programs.firefox.profiles.default.extensions.packages = [ pkgs.nur.repos.rycee.firefox-addons.onepassword-password-manager ]; }; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix b/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix index ace644f..672f1fd 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix @@ -29,7 +29,7 @@ in name = "default"; isDefault = true; # https://nur.nix-community.org/repos/rycee/ - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ pkgs.nmasur.bypass-paywalls-clean darkreader don-t-fuck-with-paste diff --git a/templates/default.nix b/templates/default.nix index 4a4abeb..895e9cd 100644 --- a/templates/default.nix +++ b/templates/default.nix @@ -3,7 +3,7 @@ { lib, ... }: lib.pipe (lib.filesystem.listFilesRecursive ./.) [ - # Get only files ending in default.nix + # Get only files ending in flake.nix (builtins.filter (name: lib.hasSuffix "flake.nix" name)) # Import each template function map