diff --git a/modules/backports.nix b/modules/backports.nix new file mode 100644 index 0000000..71416d1 --- /dev/null +++ b/modules/backports.nix @@ -0,0 +1,25 @@ +{ pkgs, ... }: +{ + nixpkgs.overlays = [ + + (self: super: { + powerline-go = pkgs.callPackage + (pkgs.fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/31106c85cb1dc50755f9dd41244575332b6b64c2/pkgs/tools/misc/powerline-go/default.nix"; + sha256 = "1ikm7s0g00bkfagc5f2fwlgc050cb6p4pprdg3f6s8j4ri927970"; + }) + { }; + }) + + (self: super: { + brave = super.brave.overrideAttrs (b: rec { + version = "1.18.75"; + src = pkgs.fetchurl { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + sha256 = "1njgdw7ml30xs517brc7z7piy6lcylrfjhz6wn1dp7gywsxfgx1h"; + }; + }); + }) + + ]; +} diff --git a/modules/baseline.nix b/modules/baseline.nix index 41507fc..084e272 100644 --- a/modules/baseline.nix +++ b/modules/baseline.nix @@ -1,5 +1,7 @@ { config, pkgs, lib, ... }: { + imports = [ ./backports.nix ]; + time.timeZone = "US/Eastern"; boot = { diff --git a/modules/cli.nix b/modules/cli.nix index 4f7d248..7e35503 100644 --- a/modules/cli.nix +++ b/modules/cli.nix @@ -76,12 +76,6 @@ in environment.variables.PLGO_HOSTNAMEFG = "0"; environment.variables.PLGO_HOSTNAMEBG = "114"; - nixpkgs.overlays = [ - (self: super: { - powerline-go = pkgs.callPackage ../pkgs/powerline-go-updated { }; - }) - ]; - programs.tmux = { enable = true; terminal = "screen-256color"; diff --git a/pkgs/powerline-go-updated/default.nix b/pkgs/powerline-go-updated/default.nix deleted file mode 100644 index 16734e3..0000000 --- a/pkgs/powerline-go-updated/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "powerline-go"; - version = "1.18.0"; - - src = fetchFromGitHub { - owner = "justjanne"; - repo = pname; - rev = "v${version}"; - sha256 = "0dni842xzc8r6wbdfax25940jvxp69zk8xklczkjmyxqawvsxnjh"; - }; - - vendorSha256 = "0dkgp9vlb76la0j439w0rb548qg5v8648zryk3rqgfhd4qywlk11"; - - doCheck = false; - - meta = with stdenv.lib; { - description = "A Powerline like prompt for Bash, ZSH and Fish"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ sifmelcara ]; - }; -}