diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json index 2694649..e5bd84e 100644 --- a/.config/Code/User/settings.json +++ b/.config/Code/User/settings.json @@ -22,5 +22,6 @@ "viewType": "jupyter.notebook.ipynb", "filenamePattern": "*.ipynb" } - ] + ], + "window.zoomLevel": -1 } \ No newline at end of file diff --git a/.local/bin/dmenusearch b/.local/bin/dmenusearch index 05cd993..015e37c 100755 --- a/.local/bin/dmenusearch +++ b/.local/bin/dmenusearch @@ -1,8 +1,11 @@ #!/usr/bin/env bash # -# Script name: dmsearch +# Script name: dmenusearch # Description: Search various search engines (inspired by surfraw). # Dependencies: dmenu and a web browser +# Usage: dmenusearch +# where engine is amazon, duckduckgo, etc. +# without engine all options will be listed # Pilfered from Derek Taylor @ https://www.gitlab.com/dwt1/dmscripts @@ -65,17 +68,23 @@ options[googleOpenSource]="https://opensource.google/projects/search?q=" options[googleExperimentswithGoogle]="https://experiments.withgoogle.com/search?q=" options[googleDataset]="https://datasetsearch.research.google.com/search?query=" -# Picking a search engine. -# shellcheck disable=SC2154 -while [ -z "$engine" ]; do - engine=$(printf '%s\n' "${!options[@]}" | sort | dmenu -i -p 'Choose search engine:') "$@" || exit - url="${options["${engine}"]}" || exit -done +if [ -z "$1" ]; then + # Picking a search engine. + # shellcheck disable=SC2154 + while [ -z "$engine" ]; do + engine=$(printf '%s\n' "${!options[@]}" | sort | dmenu -i -p 'Choose search engine:') "$@" || exit + url="${options["${engine}"]}" || exit + done +else + engine="$1" +fi + +url="${options["${engine}"]}" || exit # Searching the chosen engine. # shellcheck disable=SC2154 while [ -z "$query" ]; do - query=$(echo "$engine" | dmenu -p 'Enter search query:') "$@" || exit + query=$(echo "$engine" | dmenu -p 'Enter search query:') || exit done # Display search results in web browser diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 2ae77ab..934f48c 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -13,6 +13,7 @@ import XMonad.Actions.CopyWindow (kill1) import XMonad.Actions.CycleWS (moveTo, shiftTo, WSType(..), nextScreen, prevScreen) import XMonad.Actions.GridSelect import XMonad.Actions.MouseResize +import XMonad.Actions.Submap import XMonad.Actions.Promote import XMonad.Actions.RotSlaves (rotSlavesDown, rotAllDown) import qualified XMonad.Actions.TreeSelect as TS @@ -253,20 +254,29 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm, xK_t ), spawn "/home/solomon/.local/bin/passwords") -- launch searcher - ,((modm, xK_s ), spawn "/home/solomon/.local/bin/dmenusearch") + , ((modm, xK_s ), spawn "/home/solomon/.local/bin/dmenusearch") + + , ((modm, xK_s), submap . M.fromList $ + [ + -- just open dmenusearch + ((0, xK_a), spawn "/home/solomon/.local/bin/dmenusearch") + + -- open dmenusearch with duckduckgo preselected + , ((0, xK_d), spawn "/home/solomon/.local/bin/dmenusearch duckduckgo") + ]) -- launch mounter - ,((modm, xK_c ), spawn "/home/solomon/.local/bin/dmenumount") + , ((modm, xK_c ), spawn "/home/solomon/.local/bin/dmenumount") -- launch unmounter - ,((modm .|. shiftMask, xK_c ), spawn "/home/solomon/.local/bin/dmenuumount") + , ((modm .|. shiftMask, xK_c ), spawn "/home/solomon/.local/bin/dmendduumount") ] ++ -- -- music controlls as I figure them out - -- + --por [ -- decrease volume with mod+f11 ((modm, xK_F11), spawn "/home/solomon/.local/bin/dec-sink-volume")