pkgs: switch back to latest librewolf and prepare for new librewolf module

This commit is contained in:
Youwen Wu 2024-08-25 23:34:41 -07:00
parent 94cf193aa0
commit 2291e132cd
Signed by: youwen5
GPG key ID: 865658ED1FE61EC3
4 changed files with 156 additions and 16 deletions

View file

@ -113,6 +113,29 @@
"type": "github"
}
},
"firefox-addons": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1724645012,
"narHash": "sha256-XJ8B9ecksgZBlWV9pnDgBWVePyHDg/cLYJ/6YF/RdRA=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "70645c904b41b9ddf70f7218898c48df93e8254f",
"type": "gitlab"
},
"original": {
"dir": "pkgs/firefox-addons",
"owner": "rycee",
"repo": "nur-expressions",
"type": "gitlab"
}
},
"flake-compat": {
"locked": {
"lastModified": 1688025799,
@ -236,6 +259,21 @@
}
},
"flake-utils": {
"locked": {
"lastModified": 1629284811,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems"
},
@ -253,7 +291,7 @@
"type": "github"
}
},
"flake-utils_2": {
"flake-utils_3": {
"inputs": {
"systems": "systems_2"
},
@ -271,7 +309,7 @@
"type": "github"
}
},
"flake-utils_3": {
"flake-utils_4": {
"inputs": {
"systems": "systems_3"
},
@ -289,7 +327,7 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_5": {
"inputs": {
"systems": "systems_4"
},
@ -307,7 +345,7 @@
"type": "github"
}
},
"flake-utils_5": {
"flake-utils_6": {
"inputs": {
"systems": "systems_5"
},
@ -497,7 +535,7 @@
"crane": "crane",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
],
@ -535,7 +573,7 @@
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils_3",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
@ -617,7 +655,7 @@
"nix-homebrew": {
"inputs": {
"brew-src": "brew-src",
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_4",
"nix-darwin": "nix-darwin_2",
"nixpkgs": "nixpkgs_2"
},
@ -676,6 +714,22 @@
"type": "github"
}
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1724607561,
"narHash": "sha256-7I922FoAJO9P2YRJrxQx1ufQom3wvozJNL/Ul6eEKLI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8da188f8e754473cb2f5a922bef75a734bfa0fd6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716330097,
@ -771,7 +825,7 @@
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_5",
"nixpkgs": [
"personal-neovim",
"nixvim",
@ -844,6 +898,7 @@
"apple-silicon": "apple-silicon",
"bleedingpkgs": "bleedingpkgs",
"catppuccin": "catppuccin",
"firefox-addons": "firefox-addons",
"home-manager": "home-manager",
"homebrew-cask": "homebrew-cask",
"homebrew-core": "homebrew-core",
@ -852,6 +907,7 @@
"nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs_3",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
"personal-neovim": "personal-neovim",
"spicetify": "spicetify",
"stablepkgs": "stablepkgs",
@ -1035,7 +1091,7 @@
},
"vesktop-bin": {
"inputs": {
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_5"
},
"locked": {

View file

@ -3,16 +3,15 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
bleedingpkgs.url = "github:nixos/nixpkgs/master";
nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
bleedingpkgs.url = "github:nixos/nixpkgs/master";
nix-darwin = {
url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
@ -32,6 +31,11 @@
catppuccin.url = "github:catppuccin/nix";
# firefox-addons = {
# url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
# inputs.nixpkgs.follows = "nixpkgs";
# };
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.1";

View file

@ -5,10 +5,11 @@
}: let
stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
in {
nixpkgs.overlays = [
(self: super: {
librewolf = stablepkgs.librewolf;
librewolf = nixpkgs-small.librewolf;
manga-tui = bleedingpkgs.manga-tui;
})
];

View file

@ -1,4 +1,8 @@
{pkgs, ...}: {
{
pkgs,
inputs,
...
}: {
programs.kitty = {
enable = true;
theme = "Tokyo Night";
@ -31,6 +35,81 @@
"privacy.clearOnShutdown.cookies" = false;
"network.cookie.lifetimePolicy" = 0;
};
package = pkgs.librewolf-wayland;
};
# programs.firefox = {
# enable = true;
# # package = pkgs.librewolf;
# profiles = {
# Personal = {
# name = "Youwen Wu";
# settings = {
# webgl.disabled = false;
# privacy.resistFingerprinting = false;
# privacy.clearOnShutdown.history = false;
# privacy.clearOnShutdown.cookies = false;
# network.cookie.lifetimePolicy = 0;
# search.default = "Google";
# search.force = true;
# search.engines = {
# "Nix Packages" = {
# urls = [
# {
# template = "https://search.nixos.org/packages";
# params = [
# {
# name = "type";
# value = "packages";
# }
# {
# name = "query";
# value = "{searchTerms}";
# }
# ];
# }
# ];
#
# icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
# definedAliases = ["@np"];
# };
#
# "NixOS Wiki" = {
# urls = [{template = "https://wiki.nixos.org/index.php?search={searchTerms}";}];
# iconUpdateURL = "https://wiki.nixos.org/favicon.png";
# updateInterval = 24 * 60 * 60 * 1000; # every day
# definedAliases = ["@nw"];
# };
#
# "Google" = {
# urls = [
# {
# template = "https://www.google.com/search";
# params = [
# {
# name = "q";
# value = "{searchTerms}";
# }
# {
# name = "udm";
# value = "14";
# }
# ];
# }
# ];
# definedAliases = ["@g"];
# };
# };
# };
# extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
# ublock-origin
# bitwarden
# vimium
# tabliss
# privacy-badger
# reddit-enhancement-suite
# catppuccin
# ];
# };
# };
# };
}