Merge branch 'master' of https://git.beepboop.systems/rndusr/dot_testing

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
   '';
 

builds/st/lightmode.h

@@ -0,0 +1,20 @@
+/* Terminal colors (16 first used in escape sequence) */
+static const char *colorname[] = {
+	/* solarized light */
+	"#eee8d5",  /*  0: black    */
+	"#dc322f",  /*  1: red      */
+	"#859900",  /*  2: green    */
+	"#b58900",  /*  3: yellow   */
+	"#268bd2",  /*  4: blue     */
+	"#d33682",  /*  5: magenta  */
+	"#2aa198",  /*  6: cyan     */
+	"#073642",  /*  7: white    */
+	"#fdf6e3",  /*  8: brblack  */
+	"#cb4b16",  /*  9: brred    */
+	"#93a1a1",  /* 10: brgreen  */
+	"#839496",  /* 11: bryellow */
+	"#657b83",  /* 12: brblue   */
+	"#6c71c4",  /* 13: brmagenta*/
+	"#586e75",  /* 14: brcyan   */
+	"#002b36",  /* 15: brwhite  */
+};

builds/statusbar/setup.py

@@ -7,7 +7,7 @@ setup(
     author_email = 'ryan@beepboop.systems',
     url = 'https://git.beepboop.systems/stupidcomputer/dot_testing',
     description = 'simple statusbar content program',
-    license = 'MIT',
+    license = 'GPLv3',
     entry_points = {
         'console_scripts': [
             'statusbar = statusbar.statusbar:main'

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"; }
+    ];
+  };
+}

home/elinks/default.nix

@@ -2,7 +2,7 @@
 
 {
   home.packages = [
-    (pkgs.callPackage ./elinks.nix {})
+    pkgs.elinks
   ];
 
   home.file = {

home/elinks/elinks.nix

@@ -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 ];
-  };
-}

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"
-    )
   ];
 }

home/x11.nix

@@ -3,6 +3,7 @@
 {
   imports = [
     ./bspwm
+    ./brave
     ./sx
     ./sxhkd
     ./tridactyl

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