diff options
Diffstat (limited to '.config/guix/modules')
| -rw-r--r-- | .config/guix/modules/base.scm | 6 | ||||
| -rw-r--r-- | .config/guix/modules/dwm.scm | 16 | ||||
| -rw-r--r-- | .config/guix/modules/emacs.scm | 5 | ||||
| -rw-r--r-- | .config/guix/modules/xorg.scm | 32 |
4 files changed, 17 insertions, 42 deletions
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm index c96bb7b..13f25a3 100644 --- a/.config/guix/modules/base.scm +++ b/.config/guix/modules/base.scm @@ -45,6 +45,7 @@ graphviz ;; graphviz image ;; flameshot imagemagick ;; imagemagick + image-viewers ;; nsxiv librewolf ;; librewolf linux ;; sysstat mail ;; offlineimap @@ -54,8 +55,8 @@ pdf ;; xpdf rsync ;; rsync screen ;; screen - tex ;; texlive-dvipng texlive ;; texlive + tex ;; texlive-dvipng tor-browsers ;; tor-browser version-control ;; git video ;; ffmpeg, mpv, yt-dlp @@ -82,8 +83,9 @@ curl git jq - netcat man-pages + netcat + nsxiv recutils rsync stow diff --git a/.config/guix/modules/dwm.scm b/.config/guix/modules/dwm.scm index c71767e..1befa60 100644 --- a/.config/guix/modules/dwm.scm +++ b/.config/guix/modules/dwm.scm @@ -4,11 +4,9 @@ #:use-module (gnu home services desktop) #:use-module (guix gexp) #:use-module (guix packages) - #:export (bd-dwm-system-packages - bd-dwm-home-services)) + #:export (bd-dwm-system-packages)) (use-package-modules - image-viewers ;; nsxiv suckless ;; dwm xdisorg ;; xdotool xorg ;; xprop @@ -24,18 +22,6 @@ (define bd-dwm-system-packages (list bd-dwm - nsxiv xdotool xprop )) - -(define bd-dwm-home-services - (list - (simple-service 'dotfiles - home-files-service-type - `((".Xresources" - ,(plain-file "Xresources" " -Nsxiv.window.background: #000000 -Nsxiv.window.foreground: #FFFFFF -Nsxiv.bar.font: Terminus:size=9 -")))))) diff --git a/.config/guix/modules/emacs.scm b/.config/guix/modules/emacs.scm index 0c34c8c..b1f58d6 100644 --- a/.config/guix/modules/emacs.scm +++ b/.config/guix/modules/emacs.scm @@ -23,18 +23,20 @@ (define (bd-emacs-package-list config) (list - ;; direct emacs-auctex emacs-consult emacs-denote + emacs-desktop-environment emacs-ef-themes emacs-emms + emacs-exwm emacs-guix emacs-lua-mode emacs-magit emacs-marginalia emacs-orderless emacs-paredit + emacs-password-store emacs-pinentry emacs-popper emacs-rainbow-delimiters @@ -44,7 +46,6 @@ emacs-vertico emacs-visual-fill-column - ;; associative aspell aspell-dict-en )) diff --git a/.config/guix/modules/xorg.scm b/.config/guix/modules/xorg.scm index 11a2e35..52ebf8b 100644 --- a/.config/guix/modules/xorg.scm +++ b/.config/guix/modules/xorg.scm @@ -94,27 +94,21 @@ add mod3 = Hyper_L add mod4 = Super_L Super_R add mod5 = Mode_switch ISO_Level3_Shift ")) + (".Xresources" + ,(plain-file "Xresources" " +Nsxiv.window.background: #000000 +Nsxiv.window.foreground: #FFFFFF +Nsxiv.bar.font: Terminus:size=9 +")) (".xinitrc" ,(plain-file "xinitrc" " #!/bin/sh userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps -if [ -f $sysresources ]; then - - xrdb -merge $sysresources - -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - if [ -f \"$userresources\" ]; then xrdb -merge \"$userresources\" @@ -125,18 +119,10 @@ if [ -f \"$usermodmap\" ]; then xmodmap \"$usermodmap\" fi -# start some programs -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x \"$f\" ] && . \"$f\" - done - unset f -fi - picom & -dwmstatus & +# dwmstatus & eval \"$(ssh-agent -s)\" -emacs --daemon +# emacs --daemon xss-lock -- slock & set-bg xset r rate 250 70 @@ -144,7 +130,7 @@ xset s 600 touchpad-defaults xrandr-toggle xkeyboard-auto & -exec dwm")) +exec emacs -mm")) (".config/gtk-2.0/settings.ini" ,(plain-file "settings.ini" " [Settings] |