chore(nix/deps): NUR for firefox extensions
This commit is contained in:
parent
be06d69dd6
commit
356e9cdfe8
8 changed files with 56 additions and 21 deletions
16
.config/nix/flake.lock
generated
16
.config/nix/flake.lock
generated
|
@ -257,6 +257,21 @@
|
||||||
"type": "github"
|
"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": {
|
"pre-commit-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
@ -290,6 +305,7 @@
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
|
"nur": "nur",
|
||||||
"system-manager": "system-manager"
|
"system-manager": "system-manager"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
description = "null2264's Nix Setup";
|
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
|
let
|
||||||
vars = {
|
vars = {
|
||||||
floorp = {
|
floorp = {
|
||||||
|
@ -14,21 +14,21 @@
|
||||||
darwinConfigurations = (
|
darwinConfigurations = (
|
||||||
import ./systems/darwin {
|
import ./systems/darwin {
|
||||||
inherit (nixpkgs-unstable) lib;
|
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
|
systemConfigs = ( # sudo is required, sadly
|
||||||
import ./systems/nix {
|
import ./systems/nix {
|
||||||
inherit (nixpkgs-unstable) lib;
|
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 = (
|
homeConfigurations = (
|
||||||
import ./users {
|
import ./users {
|
||||||
inherit (nixpkgs-unstable) lib;
|
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";
|
url = "github:numtide/system-manager/c93e62f2e962b54fd961798731d25eaa5778dbe2";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nur.url = "github:nix-community/NUR";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
system = arch;
|
||||||
pkgs = import stable {
|
pkgs = import stable {
|
||||||
system = arch;
|
system = arch;
|
||||||
overlays =
|
inherit overlays;
|
||||||
[
|
|
||||||
(import ../overlays/python.nix)
|
|
||||||
] ++ extraOverlays;
|
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
|
config.packageOverrides = packageOverrides;
|
||||||
};
|
};
|
||||||
pkgs-unstable = import unstable {
|
pkgs-unstable = import unstable {
|
||||||
system = arch;
|
system = arch;
|
||||||
overlays =
|
inherit overlays;
|
||||||
[
|
|
||||||
(import ../overlays/python.nix)
|
|
||||||
] ++ extraOverlays;
|
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
|
# config.packageOverrides = packageOverrides;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
# REF: https://github.com/nix-community/home-manager/blob/342a1d682386d3a1d74f9555cb327f2f311dda6e/modules/programs/firefox/mkFirefoxModule.nix#L264
|
# REF: https://github.com/nix-community/home-manager/blob/342a1d682386d3a1d74f9555cb327f2f311dda6e/modules/programs/firefox/mkFirefoxModule.nix#L264
|
||||||
package = null; # we only want the config
|
package = null; # we only want the config
|
||||||
profiles.${config.home.username} = {
|
profiles.${config.home.username} = {
|
||||||
id = 0;
|
id = 0;
|
||||||
isDefault = true;
|
isDefault = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
let
|
||||||
mkCommon = import ../../lib/mkCommon.nix;
|
mkCommon = import ../../lib/mkCommon.nix;
|
||||||
|
@ -26,6 +26,7 @@ in
|
||||||
(import ../../overlays/darwin/heliport.nix)
|
(import ../../overlays/darwin/heliport.nix)
|
||||||
(import ../../overlays/darwin/vesktop.nix)
|
(import ../../overlays/darwin/vesktop.nix)
|
||||||
];
|
];
|
||||||
|
nur = nur;
|
||||||
}
|
}
|
||||||
) pkgs pkgs-unstable;
|
) pkgs pkgs-unstable;
|
||||||
common = (mkCommon { inherit pkgs pkgs-unstable; });
|
common = (mkCommon { inherit pkgs pkgs-unstable; });
|
||||||
|
@ -52,6 +53,7 @@ in
|
||||||
(mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; })
|
(mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; })
|
||||||
(import ../../overlays/darwin/vesktop.nix)
|
(import ../../overlays/darwin/vesktop.nix)
|
||||||
];
|
];
|
||||||
|
nur = nur;
|
||||||
}
|
}
|
||||||
) pkgs pkgs-unstable;
|
) pkgs pkgs-unstable;
|
||||||
common = (mkCommon { inherit pkgs pkgs-unstable; });
|
common = (mkCommon { inherit pkgs pkgs-unstable; });
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ inputs, nixpkgs-stable, nixpkgs-unstable, system-manager, vars, ... }:
|
{ inputs, nixpkgs-stable, nixpkgs-unstable, system-manager, nur, vars, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
mkCommon = import ../../lib/mkCommon.nix;
|
mkCommon = import ../../lib/mkCommon.nix;
|
||||||
|
@ -12,6 +12,7 @@ in
|
||||||
arch = "x86_64-linux";
|
arch = "x86_64-linux";
|
||||||
stable = nixpkgs-stable;
|
stable = nixpkgs-stable;
|
||||||
unstable = nixpkgs-unstable;
|
unstable = nixpkgs-unstable;
|
||||||
|
nur = nur;
|
||||||
}
|
}
|
||||||
) system pkgs pkgs-unstable;
|
) system pkgs pkgs-unstable;
|
||||||
common = (mkCommon { inherit pkgs pkgs-unstable; });
|
common = (mkCommon { inherit pkgs pkgs-unstable; });
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ inputs, nixpkgs-stable, nixpkgs-unstable, home-manager, vars, ... }:
|
{ inputs, nixpkgs-stable, nixpkgs-unstable, home-manager, nur, vars, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
mkSystem = import ../lib/mkSystem.nix;
|
mkSystem = import ../lib/mkSystem.nix;
|
||||||
|
@ -29,6 +29,7 @@ in
|
||||||
inputs.firefox-darwin.overlay
|
inputs.firefox-darwin.overlay
|
||||||
(mkBrew { inherit system; brew-api = inputs.brew-api; nixpkgs = nixpkgs-stable; })
|
(mkBrew { inherit system; brew-api = inputs.brew-api; nixpkgs = nixpkgs-stable; })
|
||||||
];
|
];
|
||||||
|
nur = nur;
|
||||||
}
|
}
|
||||||
) pkgs pkgs-unstable;
|
) pkgs pkgs-unstable;
|
||||||
vars.floorp.verticalTabHoverWidthInEm = 28;
|
vars.floorp.verticalTabHoverWidthInEm = 28;
|
||||||
|
@ -50,6 +51,7 @@ in
|
||||||
arch = "x86_64-linux";
|
arch = "x86_64-linux";
|
||||||
stable = nixpkgs-stable;
|
stable = nixpkgs-stable;
|
||||||
unstable = nixpkgs-unstable;
|
unstable = nixpkgs-unstable;
|
||||||
|
nur = nur;
|
||||||
}
|
}
|
||||||
) system pkgs pkgs-unstable;
|
) system pkgs pkgs-unstable;
|
||||||
in
|
in
|
||||||
|
|
|
@ -14,7 +14,11 @@ let
|
||||||
"sidebar.position_start" = false;
|
"sidebar.position_start" = false;
|
||||||
"signon.management.page.breach-alerts.enabled" = false;
|
"signon.management.page.breach-alerts.enabled" = false;
|
||||||
"signon.rememberSignons" = false;
|
"signon.rememberSignons" = false;
|
||||||
|
"extensions.autoDisableScopes" = 0; # Auto enable extensions
|
||||||
};
|
};
|
||||||
|
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||||
|
ublock-origin
|
||||||
|
];
|
||||||
in {
|
in {
|
||||||
home = {
|
home = {
|
||||||
inherit username;
|
inherit username;
|
||||||
|
@ -25,11 +29,11 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.floorp.profiles.${username} = {
|
programs.floorp.profiles.${username} = {
|
||||||
inherit userChrome settings;
|
inherit userChrome settings extensions;
|
||||||
};
|
};
|
||||||
programs.floorp.profiles.null = {
|
programs.floorp.profiles.null = {
|
||||||
id = 1;
|
id = 1;
|
||||||
inherit userChrome settings;
|
inherit userChrome settings extensions;
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue