diff --git a/flake.lock b/flake.lock index 8f53cb4..25e4a8a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "flake-parts": { + "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-utils": { "inputs": { "systems": "systems" @@ -53,11 +74,34 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1749201010, + "narHash": "sha256-haiPLogZwEFQTrIarZD92LUK7ScIcMbtEzPlcC988Qk=", + "owner": "nix-community", + "repo": "NUR", + "rev": "17efc5275a8f21e2b48f39ecade74cdaff3ba411", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nur": "nur" } }, "systems": { @@ -74,6 +118,27 @@ "repo": "default", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index abb88e1..b11dd26 100644 --- a/flake.nix +++ b/flake.nix @@ -8,16 +8,17 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - # nur = { - # url = "github:nix-community/NUR"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + nur = { + url = "github:nix-community/NUR"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { nixpkgs, flake-utils, home-manager, + nur, ... }: { @@ -36,11 +37,21 @@ formatter = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; packages.homeConfigurations = { irl = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { inherit system; }; + pkgs = import nixpkgs { + inherit system; + overlays = [ + nur.overlay + ]; + }; modules = [ ./home/irl.nix ]; }; irl-gui = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { inherit system; }; + pkgs = import nixpkgs { + inherit system; + overlays = [ + nur.overlay + ]; + }; modules = [ ./home/irl.nix { diff --git a/home/irl.nix b/home/irl.nix index a0470d3..8da7d4d 100644 --- a/home/irl.nix +++ b/home/irl.nix @@ -39,11 +39,15 @@ in enable = true; profiles.irl = { extensions = { - # packages = with pkgs.nur.repos.rycee.firefox-addons; [ - # bitwarden - # kagi-search - # privacy-badger - # ]; + force = true; + packages = with pkgs.nur.repos.rycee.firefox-addons; [ + bitwarden + kagi-search + privacy-badger + ]; + }; + settings = { + "extensions.autoDisableScope" = 0; }; }; }; diff --git a/nixos/hosts/laptop/default.nix b/nixos/hosts/laptop/default.nix index f81eb56..21e6574 100644 --- a/nixos/hosts/laptop/default.nix +++ b/nixos/hosts/laptop/default.nix @@ -53,7 +53,7 @@ hardware.gpgSmartcards.enable = true; programs.gnupg.agent = { enable = true; - enableSSHSupport = true; + # enableSSHSupport = true; }; system.stateVersion = "25.05";