diff --git a/builds/st.nix b/builds/st.nix index fa428cf..f6116a8 100644 --- a/builds/st.nix +++ b/builds/st.nix @@ -7,6 +7,7 @@ , fontconfig , freetype , ncurses +, lightMode ? false , extraLibs ? [ ] }: @@ -19,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ]; buildInputs = [ libX11 libXft ] ++ extraLibs; - buildPhase = '' + buildPhase = lib.optionalString (lightMode == true) "cp lightmode.h colors.h;" + + '' make ''; diff --git a/home/brave/default.nix b/home/brave/default.nix new file mode 100644 index 0000000..3d43428 --- /dev/null +++ b/home/brave/default.nix @@ -0,0 +1,18 @@ +{ lib, inputs, config, pkgs, home, ... }: + +let + plib = import ../../lib { inherit pkgs; }; +in { + programs.chromium = { + enable = true; + package = lib.mkForce (plib.mkPackageWrapper + pkgs.brave + "export HOME=$HOME/.cache/brave" + "" + "--args --disable-frame-rate-limit" + ); + extensions = [ + { id = "ecnphlgnajanjnkcmbpancdjoidceilk"; } + ]; + }; +} diff --git a/home/elinks/default.nix b/home/elinks/default.nix index 7dbebf4..52f97d7 100644 --- a/home/elinks/default.nix +++ b/home/elinks/default.nix @@ -2,7 +2,7 @@ { home.packages = [ - (pkgs.callPackage ./elinks.nix {}) + pkgs.elinks ]; home.file = { diff --git a/home/elinks/elinks.nix b/home/elinks/elinks.nix deleted file mode 100644 index 9189bb8..0000000 --- a/home/elinks/elinks.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libX11, bzip2, zlib -, brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev -, gpm, libidn, tre, expat, luajit -}: - -stdenv.mkDerivation rec { - pname = "elinks"; - version = "0.17.0"; - - src = fetchFromGitHub { - owner = "rkd77"; - repo = "elinks"; - rev = "v${version}"; - hash = "sha256-JeUiMHAqSZxxBe8DplzmzHzsY6KqoBqba0y8GDwaR0Y="; - }; - - buildInputs = [ - ncurses libX11 bzip2 zlib brotli zstd xz - openssl libidn tre expat libev luajit - ] - ++ lib.optional stdenv.isLinux gpm - ; - - nativeBuildInputs = [ autoreconfHook gettext pkg-config ]; - - configureFlags = [ - "--enable-finger" - "--enable-html-highlight" - "--enable-gopher" - "--enable-gemini" - "--enable-cgi" - "--enable-bittorrent" - "--enable-nntp" - "--enable-256-colors" - "--enable-true-color" - "--with-brotli" - "--with-lzma" - "--with-libev" - "--with-terminfo" - ]; - - meta = with lib; { - description = "Full-featured text-mode web browser"; - homepage = "https://github.com/rkd77/elinks"; - license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ iblech gebner ]; - }; -} diff --git a/home/x11-progs.nix b/home/x11-progs.nix index 6881777..a398988 100644 --- a/home/x11-progs.nix +++ b/home/x11-progs.nix @@ -12,12 +12,5 @@ in { pkgs.xwallpaper pkgs.xbrightness pkgs.xdotool - ] ++ [ - (plib.mkPackageWrapper - pkgs.brave - "export HOME=$HOME/.cache/brave" - "" - "--args --disable-frame-rate-limit" - ) ]; } diff --git a/home/x11.nix b/home/x11.nix index 206cc20..e2f2aba 100644 --- a/home/x11.nix +++ b/home/x11.nix @@ -3,6 +3,7 @@ { imports = [ ./bspwm + ./brave ./sx ./sxhkd ./tridactyl diff --git a/modules/common.nix b/modules/common.nix index 825e83f..042f8b5 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -7,7 +7,7 @@ environment.systemPackages = [ (pkgs.callPackage ../builds/rebuild.nix {}) - (pkgs.callPackage ../builds/st.nix {}) + (pkgs.callPackage ../builds/st.nix { lightMode = true; }) (pkgs.callPackage ../builds/utils.nix {}) (pkgs.callPackage ../builds/statusbar {}) pkgs.man-pages