.config/nixpkgs/packages/dmenu: Use my source and patches

5 files changed, 23 insertions, 34 deletions

diff --git a/.config/X11/Xresources b/.config/X11/Xresources
index 11b6455..40ca082 100644
--- a/.config/X11/Xresources
+++ b/.config/X11/Xresources
@@ -84,11 +84,15 @@ Xft.lcdfilter: lcddefault
 ! DMENU Settings
 ! -----------------
 
-dmenu.font:          xft:Sans:size=9:style=bold
-dmenu.background:    #000000
-dmenu.foreground:    #ffffff
-dmenu.selforeground: #000000
-dmenu.selbackground: #42aaf0
+dmenu.font:             xft:Sans:size=10:style=bold
+dmenu.foreground:       #80c6ff
+dmenu.selforeground:    #75c277
+dmenu.selhiforeground:  #ffffff
+dmenu.normhiforeground: #75c277
+dmenu.background:       #111111
+dmenu.selbackground:    #111111
+dmenu.selhibackground:  #111111
+dmenu.normhibackground: #111111
 
 ! -----------------
 ! X Settings
diff --git a/.config/nixpkgs/packages/dmenu/default.nix b/.config/nixpkgs/packages/dmenu/default.nix
index 53dbf28..496929f 100644
--- a/.config/nixpkgs/packages/dmenu/default.nix
+++ b/.config/nixpkgs/packages/dmenu/default.nix
@@ -1,28 +1,17 @@
-{ lib, stdenv, fetchurl, fetchpatch, libX11, libXinerama, libXft, zlib }:
+{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-5.0";
+  name = "dmenu";
+  version = "9b0be7712e2aae65b459f758a080c56983056021";
 
-  src = fetchurl {
-    url = "https://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y";
+  src = fetchgit {
+    rev = version;
+    url = "https://www.thedroneely.com/git/thedroneely/dmenu/";
+    sha256 = "0sbwwxbm5bcn0m4s1y2gl90wc224kf6755d1xdr23bz5ihy3jzg2";
   };
 
   buildInputs = [ libX11 libXinerama zlib libXft ];
 
-  patches = [
-    (fetchpatch {
-      name = "dmenu-xresources-4.9.patch";
-      url = "https://tools.suckless.org/dmenu/patches/xresources/dmenu-xresources-4.9.diff";
-      sha256 = "0clczp17zwkxy1qhy0inqjplxpq4mgaf4vvfvn063hk733r4i7rn";
-    })
-    (fetchpatch {
-      name = "dmenu-fuzzymatch-4.9.patch";
-      url = "https://tools.suckless.org/dmenu/patches/fuzzymatch/dmenu-fuzzymatch-4.9.diff";
-      sha256 = "000fkg4dcr2vrpd442f2v6ycmmxdml781ziblzx5rxvvyclsryfd";
-    })
-  ];
-
   postPatch = ''
     sed -ri -e 's!\<(dmenu|dmenu_path|stest)\>!'"$out/bin"'/&!g' dmenu_run
     sed -ri -e 's!\<stest\>!'"$out/bin"'/&!g' dmenu_path
@@ -34,11 +23,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "CC:=$(CC)" ];
 
-  meta = with lib; {
-    description = "A generic, highly customizable, and efficient menu for the X Window System";
+  meta = {
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
     homepage = "https://tools.suckless.org/dmenu";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pSub globin ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ pSub globin ];
+    description = "A generic, highly customizable, and efficient menu for the X Window System";
   };
 }
diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index 763df21..0270531 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -13,7 +13,7 @@ map cw eval fm.execute_console("bulkrename") if fm.thisdir.marked_items else fm.
 map / console scout -ftsea%space
 
 # Open with dmenu
-map ru shell compgen -c | dmenu -f -i -b -p 'Open With' | xargs -I{} -r bash -c "{} %s &> /dev/null" &
+map ru shell compgen -c | dmenu -f -i -b -p ⠀:::⠀open⠀::: | xargs -I{} -r /bin/sh -c "{} %s > /dev/null 2>&1" &
 
 # Sort by last modified
 set sort=ctime
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index b4b8fea..af15d51 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -1,10 +1,6 @@
 configuration {
-  bw:                0;
   kb-remove-to-eol:  "";
-  hide-scrollbar:    true;
   disable-history:   false;
-  fake-transparency: false;
-  separator-style:   "none";
   kb-row-up:         "Up,Control+k";
   kb-row-down:       "Down,Control+j";
   kb-accept-entry:   "Control+m,Return,KP_Enter";
diff --git a/.config/spacefm/session b/.config/spacefm/session
index 07cec65..f99e196 100644
--- a/.config/spacefm/session
+++ b/.config/spacefm/session
@@ -569,7 +569,7 @@ cstm_298bc815-key=111
 cstm_298bc815-keymod=4
 cstm_298bc815-label=Open with...
 cstm_298bc815-prev=con_open
-cstm_298bc815-line=bash -c 'compgen -c' | dmenu -f -i -b -p 'Open With' | xargs -I{} -r bash -c "{} '${fm_files[@]}'"
+cstm_298bc815-line=bash -c 'compgen -c' | dmenu -f -i -b -p '⠀:::⠀open⠀:::' | xargs -I{} -r bash -c "{} '${fm_files[@]}'"
 cstm_298bc815-task_err=1
 cstm_298bc815-task_out=1
 cstm_36fddd7b-y=