diff options
| -rw-r--r-- | .config/guix/modules/base.scm | 8 | ||||
| -rw-r--r-- | .config/guix/modules/dwm/config.def.h | 9 | ||||
| -rw-r--r-- | .config/guix/modules/xorg.scm | 5 | ||||
| -rw-r--r-- | .config/guix/vali.scm | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm index 7171d82..70fd690 100644 --- a/.config/guix/modules/base.scm +++ b/.config/guix/modules/base.scm @@ -51,7 +51,6 @@ video ;; yt-dlp vim ;; vim web ;; jq - xdisorg ;; ydotool ) @@ -78,7 +77,6 @@ texlive unzip vim - ydotool )) (define desk @@ -159,7 +157,11 @@ (home-gpg-agent-configuration (pinentry-program (file-append pinentry-emacs "/bin/pinentry-emacs")) - (ssh-support? #t))) + (ssh-support? #t) + (default-cache-ttl 28800) + (max-cache-ttl 28800) + (default-cache-ttl-ssh 28800) + (max-cache-ttl-ssh 28800))) (service home-bash-service-type (home-bash-configuration diff --git a/.config/guix/modules/dwm/config.def.h b/.config/guix/modules/dwm/config.def.h index defcde5..821998d 100644 --- a/.config/guix/modules/dwm/config.def.h +++ b/.config/guix/modules/dwm/config.def.h @@ -74,7 +74,6 @@ static const Layout layouts[] = { static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ /* tools */ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_black, "-sf", col_gray4, NULL }; -static const char *slockcmd[] = { "slock", NULL }; /* brightness control */ static const char *lowerbgt[] = { "brightnessctl", "set", "5%-", NULL }; static const char *upperbgt[] = { "brightnessctl", "set", "5%+", NULL }; @@ -91,17 +90,17 @@ static const char *flameall[] = { "flameshot", "full", NULL }; /* other applications */ static const char *icecmd[] = { "icecat", NULL }; static const char *wolfcmd[] = { "librewolf", NULL }; -static const char *emacscmd[] = { "emacsclient", "-nc", NULL }; +static const char *termcmd[] = { "emacsclient", "-nc", NULL }; static const Key keys[] = { /* modifier key function argument */ { MODKEY, XK_x, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_l, spawn, {.v = slockcmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = emacscmd } }, + { MODKEY|ShiftMask, XK_l, spawn, SHCMD("xset s activate; slock") }, + { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY|ShiftMask, XK_b, spawn, {.v = icecmd } }, { MODKEY|ShiftMask, XK_c, spawn, {.v = wolfcmd } }, - { MODKEY|ShiftMask, XK_o, spawn, SHCMD("ydotool type $(grep -v '^#' /home/bdunahu/.local/bin/bookmarks.txt | dmenu -i -l 4 | awk '{print $NF}')") }, + { MODKEY|ShiftMask, XK_o, spawn, SHCMD("xdotool type $(grep -v '^#' /home/bdunahu/.local/bin/bookmarks.txt | dmenu -i -l 4 | awk '{print $NF}')") }, { MODKEY|ShiftMask, XK_p, spawn, SHCMD("passmenu --type") }, { 0, XK_F2, spawn, {.v = lowerbgt } }, { 0, XK_F3, spawn, {.v = upperbgt } }, diff --git a/.config/guix/modules/xorg.scm b/.config/guix/modules/xorg.scm index f57abc2..72afa90 100644 --- a/.config/guix/modules/xorg.scm +++ b/.config/guix/modules/xorg.scm @@ -25,6 +25,7 @@ pulseaudio ;; pavucontrol, pulseaudio, suckless ;; dmenu, xorg ;; xprop, xf86-input-libinput, xf86-video-fbdev, xinit... + xdisorg ;; xdotool ) (define dwm-package @@ -47,6 +48,7 @@ dwm-package feh + xdotool xf86-input-libinput xf86-video-fbdev xinit @@ -54,6 +56,7 @@ xorg-server xrdb xset + xss-lock )) (define bd-desktop-system-services @@ -137,8 +140,10 @@ fi picom & dwmstatus & emacs --daemon +xss-lock -- slock & set-bg xset r rate 250 70 +xset s 600 exec dwm")) (".config/gtk-2.0/settings.ini" ,(plain-file "settings.ini" " diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm index afc50fd..46b36bb 100644 --- a/.config/guix/vali.scm +++ b/.config/guix/vali.scm @@ -15,7 +15,7 @@ #:use-module (guix gexp) #:use-module (modules base) #:use-module (modules mpd) - #:use-module (modules wayland) + #:use-module (modules xorg) #:use-module (modules ymir)) |