Add larbs-news

6 files changed, 50 insertions, 7 deletions

diff --git a/default.nix b/default.nix
index 857f1ce..5744e00 100644
--- a/default.nix
+++ b/default.nix
@@ -26,6 +26,7 @@ in
   libthinkpad = pkgs.callPackage ./pkgs/libthinkpad { };
   dockd = pkgs.callPackage ./pkgs/dockd { };
   larbs-mail = pkgs.callPackage ./pkgs/larbs-mail { };
+  larbs-news = pkgs.callPackage ./pkgs/larbs-news { };
   dmenuunicode = pkgs.callPackage ./pkgs/dmenuunicode { };
 
   #fx = (pkgs.callPackage ./pkgs/fx { }).package;
diff --git a/pkgs/dwm/dwm-rounded.diff b/pkgs/dwm/dwm-rounded.diff
index 320846c..9624528 100644
--- a/pkgs/dwm/dwm-rounded.diff
+++ b/pkgs/dwm/dwm-rounded.diff
@@ -1,3 +1,15 @@
+diff --git a/config.h b/config.h
+index dffae22..ed83f31 100644
+--- a/config.h
++++ b/config.h
+@@ -32,6 +32,7 @@ static char *colors[][3] = {
+        [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
+        [SchemeSel]  = { selfgcolor,  selbgcolor,  selbordercolor  },
+ };
++#define CORNER_RADIUS 5
+ 
+ typedef struct {
+ 	const char *name;
 diff --git a/dwm.c b/dwm.c
 index 290dc2d..f3e70c9 100644
 --- a/dwm.c
diff --git a/pkgs/larbs-mail/mailbox-script.nix b/pkgs/larbs-mail/mailbox-script.nix
index 2571a53..5559fad 100644
--- a/pkgs/larbs-mail/mailbox-script.nix
+++ b/pkgs/larbs-mail/mailbox-script.nix
@@ -1,12 +1,8 @@
-{ stdenv, fetchgit }:
+{ stdenv, callPackage, fetchgit }:
 stdenv.mkDerivation {
   name = "mailbox";
 
-  src = fetchgit {
-    url = "https://github.com/LukeSmithxyz/voidrice";
-    rev = "b768fc601e9b587aa800cd0656a8eee170bd1c93";
-    sha256 = "1i35n0qfh0llfg1b8la9yj7qsycwlmipgfp6k1yz9r27gjll768z";
-  };
+  src = callPackage ../voidrice.nix { };
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/larbs-mail/neomutt_wrapped.nix b/pkgs/larbs-mail/neomutt_wrapped.nix
index 780bfd4..3fdc41f 100644
--- a/pkgs/larbs-mail/neomutt_wrapped.nix
+++ b/pkgs/larbs-mail/neomutt_wrapped.nix
@@ -23,6 +23,6 @@ in
       homepage = "https://github.com/LukeSmithXYZ/mutt-wizard";
       description = "A system for automatically configuring mutt and isync with a simple interface and safe passwords";
       license = licenses.gpl3;
-      platforms = [ "x86_64-darwin" "x86_64-darwin" ];
+      platforms = [ "x86_64-linux" "x86_64-darwin" ];
     };
   }
diff --git a/pkgs/larbs-news/default.nix b/pkgs/larbs-news/default.nix
new file mode 100644
index 0000000..3891802
--- /dev/null
+++ b/pkgs/larbs-news/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, makeWrapper, callPackage, newsboat }:
+with stdenv.lib;
+
+let
+  voidrice = callPackage ../voidrice.nix { };
+  newsboatConfig = "${voidrice}/.config/newsboat/config";
+in
+
+mkDerivation {
+  pname = "larbs-news";
+  version = "1.0";
+  unpackPhase = "true";
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    makeWrapper ${newsboat}/bin/newsboat $out/bin/newsboat \
+      --add-flags "-C ${newsboatConfig}"
+  '';
+
+  meta = {
+    homepage = "https://github.com/LukeSmithXYZ/voidrice";
+    description = "Newsboat RSS reader with vim bindings";
+    license = licenses.gpl3;
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/voidrice.nix b/pkgs/voidrice.nix
new file mode 100644
index 0000000..9acf6c2
--- /dev/null
+++ b/pkgs/voidrice.nix
@@ -0,0 +1,7 @@
+{ pkgs ? import <nixpkgs> }:
+
+pkgs.fetchgit {
+  url = "https://github.com/LukeSmithxyz/voidrice";
+  rev = "b768fc601e9b587aa800cd0656a8eee170bd1c93";
+  sha256 = "1i35n0qfh0llfg1b8la9yj7qsycwlmipgfp6k1yz9r27gjll768z";
+}