From 6293cc326c52d5349396c5f4a8e529e3e5c7935b Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Thu, 11 Jun 2020 01:11:26 -0400
Subject: [PATCH] Add rfd python package nix overlay (#11)

* Add python3.8

* Add rfd python package overlay
---
 .config/bspwm/bspwmrc            |  7 ++++--
 .config/lemonbar/lemonbar.sh     |  9 +++-----
 .config/nixpkgs/home.nix         | 21 +++++++++--------
 .config/nixpkgs/overlays/rfd.nix | 39 ++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 18 deletions(-)
 create mode 100644 .config/nixpkgs/overlays/rfd.nix

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 8f1221b..f8777b8 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -1,4 +1,7 @@
-#! /bin/sh
+#!/usr/bin/env bash
+
+p='sxhkd stalonetray lemonbar'
+for i in $p; do pkill "$i"; done
 
 sxhkd &
 
@@ -47,5 +50,5 @@ fi
 
 sleep 3
 
-xdo above -t "$(xdo id -n root)" "$(xdo id -n stalonetray)"
 xdo above -t "$(xdo id -n root)" "$(xdo id -n lemonbar)"
+xdo above -t "$(xdo id -n lemonbar)" "$(xdo id -n stalonetray)"
diff --git a/.config/lemonbar/lemonbar.sh b/.config/lemonbar/lemonbar.sh
index de2d06f..bf47ac4 100755
--- a/.config/lemonbar/lemonbar.sh
+++ b/.config/lemonbar/lemonbar.sh
@@ -41,21 +41,18 @@ ActiveWindow() {
   echo -n " %{F$grey}[ $title ]%{F-}%{B-}"
 }
 
-Weather() {
-  echo '(' "$(curl -Ss 'https://wttr.in/yxu?0&T&Q' 2>/dev/null | cut -c 16- | head -2 | xargs echo)" ')'
-}
-
 Ip() {
   dig +short myip.opendns.com @resolver1.opendns.com
 }
 
 while true; do
+
   if ! (($(date '+%s') % 60)); then
     ip=$(Ip)
-    weather=$(Weather)
   fi
+
   desktop_name=$(bspc query -D -d focused --names)
-  panel_info=$(echo -e "%{c}[$desktop_name] $(ActiveWindow)" "%{r}$weather $ip $(Calendar)$(Clock)$(Battery)")
+  panel_info=$(echo -e "%{c}[$desktop_name] $(ActiveWindow)" "%{r}$ip $(Calendar)$(Clock)$(Battery)")
   # List of all the monitors/screens
   monitors=$(xrandr | grep -o "^.* connected" | sed "s/ connected//")
   tmp=0
diff --git a/.config/nixpkgs/home.nix b/.config/nixpkgs/home.nix
index 298e57d..110b6a2 100644
--- a/.config/nixpkgs/home.nix
+++ b/.config/nixpkgs/home.nix
@@ -37,11 +37,12 @@
     nmap
     openvpn
     postman
-    python3
+    python38
+    rfd
     ripgrep
-    ruby
     rustup
     shellcheck
+    shfmt
     signal-desktop
     slack
     spotify
@@ -56,7 +57,7 @@
     zathura
     zip
     zsh-autosuggestions
-    zsh-syntax-highlighting
+    zsh-fast-syntax-highlighting
   ];
 
   programs.zsh = {
@@ -71,14 +72,14 @@
     };
 
     initExtra = ''
-      eval "$(direnv hook zsh)"
-      eval "$(_RFD_COMPLETE=source_zsh rfd)"
-      eval "$(starship init zsh)"
-
       export EDITOR='neovim'
       export GPG_TTY=$(tty)
       export GOPATH=$HOME/go
-      source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+      export PATH=$PATH:~/.local/bin
+
+      eval "$(direnv hook zsh)"
+      eval "$(_RFD_COMPLETE=source_zsh rfd)"
+      eval "$(starship init zsh)"
     '';
 
     shellAliases = {
@@ -99,8 +100,8 @@
 
     plugins = [
       {
-        name = "syntax-highlighting";
-        src = "${pkgs.zsh-syntax-highlighting}/share/zsh/site-functions";
+        name = "fast-syntax-highlighting";
+        src = "${pkgs.zsh-fast-syntax-highlighting}/share/zsh/site-functions";
       }
     ];
 
diff --git a/.config/nixpkgs/overlays/rfd.nix b/.config/nixpkgs/overlays/rfd.nix
new file mode 100644
index 0000000..7683af2
--- /dev/null
+++ b/.config/nixpkgs/overlays/rfd.nix
@@ -0,0 +1,39 @@
+self: super:
+rec {
+
+  python3 = with super; super.python3.override {};
+
+  pythonPackages = python3.pkgs;
+
+  rfd = with self; pythonPackages.buildPythonApplication rec {
+    pname = "rfd";
+    version = "v0.3.4";
+
+    src = fetchFromGitHub {
+      owner = "davegallant";
+      repo = "rfd";
+      rev = version;
+      sha256 = "08f9xsw5h35p5sbljrv7vrzvdz17icgr85n7507p27fcg0yphd0s";
+    };
+
+    # No tests included
+    doCheck = false;
+
+    propagatedBuildInputs = with pythonPackages; [
+      beautifulsoup4
+      click
+      colorama
+      requests
+    ];
+
+    passthru.python3 = python3;
+
+    meta = with super.lib; {
+      homepage = "https://www.redflagdeals.com/";
+      description = "View RedFlagDeals from the command line";
+      license = licenses.asl20;
+      maintainers = [ ];
+    };
+  };
+}
+