replaced flaresolverr chromium pin with nur pkgs

This commit is contained in:
2024-12-04 14:35:12 -06:00
parent 6965e935b6
commit 9edb91fdde
5 changed files with 29 additions and 29 deletions

33
flake.lock generated
View File

@@ -370,22 +370,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-chrome": {
"locked": {
"lastModified": 1720494119,
"narHash": "sha256-IE7PZn9bSjxI4/MugjAEx49oPoxu0uKXdfC+X7HcRuQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "05bbf675397d5366259409139039af8077d695ce",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "05bbf675397d5366259409139039af8077d695ce",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1730504152, "lastModified": 1730504152,
@@ -542,6 +526,21 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"locked": {
"lastModified": 1733344007,
"narHash": "sha256-fWqmeM1rUh7/6TvB1LGmgPnjVIPc19Ng9y1SK3wbfDc=",
"owner": "nix-community",
"repo": "nur",
"rev": "c27c4ed1029b396a1986db133ce7cf55079ea472",
"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",
@@ -573,8 +572,8 @@
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-chrome": "nixpkgs-chrome",
"nixpkgs-small": "nixpkgs-small", "nixpkgs-small": "nixpkgs-small",
"nur": "nur",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"ucodenix": "ucodenix", "ucodenix": "ucodenix",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"

View File

@@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
nixpkgs-chrome.url = "github:nixos/nixpkgs?rev=05bbf675397d5366259409139039af8077d695ce"; nur.url = "github:nix-community/nur";
ucodenix.url = "github:e-tho/ucodenix"; ucodenix.url = "github:e-tho/ucodenix";
nix-gaming.url = "github:fufexan/nix-gaming"; nix-gaming.url = "github:fufexan/nix-gaming";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
@@ -30,8 +30,7 @@
useGUI = name == "workstation"; useGUI = name == "workstation";
nixpkgsSelect = if useGUI then inputs.nixpkgs else inputs.nixpkgs-small; nixpkgsSelect = if useGUI then inputs.nixpkgs else inputs.nixpkgs-small;
pkgs = nixpkgsSelect |> makePkgs; pkgs = nixpkgsSelect |> makePkgs;
pkgs-chrome = inputs.nixpkgs-chrome |> makePkgs; overlayFile = import ./overlay.nix { inherit pkgs; };
overlayFile = import ./overlay.nix { inherit pkgs pkgs-chrome; };
lib = nixpkgsSelect.lib // inputs.home-manager.lib; lib = nixpkgsSelect.lib // inputs.home-manager.lib;
in in
lib.nixosSystem { lib.nixosSystem {
@@ -42,6 +41,7 @@
modules = [ modules = [
{ nixpkgs.overlays = [ overlayFile ]; } { nixpkgs.overlays = [ overlayFile ]; }
./hosts/${name}/configuration.nix ./hosts/${name}/configuration.nix
inputs.nur.nixosModules.nur
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.nixos-cosmic.nixosModules.default inputs.nixos-cosmic.nixosModules.default
]; ];

View File

@@ -16,12 +16,9 @@ let
in in
{ {
imports = imports =
let builtins.attrNames (builtins.readDir ./servers)
serverFiles = builtins.filter ( |> builtins.filter (file: builtins.match ".*\\.nix" file != null && file != "setup.nix")
file: builtins.match ".*\\.nix" file != null && file != "setup.nix" |> map (file: ./servers/${file});
) (builtins.attrNames (builtins.readDir ./servers));
in
map (file: ./servers/${file}) serverFiles;
options.my = { options.my = {
localhost = lib.mkOption { localhost = lib.mkOption {
type = lib.types.str; type = lib.types.str;

View File

@@ -1,4 +1,8 @@
{ lib, config, ... }: {
lib,
config,
...
}:
let let
cfg = config.my.servers.prowlarr; cfg = config.my.servers.prowlarr;
setup = import ./setup.nix { inherit lib config; }; setup = import ./setup.nix { inherit lib config; };
@@ -15,6 +19,7 @@ in
prowlarr.enable = cfg.enable; prowlarr.enable = cfg.enable;
flaresolverr = { flaresolverr = {
inherit (cfg) enable; inherit (cfg) enable;
package = config.nur.repos.xddxdd.flaresolverr-21hsmw;
openFirewall = true; openFirewall = true;
}; };
nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy ( nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (

View File

@@ -1,4 +1,4 @@
{ pkgs, pkgs-chrome }: { pkgs }:
_self: super: { _self: super: {
gnome = super.gnome.overrideScope ( gnome = super.gnome.overrideScope (
_gFinal: gPrev: { _gFinal: gPrev: {
@@ -33,5 +33,4 @@ _self: super: {
ripgrep = super.ripgrep.override { withPCRE2 = true; }; ripgrep = super.ripgrep.override { withPCRE2 = true; };
papirus-icon-theme = super.papirus-icon-theme.override { color = "yellow"; }; papirus-icon-theme = super.papirus-icon-theme.override { color = "yellow"; };
blender = super.blender.override { cudaSupport = true; }; blender = super.blender.override { cudaSupport = true; };
inherit (pkgs-chrome) chromium;
} }