diff --git a/.config/nix/flake.lock b/.config/nix/flake.lock index d468a9a..43d090b 100644 --- a/.config/nix/flake.lock +++ b/.config/nix/flake.lock @@ -257,6 +257,21 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1730779796, + "narHash": "sha256-5J3jgJ923OdtEjyt3xFLyLkxGqGdn6oYUiC+dDCDL44=", + "owner": "nix-community", + "repo": "NUR", + "rev": "d17cb4d177a40e5cedc04719af56571e7ef643a7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -290,6 +305,7 @@ "nix-darwin": "nix-darwin", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", + "nur": "nur", "system-manager": "system-manager" } }, diff --git a/.config/nix/flake.nix b/.config/nix/flake.nix index f61881e..407201c 100644 --- a/.config/nix/flake.nix +++ b/.config/nix/flake.nix @@ -1,7 +1,7 @@ { description = "null2264's Nix Setup"; - outputs = inputs@{ self, nix-darwin, brew-api, nixpkgs-stable, nixpkgs-unstable, home-manager, system-manager, ... }: + outputs = inputs@{ self, nix-darwin, brew-api, nixpkgs-stable, nixpkgs-unstable, home-manager, system-manager, nur, ... }: let vars = { floorp = { @@ -14,21 +14,21 @@ darwinConfigurations = ( import ./systems/darwin { inherit (nixpkgs-unstable) lib; - inherit inputs nixpkgs-stable nixpkgs-unstable nix-darwin brew-api home-manager vars; + inherit inputs nixpkgs-stable nixpkgs-unstable nix-darwin brew-api home-manager nur vars; } ); systemConfigs = ( # sudo is required, sadly import ./systems/nix { inherit (nixpkgs-unstable) lib; - inherit inputs nixpkgs-stable nixpkgs-unstable system-manager home-manager vars; + inherit inputs nixpkgs-stable nixpkgs-unstable system-manager home-manager nur vars; } ); homeConfigurations = ( import ./users { inherit (nixpkgs-unstable) lib; - inherit inputs nixpkgs-stable nixpkgs-unstable home-manager vars; + inherit inputs nixpkgs-stable nixpkgs-unstable home-manager nur vars; } ); }; @@ -60,5 +60,7 @@ url = "github:numtide/system-manager/c93e62f2e962b54fd961798731d25eaa5778dbe2"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; + + nur.url = "github:nix-community/NUR"; }; } diff --git a/.config/nix/lib/mkSystem.nix b/.config/nix/lib/mkSystem.nix index 41a53c6..ab17745 100644 --- a/.config/nix/lib/mkSystem.nix +++ b/.config/nix/lib/mkSystem.nix @@ -1,21 +1,29 @@ -{ arch, stable, unstable, extraOverlays ? [] }: +{ arch, stable, unstable, nur, extraOverlays ? [] }: -{ +let + overlays = [ + (import ../overlays/python.nix) + ] ++ extraOverlays; + + # Placed here so that we don't need to specify hash for fetchTarball + packageOverrides = pkgs: { + nur = import nur { + nurpkgs = pkgs; + inherit pkgs; + }; + }; +in { system = arch; pkgs = import stable { system = arch; - overlays = - [ - (import ../overlays/python.nix) - ] ++ extraOverlays; + inherit overlays; config.allowUnfree = true; + config.packageOverrides = packageOverrides; }; pkgs-unstable = import unstable { system = arch; - overlays = - [ - (import ../overlays/python.nix) - ] ++ extraOverlays; + inherit overlays; config.allowUnfree = true; + # config.packageOverrides = packageOverrides; }; } diff --git a/.config/nix/modules/home-manager/floorp.nix b/.config/nix/modules/home-manager/floorp.nix index ebed939..a474f31 100644 --- a/.config/nix/modules/home-manager/floorp.nix +++ b/.config/nix/modules/home-manager/floorp.nix @@ -6,8 +6,8 @@ # REF: https://github.com/nix-community/home-manager/blob/342a1d682386d3a1d74f9555cb327f2f311dda6e/modules/programs/firefox/mkFirefoxModule.nix#L264 package = null; # we only want the config profiles.${config.home.username} = { - id = 0; - isDefault = true; + id = 0; + isDefault = true; }; }; } diff --git a/.config/nix/systems/darwin/default.nix b/.config/nix/systems/darwin/default.nix index 5504bf9..760e6ae 100644 --- a/.config/nix/systems/darwin/default.nix +++ b/.config/nix/systems/darwin/default.nix @@ -1,4 +1,4 @@ -{ inputs, nixpkgs-stable, nixpkgs-unstable, nix-darwin, brew-api, vars, ... }: +{ inputs, nixpkgs-stable, nixpkgs-unstable, nix-darwin, brew-api, nur, vars, ... }: let mkCommon = import ../../lib/mkCommon.nix; @@ -26,6 +26,7 @@ in (import ../../overlays/darwin/heliport.nix) (import ../../overlays/darwin/vesktop.nix) ]; + nur = nur; } ) pkgs pkgs-unstable; common = (mkCommon { inherit pkgs pkgs-unstable; }); @@ -52,6 +53,7 @@ in (mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; }) (import ../../overlays/darwin/vesktop.nix) ]; + nur = nur; } ) pkgs pkgs-unstable; common = (mkCommon { inherit pkgs pkgs-unstable; }); diff --git a/.config/nix/systems/nix/default.nix b/.config/nix/systems/nix/default.nix index 444919c..f071ab5 100644 --- a/.config/nix/systems/nix/default.nix +++ b/.config/nix/systems/nix/default.nix @@ -1,4 +1,4 @@ -{ inputs, nixpkgs-stable, nixpkgs-unstable, system-manager, vars, ... }: +{ inputs, nixpkgs-stable, nixpkgs-unstable, system-manager, nur, vars, ... }: let mkCommon = import ../../lib/mkCommon.nix; @@ -12,6 +12,7 @@ in arch = "x86_64-linux"; stable = nixpkgs-stable; unstable = nixpkgs-unstable; + nur = nur; } ) system pkgs pkgs-unstable; common = (mkCommon { inherit pkgs pkgs-unstable; }); diff --git a/.config/nix/users/default.nix b/.config/nix/users/default.nix index 6fe7de7..6e8d00f 100644 --- a/.config/nix/users/default.nix +++ b/.config/nix/users/default.nix @@ -1,4 +1,4 @@ -{ inputs, nixpkgs-stable, nixpkgs-unstable, home-manager, vars, ... }: +{ inputs, nixpkgs-stable, nixpkgs-unstable, home-manager, nur, vars, ... }: let mkSystem = import ../lib/mkSystem.nix; @@ -29,6 +29,7 @@ in inputs.firefox-darwin.overlay (mkBrew { inherit system; brew-api = inputs.brew-api; nixpkgs = nixpkgs-stable; }) ]; + nur = nur; } ) pkgs pkgs-unstable; vars.floorp.verticalTabHoverWidthInEm = 28; @@ -50,6 +51,7 @@ in arch = "x86_64-linux"; stable = nixpkgs-stable; unstable = nixpkgs-unstable; + nur = nur; } ) system pkgs pkgs-unstable; in diff --git a/.config/nix/users/ziro/default.nix b/.config/nix/users/ziro/default.nix index f1de490..ec7d81e 100644 --- a/.config/nix/users/ziro/default.nix +++ b/.config/nix/users/ziro/default.nix @@ -14,7 +14,11 @@ let "sidebar.position_start" = false; "signon.management.page.breach-alerts.enabled" = false; "signon.rememberSignons" = false; + "extensions.autoDisableScopes" = 0; # Auto enable extensions }; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + ]; in { home = { inherit username; @@ -25,11 +29,11 @@ in { }; programs.floorp.profiles.${username} = { - inherit userChrome settings; + inherit userChrome settings extensions; }; programs.floorp.profiles.null = { id = 1; - inherit userChrome settings; + inherit userChrome settings extensions; }; xdg.configFile = {