Switch to using GNU IceCat as default browser, update dependency list,

update toggle, update speedwm-utils
This commit is contained in:
speediegq 2022-09-17 16:39:35 +02:00
parent b2d5bfd067
commit fd53908241
5 changed files with 28 additions and 20 deletions

View file

@ -177,7 +177,7 @@ Below is a list of all speedwm keybinds.
- Music button | Open your defined music player - Music button | Open your defined music player
- WLAN button | Disconnect from WLAN - WLAN button | Disconnect from WLAN
-- Mouse -- ### Mouse
These binds can be activated using your mouse These binds can be activated using your mouse

View file

@ -35,7 +35,7 @@
These must be installed by default but you can change what software is required by editing 'options.h' and running 'make clean install'. These must be installed by default but you can change what software is required by editing 'options.h' and running 'make clean install'.
You can also remove keybinds by editing 'keybinds.h' and running 'make clean install'. You can also remove keybinds by editing 'keybinds.h' and running 'make clean install'.
- st (Terminal) - st (Terminal)
- firefox (Web browser) - GNU IceCat (Web browser)
- htop (Status monitor) - htop (Status monitor)
- newsboat (RSS reader) - newsboat (RSS reader)
- zathura (PDF reader) - zathura (PDF reader)

View file

@ -43,7 +43,7 @@
* Note that any software named "speedwm-*" is bundled with this build and does not need to be replaced unless you want to. * Note that any software named "speedwm-*" is bundled with this build and does not need to be replaced unless you want to.
*/ */
#define TERMINAL "st -e " /* Terminal to use */ #define TERMINAL "st -e " /* Terminal to use */
#define BROWSER "firefox" /* Web browser to use */ #define BROWSER "icecat" /* Web browser to use */
#define SYSTEMSTAT "htop" /* System stat viewer to use */ #define SYSTEMSTAT "htop" /* System stat viewer to use */
#define RSS "newsboat" /* RSS reader to use */ #define RSS "newsboat" /* RSS reader to use */
#define PDF "zathura" /* PDF reader to use */ #define PDF "zathura" /* PDF reader to use */
@ -66,7 +66,7 @@
/* Software classes */ /* Software classes */
#define TERMINAL_CLASS "st" /* Terminal to use for rules */ #define TERMINAL_CLASS "st" /* Terminal to use for rules */
#define BROWSER_CLASS "firefox" /* Web browser to use for rules */ #define BROWSER_CLASS "Navigator" /* Web browser to use for rules */
#define PDF_CLASS "Zathura" /* PDF reader to use for rules */ #define PDF_CLASS "Zathura" /* PDF reader to use for rules */
#define FILEMANAGER_CLASS "vifmrun" /* File manager that will be used for rules */ #define FILEMANAGER_CLASS "vifmrun" /* File manager that will be used for rules */

View file

@ -44,26 +44,28 @@ esac
} }
OPT() { OPT() {
MENUOPTS=$(printf "Layout\nReload .Xresources\nSpawn\nGeneral\nExit" | $RUNLAUNCHER -l 20 -p 'What do you want to do?') MENUOPTS=$(printf "Layout\nReload .Xresources\nGeneral\nExit" | $RUNLAUNCHER -l 20 -p 'What do you want to do?')
case "$MENUOPTS" in case "$MENUOPTS" in
"Layout") ${0} -layout $2 && exit 0 ;; "Layout") ${0} layout $2 && exit 0 ;;
"Reload .Xresources") ${0} -reloadxrdb && exit 0 ;; "Reload .Xresources") ${0} reloadcolors && exit 0 ;;
"Spawn") ${0} -spawn $2 && exit 0 ;;
"General") ${0} -general $2 && exit 0 ;; "General") ${0} -general $2 && exit 0 ;;
"Exit") exit 0 ;; "Exit") exit 0 ;;
esac esac
} }
HELP() { HELP() {
printf "speedwmutils allows you to control speedwm using your terminal or dmenu/rofi.\n-- Arguments --\n-layout | Let the user select a speedwm layout\n-reloadxrdb | Reload .Xresources\n-spawn | Spawn a command through speedwm\n-exec | Execute an fsignal signum\n-list | List all available signums\n" > /tmp/speedwm-printed-help printf "speedwmutils - Control speedwm using your terminal or dmenu.\n"
pgrep -x $RUNLAUNCHER || cat /tmp/speedwm-printed-help printf "\nlayout Let the user select a speedwm layout"
pgrep -x $RUNLAUNCHER && cat /tmp/speedwm-printed-help | $RUNLAUNCHER -p 'speedwmutils help' $GRIDARG $GRIDNUM -l 20 printf "\nreloadcolors Reload .Xresources"
printf "\nexec <signum> Execute an fsignal signum"
printf "\nlist List all available signums"
printf "\n"
} }
# Source layout data # Source layout data
if [ -e "/usr/share/speedwm-layouts" ]; then if [ -e "/usr/share/speedwmlayouts" ]; then
. /usr/share/speedwm-layouts . /usr/share/speedwmlayouts
fi fi
# Tile # Tile
@ -157,12 +159,11 @@ if [ "$LAYOUT_STAIRS" = "1" ]; then
fi fi
case "$1" in case "$1" in
"-layout") SEL_LAYOUT=$(printf "${L1}\nL2: Floating\n${L3}\n${L4}\n${L5}\n${L6}\n${L7}\n${L8}\n${L9}\n${L10}\n${L11}\n${L12}\n${L13}\n${L14}\n${L15}\n${L16}\n${L17}\n${L18}\n${L19}\nPrevious Layout\nNext Layout" | $RUNLAUNCHER -l 21 -p "Pick a layout: ") ;; "layout") SEL_LAYOUT=$(printf "${L1}\nL2: Floating\n${L3}\n${L4}\n${L5}\n${L6}\n${L7}\n${L8}\n${L9}\n${L10}\n${L11}\n${L12}\n${L13}\n${L14}\n${L15}\n${L16}\n${L17}\n${L18}\n${L19}\nPrevious Layout\nNext Layout" | $RUNLAUNCHER -l 21 -p "Pick a layout: ") ;;
"-spawn") printf "Not complete" ;; "list") sed 's|xsetroot -name "fsignal:||g; s|"||g; s| - ||g; s@|@-@g' /usr/share/speedwm-fsignal | head -n "$(expr "$(cat /usr/share/speedwm-fsignal | wc -l)" - 1)" ;;
"-list") sed 's|xsetroot -name "fsignal:||g' /usr/share/speedwm-fsignal | sed 's|"||g' ;; "reloadcolors") xsetroot -name "fsignal:31" ;;
"-reloadxrdb") xsetroot -name "fsignal:31" ;;
"-help") HELP ;; "-help") HELP ;;
"-exec") "exec")
if [ "$2" = "" ]; then if [ "$2" = "" ]; then
exit 0 exit 0
else else

View file

@ -1,10 +1,13 @@
/* Toggle patches /* Toggle patches
* This header allows you to enable/disable patches that can break compability or decrease performance with certain OSes or configurations. * This header allows you to enable/disable patches that can break compability or decrease performance with certain OSes or configurations.
*
* If it's disabled (set to 0), it will not be compiled in with speedwm. This keeps the binary small and may make the experience better. * If it's disabled (set to 0), it will not be compiled in with speedwm. This keeps the binary small and may make the experience better.
*/ */
/* IPC */ /* IPC */
#define USEIPC 1 /* Whether or not to use IPC. If you set this to 1, set USEIPC to true in toggle.mk and comment the YAJLLIBS and YAJLINC lines in config.mk. Not compatible with BSDs so for those, set this to 0. */ #define USEIPC 1 /* Whether or not to use IPC.
NOTE: If you set this to 1, set USEIPC to true in toggle.mk and comment the YAJLLIBS and YAJLINC lines in config.mk.
Not compatible with BSDs so for those, set this to 0. */
/* Alpha related patches /* Alpha related patches
* *
@ -13,6 +16,9 @@
*/ */
#define USEALPHA 1 /* Whether or not to use transparency for the bar */ #define USEALPHA 1 /* Whether or not to use transparency for the bar */
#define USEFADE 1 /* Whether or not to use fading windows */ #define USEFADE 1 /* Whether or not to use fading windows */
/* Miscellanious
*/
#define USEROUNDCORNERS 1 /* Whether or not to use rounded corners */ #define USEROUNDCORNERS 1 /* Whether or not to use rounded corners */
#define USEMEDIA 1 /* Whether or not to use media keys */ #define USEMEDIA 1 /* Whether or not to use media keys */
#define USEMOUSE 1 /* Whether or not to use mouse binds */ #define USEMOUSE 1 /* Whether or not to use mouse binds */
@ -25,7 +31,8 @@
#define USEIMLIB2 1 /* Whether or not to use imlib2. Required by USEWINICON and USETAGPREVIEW. */ #define USEIMLIB2 1 /* Whether or not to use imlib2. Required by USEWINICON and USETAGPREVIEW. */
#define USEWINICON 1 /* Whether or not to use window icons. Requires imlib to be enabled in toggle.mk and it must be installed. */ #define USEWINICON 1 /* Whether or not to use window icons. Requires imlib to be enabled in toggle.mk and it must be installed. */
#define USETAGPREVIEW 1 /* Whether or not to use tag previews. Requires imlib to be enabled in toggle.mk and it must be installed. */ #define USETAGPREVIEW 1 /* Whether or not to use tag previews. Requires imlib to be enabled in toggle.mk and it must be installed. */
#define USETAGPREVIEWFIX 0 /* Experimental fix for tag previews showing up in the tag preview when a window animations are enabled. Using this is not recommended and if you use the mouse to switch tags, it will not work. */ #define USETAGPREVIEWFIX 0 /* Experimental fix for tag previews showing up in the tag preview when a window animations are enabled.
Using this is not recommended and if you use the mouse to switch tags, it will not work. */
/* Layouts /* Layouts
* If you don't use a layout, you can remove it to keep the speedwm binary small. * If you don't use a layout, you can remove it to keep the speedwm binary small.