From abe17b042ca23eb3fb4c759cc62214440691fb1f Mon Sep 17 00:00:00 2001 From: Marc Coquand Date: Thu, 24 Oct 2024 08:13:54 +0300 Subject: . --- home/config.scm | 21 ++++++++++++++++++++- home/dots/.emacs | 11 ++++++++++- home/dots/.emacs.d/elisp/custom-keymaps.el | 28 ++++++++++++++++++++++++++++ home/dots/.emacs.d/elisp/keymaps.el | 28 ---------------------------- home/dots/.local/share/fonts/ARIBL0.ttf | Bin 0 -> 57448 bytes home/dots/.local/share/fonts/ArialTh.ttf | Bin 0 -> 40980 bytes home/dots/.local/share/fonts/Arialn.ttf | Bin 0 -> 60012 bytes home/dots/.local/share/fonts/arial.ttf | Bin 0 -> 915212 bytes os/config.scm | 6 +++++- 9 files changed, 63 insertions(+), 31 deletions(-) create mode 100644 home/dots/.emacs.d/elisp/custom-keymaps.el delete mode 100644 home/dots/.emacs.d/elisp/keymaps.el create mode 100644 home/dots/.local/share/fonts/ARIBL0.ttf create mode 100644 home/dots/.local/share/fonts/ArialTh.ttf create mode 100644 home/dots/.local/share/fonts/Arialn.ttf create mode 100644 home/dots/.local/share/fonts/arial.ttf diff --git a/home/config.scm b/home/config.scm index 3319d0e..0df9d00 100644 --- a/home/config.scm +++ b/home/config.scm @@ -28,6 +28,13 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages aspell) #:use-module (gnu packages sqlite) + #:use-module (gnu packages gcc) + #:use-module (gnu packages commencement) + #:use-module (gnu packages base) + #:use-module (gnu packages golang-crypto) + #:use-module (gnu packages linux) + #:use-module (gnu packages image) + #:use-module (gnu packages xdisorg) #:use-module (nongnu packages mozilla) #:use-module (gnu packages databases) #:use-module (gnu packages compression) @@ -49,6 +56,7 @@ font-iosevka font-iosevka-aile font-iosevka-etoile + font-liberation isync @@ -61,7 +69,9 @@ unzip go + binutils sqlite + gcc-toolchain mg @@ -79,14 +89,18 @@ aspell-dict-en gnupg + age pinentry openssh firefox xsetroot + scrot + imlib2 ;; Needed for scrot xset xrdb + brightnessctl autocutsel gsettings-desktop-schemas setxkbmap)) @@ -97,11 +111,16 @@ (guix-defaults? #f) (bash-profile (list (local-file "./profile"))) (bashrc (list (local-file "./bashrc"))))) + + (service home-gpg-agent-service-type (home-gpg-agent-configuration (pinentry-program (file-append pinentry-emacs "/bin/pinentry-emacs")) - (ssh-support? #t))) + (ssh-support? #t) + (max-cache-ttl 99999) + (default-cache-ttl 99999))) + (service home-files-service-type `((".guile" ,%default-dotguile) diff --git a/home/dots/.emacs b/home/dots/.emacs index ca901bc..dd9adfb 100644 --- a/home/dots/.emacs +++ b/home/dots/.emacs @@ -93,6 +93,12 @@ (exwm-input-set-key (kbd "C-") (lambda () (interactive) (shell-command "scrot -s -F '/home/mccd/screenshots/%Y-%m-%d_$wx$h.png'"))) + (exwm-input-set-key (kbd "") + (lambda () (interactive) + (shell-command "brightnessctl set 5%- 1> /dev/null"))) + (exwm-input-set-key (kbd "") + (lambda () (interactive) + (shell-command "brightnessctl set +5% 1> /dev/null"))) (exwm-input-set-key (kbd "s-") (lambda (cmd) ;; s-&: Launch application. (interactive (list (read-shell-command "$ "))) @@ -400,7 +406,7 @@ (css-mode . (lambda ((interactive) (setq-local tab-width 2) (setq sgml-basic-offset 2 - indent-tabs-mode t)))))) + indent-tabs-mode t)))) (html-mode . (lambda () (interactive) (setq-local tab-width 2) @@ -489,6 +495,9 @@ (define-key eglot-mode-map (kbd "C-c r") 'eglot-rename) (define-key eglot-mode-map (kbd "C-c o") 'eglot-code-actions) :hook + (css-mode . eglot-ensure) + (html-mode . eglot-ensure) + (javascript-mode . eglot-ensure) (nix-mode . eglot-ensure) (go-mode . eglot-ensure)) diff --git a/home/dots/.emacs.d/elisp/custom-keymaps.el b/home/dots/.emacs.d/elisp/custom-keymaps.el new file mode 100644 index 0000000..7c6d614 --- /dev/null +++ b/home/dots/.emacs.d/elisp/custom-keymaps.el @@ -0,0 +1,28 @@ +(defvar keymaps-mode-map (make-sparse-keymap) + "Keymap for `keymaps-mode'") + +;;;###autoload +(define-minor-mode keymaps-mode + "A minor mode so that my key settings override annoying major modes." + ;; If init-value is not set to t, this mode does not get enabled in + ;; `fundamental-mode' buffers even after doing \"(global-my-mode 1)\". + ;; More info: http://emacs.stackexchange.com/q/16693/115 + :init-value t + :lighter " keymaps" + :keymap keymaps-mode-map) + +;;;###autoload +(define-globalized-minor-mode global-keymaps-mode keymaps-mode keymaps-mode) + +;; https://github.com/jwiegley/use-package/blob/master/bind-key.el +;; The keymaps in `emulation-mode-map-alists' take precedence over +;; `minor-mode-map-alist' +(add-to-list 'emulation-mode-map-alists `((keymaps-mode . ,keymaps-mode-map))) + +;; Turn off the minor mode in the minibuffer +(defun turn-off-keymaps-mode () + "Turn off keymaps-mode." + (keymaps-mode -1)) +(add-hook 'minibuffer-setup-hook #'turn-off-keymaps-mode) + +(provide 'custom-keymaps) diff --git a/home/dots/.emacs.d/elisp/keymaps.el b/home/dots/.emacs.d/elisp/keymaps.el deleted file mode 100644 index 7c6d614..0000000 --- a/home/dots/.emacs.d/elisp/keymaps.el +++ /dev/null @@ -1,28 +0,0 @@ -(defvar keymaps-mode-map (make-sparse-keymap) - "Keymap for `keymaps-mode'") - -;;;###autoload -(define-minor-mode keymaps-mode - "A minor mode so that my key settings override annoying major modes." - ;; If init-value is not set to t, this mode does not get enabled in - ;; `fundamental-mode' buffers even after doing \"(global-my-mode 1)\". - ;; More info: http://emacs.stackexchange.com/q/16693/115 - :init-value t - :lighter " keymaps" - :keymap keymaps-mode-map) - -;;;###autoload -(define-globalized-minor-mode global-keymaps-mode keymaps-mode keymaps-mode) - -;; https://github.com/jwiegley/use-package/blob/master/bind-key.el -;; The keymaps in `emulation-mode-map-alists' take precedence over -;; `minor-mode-map-alist' -(add-to-list 'emulation-mode-map-alists `((keymaps-mode . ,keymaps-mode-map))) - -;; Turn off the minor mode in the minibuffer -(defun turn-off-keymaps-mode () - "Turn off keymaps-mode." - (keymaps-mode -1)) -(add-hook 'minibuffer-setup-hook #'turn-off-keymaps-mode) - -(provide 'custom-keymaps) diff --git a/home/dots/.local/share/fonts/ARIBL0.ttf b/home/dots/.local/share/fonts/ARIBL0.ttf new file mode 100644 index 0000000..a1e68a3 Binary files /dev/null and b/home/dots/.local/share/fonts/ARIBL0.ttf differ diff --git a/home/dots/.local/share/fonts/ArialTh.ttf b/home/dots/.local/share/fonts/ArialTh.ttf new file mode 100644 index 0000000..614f0af Binary files /dev/null and b/home/dots/.local/share/fonts/ArialTh.ttf differ diff --git a/home/dots/.local/share/fonts/Arialn.ttf b/home/dots/.local/share/fonts/Arialn.ttf new file mode 100644 index 0000000..5799f41 Binary files /dev/null and b/home/dots/.local/share/fonts/Arialn.ttf differ diff --git a/home/dots/.local/share/fonts/arial.ttf b/home/dots/.local/share/fonts/arial.ttf new file mode 100644 index 0000000..ad7d8ea Binary files /dev/null and b/home/dots/.local/share/fonts/arial.ttf differ diff --git a/os/config.scm b/os/config.scm index 6e2e188..d3aa9f5 100644 --- a/os/config.scm +++ b/os/config.scm @@ -40,7 +40,11 @@ (specification->package "emacs-exwm") (specification->package "nix") (specification->package "mu") - (specification->package "guile") + (specification->package "guile") + (specification->package "texinfo") + (specification->package "man-db") + (specification->package "man-pages") + (specification->package "mandoc") (specification->package "emacs-desktop-environment")) %base-packages)) -- cgit v1.2.3