diff options
| -rw-r--r-- | .config/emacs/bd-default.el | 10 | ||||
| -rw-r--r-- | .config/emacs/bd-development.el | 6 | ||||
| -rw-r--r-- | .config/emacs/bd-shells.el | 3 | ||||
| -rw-r--r-- | .config/emacs/bd-wm.el | 7 | ||||
| -rw-r--r-- | .config/guix-builds/bdunahu.scm | 26 | ||||
| -rw-r--r-- | .config/guix-builds/system-config.scm | 137 |
6 files changed, 101 insertions, 88 deletions
diff --git a/.config/emacs/bd-default.el b/.config/emacs/bd-default.el index 7d86347..8891822 100644 --- a/.config/emacs/bd-default.el +++ b/.config/emacs/bd-default.el @@ -15,6 +15,12 @@ ;;;; functions +(defun cleanup-buffer () + (interactive) + (delete-trailing-whitespace) + (untabify (point-min) (point-max)) + (indent-region (point-min) (point-max))) + (defun clamp (lower-bound upper-bound value) (max lower-bound (min value upper-bound))) @@ -59,6 +65,10 @@ open URL at point." (global-auto-revert-mode 1) (winner-mode 1) +;; messy editing + cleanup buffers on save +(setopt next-line-add-newlines t) +(add-hook 'before-save-hook 'cleanup-buffer) + ;; prompts (setopt use-short-answers t) (setopt vc-follow-symlinks t) diff --git a/.config/emacs/bd-development.el b/.config/emacs/bd-development.el index 478dc18..4958644 100644 --- a/.config/emacs/bd-development.el +++ b/.config/emacs/bd-development.el @@ -1,11 +1,5 @@ ;; -*- lexical-binding: t; -*- -(defun cleanup-buffer () - (interactive) - (delete-trailing-whitespace) - (untabify (point-min) (point-max)) - (indent-region (point-min) (point-max))) - (defun remote-shell () (interactive) (let ((default-directory "/ssh:bdunahu@perch.cs.colostate.edu:")) diff --git a/.config/emacs/bd-shells.el b/.config/emacs/bd-shells.el index 9f0b919..9628c66 100644 --- a/.config/emacs/bd-shells.el +++ b/.config/emacs/bd-shells.el @@ -32,11 +32,12 @@ status, and path." (use-package eshell :init - (require 'magit) :bind (("C-z C-e" . 'eshell-open-buffer) :map eshell-mode-map ("C-q" . 'delete-window) ; mostly for side window ("<tab>" . completion-at-point)) + :config + (eshell/addpath "~/Personal/scripts/") :custom (eshell-prompt-function 'bd/eshell-prompt) (eshell-prompt-regexp "^> ") diff --git a/.config/emacs/bd-wm.el b/.config/emacs/bd-wm.el index c4468e4..021decb 100644 --- a/.config/emacs/bd-wm.el +++ b/.config/emacs/bd-wm.el @@ -1,5 +1,6 @@ ;; -*- lexical-binding: t; -*- + (defun bd/exwm-update-class () "Changes the buffer name to reflect the class name for that buffer." @@ -20,9 +21,13 @@ dedicated buffer will never be automatically orphaned." (if dedicated "no longer " "") (buffer-name)))) + (use-package pinentry :init - (pinentry-start)) + (pinentry-start) + :custom + (pinentry-popup-prompt-window nil)) + (use-package exwm :config diff --git a/.config/guix-builds/bdunahu.scm b/.config/guix-builds/bdunahu.scm index 85578e3..f1eba15 100644 --- a/.config/guix-builds/bdunahu.scm +++ b/.config/guix-builds/bdunahu.scm @@ -35,12 +35,14 @@ "emacs-vertico" "feh" "flameshot" + "ffmpeg" "gimp" "gnupg" "icecat" "libnotify" ;; "mpc" "mpv" + "openconnect" "password-store" "pass-otp" "pinentry-emacs" @@ -103,16 +105,16 @@ (when (equal? host-name "vali") (service home-batsignal-service-type - (home-batsignal-configuration - (warning-level 35) - (critical-level 15) - (danger-level 5))) - (service home-xmodmap-service-type - (home-xmodmap-configuration - (key-map '(("remove Lock" . "Caps_Lock") - ("remove Control" . "Control_L") - ("keysym Control_L" ."Caps_Lock") - ("keysym Caps_Lock" . "Control_L") - ("add Lock" . "Caps_Lock") - ("add Control" . "Control_L")))))) + (home-batsignal-configuration + (warning-level 35) + (critical-level 15) + (danger-level 5))) + (service home-xmodmap-service-type + (home-xmodmap-configuration + (key-map '(("remove Lock" . "Caps_Lock") + ("remove Control" . "Control_L") + ("keysym Control_L" ."Caps_Lock") + ("keysym Caps_Lock" . "Control_L") + ("add Lock" . "Caps_Lock") + ("add Control" . "Control_L")))))) ))) diff --git a/.config/guix-builds/system-config.scm b/.config/guix-builds/system-config.scm index 7cd59fd..68ec53d 100644 --- a/.config/guix-builds/system-config.scm +++ b/.config/guix-builds/system-config.scm @@ -4,82 +4,83 @@ ;; Indicate which modules to import to access the variables ;; used in this configuration. (use-modules (gnu) - (host-instance)) + (host-instance)) (use-service-modules audio desktop networking ssh xorg) (define user (user-account - (name username) - (comment username) - (group "users") - (home-directory (string-append "/home/" username)) - (supplementary-groups '("wheel" "netdev" "audio" "video")))) + (name username) + (comment username) + (group "users") + (home-directory (string-append "/home/" username)) + (supplementary-groups '("wheel" "netdev" "audio" "video")))) (operating-system - (locale "en_US.utf8") - (timezone "America/Denver") - (keyboard-layout (keyboard-layout "us")) - (host-name host-name) + (locale "en_US.utf8") + (timezone "America/Denver") + (keyboard-layout (keyboard-layout "us")) + (host-name host-name) - ;; The list of user accounts ('root' is implicit). - (users (cons* user - %base-user-accounts)) + ;; The list of user accounts ('root' is implicit). + (users (cons* user + %base-user-accounts)) - ;; Packages installed system-wide. - (packages (append (map specification->package - '("emacs" - "emacs-exwm" - "emacs-desktop-environment" - "git" - "imagemagick" - "mpd" - "mpd-mpc" - "nss-certs" - "picom" - "pulseaudio" - "vim" - "xmodmap")) - %base-packages)) + ;; Packages installed system-wide. + (packages (append (map specification->package + '("curl" + "emacs" + "emacs-exwm" + "emacs-desktop-environment" + "git" + "imagemagick" + "mpd" + "mpd-mpc" + "nss-certs" + "picom" + "pulseaudio" + "vim" + "xmodmap")) + %base-packages)) - ;; List of system services. - (services - (append (list + ;; List of system services. + (services + (append (list - (service openssh-service-type) - (service tor-service-type) - (service mpd-service-type - (mpd-configuration - (user user) - (music-directory "~/Personal/mpd/music") - (playlist-directory "~/Personal/mpd/playlist") - (default-port 6600))) - (set-xorg-configuration - (xorg-configuration (keyboard-layout keyboard-layout)))) + (service openssh-service-type) + (service tor-service-type) + (service mpd-service-type + (mpd-configuration + (user user) + (music-directory "~/Personal/mpd/music") + (playlist-directory "~/Personal/mpd/playlist") + (default-port 6600))) + (set-xorg-configuration + (xorg-configuration (keyboard-layout keyboard-layout)))) - ;; This is the default list of services we - ;; are appending to. - %desktop-services)) - (bootloader (bootloader-configuration - (bootloader grub-efi-bootloader) - (targets (list "/boot/efi")) - (keyboard-layout keyboard-layout))) + ;; This is the default list of services we + ;; are appending to. + %desktop-services)) + (bootloader (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets (list "/boot/efi")) + (keyboard-layout keyboard-layout))) - ;; List of file systems that get "mounted". ("UUIDs") can - ;; be obtained by running 'blkid'. - (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid - boot-part - 'fat32)) - (type "vfat")) - (file-system - (mount-point "/home/bdunahu/Personal") - (device (uuid - hide-part - 'ext4)) - (type "ext4")) - (file-system - (mount-point "/") - (device (uuid - root-part - 'ext4)) - (type "ext4")) %base-file-systems))) + ;; List of file systems that get "mounted". ("UUIDs") can + ;; be obtained by running 'blkid'. + (file-systems (cons* (file-system + (mount-point "/boot/efi") + (device (uuid + boot-part + 'fat32)) + (type "vfat")) + (file-system + (mount-point "/home/bdunahu/Personal") + (device (uuid + hide-part + 'ext4)) + (type "ext4")) + (file-system + (mount-point "/") + (device (uuid + root-part + 'ext4)) + (type "ext4")) %base-file-systems))) |