From bcb07dd0bd408a8dd253ed8d5089b170449a7dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 16 Jun 2026 17:14:16 +0700 Subject: [PATCH] Disable NUR --- flake.lock | 79 ++++++---------------------------------- flake.nix | 8 ---- home/firefox/default.nix | 24 +++++------- 3 files changed, 21 insertions(+), 90 deletions(-) diff --git a/flake.lock b/flake.lock index 229f4d0..c6643f1 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1780295699, - "narHash": "sha256-gt9jeb/HOoiUSOTnE5I9K/B9LEbjJW5k37Xq99HOf/Q=", + "lastModified": 1781268660, + "narHash": "sha256-xtnwgsKl4DJ75FSj8paONvVcCzAw0psGJOzEnplyRSU=", "owner": "aylur", "repo": "astal", - "rev": "271851bbc07748100382ae7caf6ef71c70c01bfc", + "rev": "948805f6e8cf7f8c08eba06ab1db1eef0e75e3a0", "type": "github" }, "original": { @@ -65,27 +65,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "worktimer", @@ -132,11 +111,11 @@ ] }, "locked": { - "lastModified": 1780515920, - "narHash": "sha256-8KX2hEeOX6KP3hBBJJI8dGWVrzbOOf1rBPmg/GUG24U=", + "lastModified": 1781557312, + "narHash": "sha256-QOIRYSUFSq7L5mY3dZymaVhcnne3tPgoR9riB0WocjA=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c5c1e8ba14f1c7475fa31ff11bc1c19cd220974", + "rev": "c03e4752899e55705dfa63979abd885c582a5c48", "type": "github" }, "original": { @@ -184,11 +163,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { @@ -199,22 +178,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -230,25 +193,6 @@ "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1780546611, - "narHash": "sha256-f8qD+5J3uAMpqD/WDmnqBOHmNFy/ia+KV8RIUJaVOPg=", - "owner": "nix-community", - "repo": "NUR", - "rev": "de55cab7b7d41bc76218dc744b66059e2f683c36", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "root": { "inputs": { "ags": "ags", @@ -257,14 +201,13 @@ "home-manager": "home-manager", "nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor", "nixpkgs": "nixpkgs_2", - "nur": "nur", "worktimer": "worktimer" } }, "worktimer": { "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4" + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1739738223, diff --git a/flake.nix b/flake.nix index 86da1b9..c48c05d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nur.url = "github:nix-community/NUR"; fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git"; worktimer = { type = "git"; @@ -31,7 +30,6 @@ outputs = { nixpkgs, home-manager, - nur, nixos-06cb-009a-fingerprint-sensor, ... } @ inputs: let @@ -39,12 +37,6 @@ forAllSystems = nixpkgs.lib.genAttrs supportedSystems; commonModules = host: user: [ ./hosts/${host}/hardware-configuration.nix - { - nixpkgs.overlays = [ - nur.overlays.default - (self: super: {utillinux = super.util-linux;}) - ]; - } ({pkgs, ...}: { networking.hostName = host; time.timeZone = "Asia/Bangkok"; diff --git a/home/firefox/default.nix b/home/firefox/default.nix index b8db15b..f78c4b1 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -25,16 +25,16 @@ in { Cryptomining = true; Fingerprinting = true; }; - # ExtensionSettings = { - # "{3e4d2037-d300-4e95-859d-3cba866f46d3}" = { - # install_url = "https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi"; - # installation_mode = "force_installed"; - # }; - # "{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = { - # install_url = "file://${./files/signed.xpi}"; - # installation_mode = "force_installed"; - # }; - # }; + ExtensionSettings = { + "{3e4d2037-d300-4e95-859d-3cba866f46d3}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi"; + installation_mode = "force_installed"; + }; + "{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = { + install_url = "file://${./files/signed.xpi}"; + installation_mode = "force_installed"; + }; + }; Preferences = { "browser.disableResetPrompt" = true; "browser.download.panel.shown" = true; @@ -69,8 +69,6 @@ in { # extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ # ublock-origin # bitwarden - # privacy-badger - # beyond-20 # display-_anchors # facebook-container # multi-account-containers @@ -78,8 +76,6 @@ in { # return-youtube-dislikes # sponsorblock # unpaywall - # vimium - # google-container # duckduckgo-privacy-essentials # ]; };