Merge remote-tracking branch 'enklave/master'
This commit is contained in:
commit
36223e201b
@ -2,20 +2,11 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
# Firefox addons
|
wrapper = pkgs.callPackage ../5pkgs/firefox/firefox-with-config.nix { };
|
||||||
https-everywhere = pkgs.callPackage ./own-pkgs/https-everywhere {};
|
|
||||||
ublock-origin = pkgs.callPackage ./own-pkgs/ublock-origin {};
|
|
||||||
webgl-fingerprint-defender = pkgs.callPackage ./own-pkgs/webgl-fingerprint-defender {};
|
|
||||||
canvas-fingerprint-defender = pkgs.callPackage ./own-pkgs/canvas-fingerprint-defender {};
|
|
||||||
audio-fingerprint-defender = pkgs.callPackage ./own-pkgs/audio-fingerprint-defender {};
|
|
||||||
font-fingerprint-defender = pkgs.callPackage ./own-pkgs/font-fingerprint-defender {};
|
|
||||||
user-agent-switcher = pkgs.callPackage ./own-pkgs/user-agent-switcher {};
|
|
||||||
dark-reader = pkgs.callPackage ./own-pkgs/dark-reader {};
|
|
||||||
|
|
||||||
wrapper = pkgs.callPackage ./overlays/firefox-with-config.nix { };
|
|
||||||
myFirefox = wrapper pkgs.firefox-unwrapped {
|
myFirefox = wrapper pkgs.firefox-unwrapped {
|
||||||
|
|
||||||
extraExtensions = [
|
# these plugins are defined in 5pkgs/firefox
|
||||||
|
extraExtensions = with pkgs ; [
|
||||||
dark-reader
|
dark-reader
|
||||||
https-everywhere
|
https-everywhere
|
||||||
ublock-origin
|
ublock-origin
|
||||||
|
@ -232,11 +232,10 @@ services.xserver.enable = true;
|
|||||||
services.xserver.displayManager.lightdm.enable = true;
|
services.xserver.displayManager.lightdm.enable = true;
|
||||||
|
|
||||||
# Allow users in video group to change brightness
|
# Allow users in video group to change brightness
|
||||||
hardware.brightnessctl.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
rofi # Dmenu replacement
|
rofi # Dmenu replacement
|
||||||
acpilight # Replacement for xbacklight
|
acpilight # Replacement for xbacklight
|
||||||
|
brightnessctl
|
||||||
arandr # Xrandr gui
|
arandr # Xrandr gui
|
||||||
feh
|
feh
|
||||||
wirelesstools # To get wireless statistics
|
wirelesstools # To get wireless statistics
|
||||||
|
18
jeschli/5pkgs/firefox/default.nix
Normal file
18
jeschli/5pkgs/firefox/default.nix
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
|
self: super:
|
||||||
|
|
||||||
|
let
|
||||||
|
# This callPackage will try to detect obsolete overrides.
|
||||||
|
callPackage = path: args: let
|
||||||
|
override = self.callPackage path args;
|
||||||
|
upstream = optionalAttrs (override ? "name")
|
||||||
|
(super.${(parseDrvName override.name).name} or {});
|
||||||
|
in if upstream ? "name" &&
|
||||||
|
override ? "name" &&
|
||||||
|
compareVersions upstream.name override.name != -1
|
||||||
|
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
|
||||||
|
else override;
|
||||||
|
in
|
||||||
|
|
||||||
|
mapNixDir (path: callPackage path {}) ./.
|
Loading…
Reference in New Issue
Block a user