diff options
-rwxr-xr-x | dwm/.dwm/autostart | 39 | ||||
-rw-r--r-- | dwm/chadwm/config.def.h | 65 |
2 files changed, 61 insertions, 43 deletions
diff --git a/dwm/.dwm/autostart b/dwm/.dwm/autostart index 71595cc..fa49455 100755 --- a/dwm/.dwm/autostart +++ b/dwm/.dwm/autostart @@ -1,26 +1,28 @@ #!/bin/sh # How2bind??? -#setxkbmap -layout us,no -option grp:ctrl_win_l_toggle -setxkbmap -layout no -picom --vsync --no-fading-openclose --refresh-rate "59.96" & -xrdb merge ~/Public/xresources/forest/.Xresources & -feh --auto-reload --bg-fill ~/Pictures/wall.jpg & +#setxkbmap -layout us,no -option grp:ctrl_alt_toggle +#setxkbmap -layout no +picom --vsync --no-fading-openclose --shadow-opacity=1.0 --dbus & + +xrandr --output HDMI1 --auto --same-as eDP1 --mode 1920x1080 & +# Uncomment below to extend screen to the right of the laptop screen +# xrandr --output HDMI-1 --auto --right-of eDP1 +feh --auto-reload --bg-fill /usr/share/backgrounds/background.png & # Set up touchpad controls # Libinput -#TID=$(xinput | sed -n 's/.*Touchpad.*id=\([0-9]*\).*/\1/p') -#xinput --set-prop $TID 'libinput Accel Speed' 0.5 -#xinput --set-prop $TID 'libinput Tapping Enabled' 1 -#xinput --set-prop $TID 'libinput Natural Scrolling Enabled' 1 +TID=$(xinput | sed -n 's/.*Touchpad.*id=\([0-9]*\).*/\1/p') #xinput --set-prop $TID 'libinput Accel Speed' 0.5 +xinput --set-prop $TID 'libinput Tapping Enabled' 1 & +xinput --set-prop $TID 'libinput Natural Scrolling Enabled' 1 & # Synapse -TID=`xinput list | grep "SynPS/2 Synaptics TouchPad" | sed 's/.*id=\([0-9]*\).*/\1/g'` -PROP_NO=`xinput list-props ${TID} | grep "Synaptics Scrolling Distance" | sed 's/.*(\([0-9]*\)).*/\1/g'` +#TID=`xinput list | grep "SynPS/2 Synaptics TouchPad" | sed 's/.*id=\([0-9]*\).*/\1/g'` +#PROP_NO=`xinput list-props ${TID} | grep "Synaptics Scrolling Distance" | sed 's/.*(\([0-9]*\)).*/\1/g'` #xinput --set-prop $TID 'Synaptics Tap Action' 1 -xinput set-prop ${TID} ${PROP_NO} -106 -106 +#xinput set-prop ${TID} ${PROP_NO} -106 -106 # run bar script and dwm ( do not remove this ) SYMLINKDIR=$(readlink -f "$0") @@ -30,6 +32,19 @@ xrdb merge $BASEDIR/xresources & dunst & nm-applet & +blueman-applet & light-locker --lock-on-suspend & +thunar --daemon & + +# see https://unix.stackexchange.com/a/295652/332452 +source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh + +# init keyring +eval $(gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh) +# export keyring +export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK + +# see https://github.com/NixOS/nixpkgs/issues/14966#issuecomment-520083836 +mkdir -p "$HOME"/.local/share/keyrings dbus-run-session dwm diff --git a/dwm/chadwm/config.def.h b/dwm/chadwm/config.def.h index b49ef88..d69d375 100644 --- a/dwm/chadwm/config.def.h +++ b/dwm/chadwm/config.def.h @@ -34,10 +34,12 @@ static const int scalepreview = 4; static int tag_preview = 1; /* 1 means enable, 0 is off */ static const char *fonts[] = { - "JetBrainsMono Nerd Font:style:medium:size=10", - "Material Design Icons-Regular:size=10", + "JetBrains Mono:medium:size=12", + "JetBrainsMono Nerd Font:style:medium:size=12", + "Material Design Icons-Regular:size=12", + "Material Design Icons:style=Regular:size=12" }; -static const char dmenufont[] = "monospace:size=10"; +static const char dmenufont[] = "monospace:size=12"; static const int colorfultag = 1; /* 0 means use SchemeSel for selected non vacant tag */ // theme @@ -71,10 +73,11 @@ static const unsigned int ulinevoffset = static const int ulineall = 0; /* 1 to show underline on all tags, 0 for just the active ones */ static const Rule rules[] = { - /* xprop(1): - * WM_CLASS(STRING) = instance, class - * WM_NAME(STRING) = title - */ + /** + * xprop(1): + * WM_CLASS(STRING) = instance, class + * WM_NAME(STRING) = title + */ /* class instance title tags mask iscentered isfloating monitor */ {"Gimp", NULL, NULL, 0, 0, 1, -1}, {"Firefox", NULL, NULL, 1 << 8, 0, 0, -1}, @@ -105,19 +108,19 @@ static const Layout layouts[] = { /* key definitions */ #define MODKEY Mod4Mask #define TAGKEYS(KEY, TAG) \ - {MODKEY, KEY, view, {.ui = 1 << TAG}}, \ - {MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \ - {MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \ - {MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, + {MODKEY, KEY, view, {.ui = 1 << TAG}}, \ + {MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \ + {MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \ + {MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) \ - { \ - .v = (const char *[]) \ - { \ - "/bin/sh", "-c", cmd, NULL \ - } \ - } + { \ + .v = (const char *[]) \ + { \ + "/bin/sh", "-c", cmd, NULL \ + } \ + } /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ @@ -137,7 +140,7 @@ static const char *keyboard_brightness_down[] = {"xbacklight", "-ctrl", "asus::k static const char *player_toggle[] = {"playerctl", "play-pause", NULL}; static const char *player_next[] = {"playerctl", "next", NULL}; static const char *player_previous[] = {"playerctl", "previous", NULL}; -static const char *screen_lock[] = {"light-locker-command", "-l", NULL}; +static const char *screen_lock[] = {"dm-tool", "lock", NULL}; static Key keys[] = { /* modifier key function argument */ @@ -146,7 +149,7 @@ static Key keys[] = { /* {MODKEY | ControlMask, XK_u, spawn, SHCMD("maim | xclip -selection clipboard -t image/png")}, {MODKEY, XK_u, spawn, SHCMD("maim --select | xclip -selection clipboard -t image/png")}, - */ + */ {0, XF86XK_MonBrightnessDown, spawn, {.v = xd}}, {0, XF86XK_MonBrightnessUp, spawn, {.v = xi}}, {0, XF86XK_KbdBrightnessUp, spawn, {.v = keyboard_brightness_up}}, @@ -229,8 +232,8 @@ static Key keys[] = { {MODKEY | ShiftMask, XK_w, setborderpx, {.i = default_border}}, TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2) TAGKEYS(XK_4, 3) TAGKEYS(XK_5, 4) - TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6) TAGKEYS(XK_8, 7) - TAGKEYS(XK_9, 8){MODKEY | ControlMask, XK_q, quit, {0}}, + TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6) TAGKEYS(XK_8, 7) + TAGKEYS(XK_9, 8){MODKEY | ControlMask, XK_q, quit, {0}}, {MODKEY | ShiftMask, XK_r, quit, {1}}, {MODKEY, XK_e, hidewin, {0}}, {MODKEY | ShiftMask, XK_e, restorewin, {0}}, @@ -250,19 +253,19 @@ static Button buttons[] = { /* { ClkClientWin, MODKEY, Button1, movemouse, {0} }, */ /* placemouse options, choose which feels more natural: - * 0 - tiled position is relative to mouse cursor - * 1 - tiled postiion is relative to window center - * 2 - mouse pointer warps to window center - * - * The moveorplace uses movemouse or placemouse depending on the floating state - * of the selected client. Set up individual keybindings for the two if you want - * to control these separately (i.e. to retain the feature to move a tiled window - * into a floating position). - */ + * 0 - tiled position is relative to mouse cursor + * 1 - tiled postiion is relative to window center + * 2 - mouse pointer warps to window center + * + * The moveorplace uses movemouse or placemouse depending on the floating state + * of the selected client. Set up individual keybindings for the two if you want + * to control these separately (i.e. to retain the feature to move a tiled window + * into a floating position). + */ {ClkClientWin, MODKEY, Button1, moveorplace, {.i = 0}}, {ClkClientWin, MODKEY, Button2, togglefloating, {0}}, {ClkClientWin, MODKEY, Button3, resizemouse, {0}}, - {ClkClientWin, ControlMask, Button1, dragmfact, {0}}, + /*{ClkClientWin, ControlMask, Button1, dragmfact, {0}},*/ {ClkClientWin, ControlMask, Button3, dragcfact, {0}}, {ClkTagBar, 0, Button1, view, {0}}, {ClkTagBar, 0, Button3, toggleview, {0}}, |