citadel

commit d46b96f4124931480ef0e6f9d6a5bf5bb82e80df
parent 5594f4bcf79d19603a4be42383939c87b4675167
Author: William Casarin <jb55@jb55.com>
Date:   Sat,  6 Feb 2021 10:12:16 -0800

go back to dmenu1

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
bin/dclip
 | 
2
+-
M
bin/dmenu
 | 
2
+-
M
bin/dmenu-emoji
 | 
2
+-
M
bin/dmenup
 | 
2
+-
M
nix-config/environment/desktop/default.nix
 | 
2
+-
M
nix-config/nixpkgs/config.nix
 | 
16
++++++++--------

6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/bin/dclip b/bin/dclip
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec clipmenu "$@" -i -fn Inconsolata:size=14 -p clip -l 40 -w 700
+exec clipmenu "$@" -i -fn Inconsolata:size=14 -p clip -l 40 
diff --git a/bin/dmenu b/bin/dmenu
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-exec /run/current-system/sw/bin/dmenu -fn terminus-12 "$@"
+exec /run/current-system/sw/bin/dmenu -fn Inconsolata:size=14 "$@"
diff --git a/bin/dmenu-emoji b/bin/dmenu-emoji
@@ -17,7 +17,7 @@ case "$1" in
     fi
     ;;
   "")
-    bash $0 list | dmenu -p 'Emoji: ' | bash $0 copy
+    bash $0 list | dmenu -l 20 -p 'Emoji: ' | bash $0 copy
     ;;
 esac
 
diff --git a/bin/dmenup b/bin/dmenup
@@ -10,6 +10,6 @@ fi
 prompt="$1"
 shift
 
-out=$(dmenu -noinput -p "$prompt")
+out=$(dmenu -p "$prompt")
 
 "$@" $out
diff --git a/nix-config/environment/desktop/default.nix b/nix-config/environment/desktop/default.nix
@@ -25,7 +25,7 @@ let gtk2rc = pkgs.writeText "gtk2rc" ''
       aerc
       clipmenu
       colorpicker
-      dmenu2
+      dmenu
       dragon-drop
       dunst
       dynamic-colors
diff --git a/nix-config/nixpkgs/config.nix b/nix-config/nixpkgs/config.nix
@@ -109,14 +109,14 @@ in {
     #       '';
     #     });
 
-    dmenu2 = pkgs.lib.overrideDerivation super.dmenu2 (attrs: {
-      patches =
-        [ (super.fetchurl
-          { url = "https://jb55.com/s/404ad3952cc5ccf3.patch";
-            sha1 = "404ad3952cc5ccf3aa0674f31a70ef0e446a8d49";
-          })
-        ];
-    });
+    #dmenu2 = pkgs.lib.overrideDerivation super.dmenu2 (attrs: {
+    #  patchs =
+    #    [ (super.fetchurl
+    #      { url = "https://jb55.com/s/404ad3952cc5ccf3.patch";
+    #        sha1 = "404ad3952cc5ccf3aa0674f31a70ef0e446a8d49";
+    #      })
+    #    ];
+    #});
 
     #htop = pkgs.lib.overrideDerivation super.htop (attrs: {
     #  patches =