From 1498eee0c10c7138fa63d8094103098dd23c8cc3 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Mon, 8 Mar 2021 21:40:22 -0500 Subject: [PATCH] backport brave --- default.nix | 1 + modules/backports.nix | 23 ++++++++++++++++------- modules/baseline.nix | 2 -- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/default.nix b/default.nix index aa43a5d..9c9b95e 100644 --- a/default.nix +++ b/default.nix @@ -27,6 +27,7 @@ in imports = [ ./modules/alacritty.nix + ./modules/backports.nix ./modules/baseline.nix ./modules/cli.nix ./modules/flakes.nix diff --git a/modules/backports.nix b/modules/backports.nix index c552895..8f35029 100644 --- a/modules/backports.nix +++ b/modules/backports.nix @@ -1,12 +1,21 @@ -[ +{ lib, ... }: +let + rev = "00783f3f041491fc8b290da3494187b7f47100c0"; - (self: super: { - powerline-go = super.callPackage + backport = (name: path: sha256: self: super: { + ${name} = super.callPackage (super.fetchurl { - url = "https://raw.githubusercontent.com/NixOS/nixpkgs/65211f5afcc3637c55423b327157a5eae05dff67/pkgs/tools/misc/powerline-go/default.nix"; - sha256 = "79a60a12da011ed12dc46aabd0b43e928604759b6e7d1e0b0fd7afc3cedfd4ad"; + inherit sha256; + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/${rev}/pkgs/${path}"; }) { }; - }) + }); -] +in +{ + nixpkgs.overlays = + [ + (backport "powerline-go" "tools/misc/powerline-go/default.nix" "3f5bceb483167dfea7bfb88bd3226c375be9564a8b321096bf1456c905acb90b") + (backport "brave" "applications/networking/browsers/brave/default.nix" "6e45fde1963df084bc86c36e735b5d806c528cf684da56107944b0dda462617f") + ]; +} diff --git a/modules/baseline.nix b/modules/baseline.nix index cf4499c..625f288 100644 --- a/modules/baseline.nix +++ b/modules/baseline.nix @@ -1,7 +1,5 @@ { config, pkgs, lib, ... }: { - nixpkgs.overlays = import ./backports.nix; - time.timeZone = "US/Eastern"; boot = {