From f59c3c6f149dfdf0ef1c585b2fab3b14875749a0 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Wed, 6 Dec 2023 22:23:52 +0100 Subject: [PATCH] . --- home/emacs/init.el | 38 ++++++++++++++++--------------------- home/gnupg/gpg-agent.conf | 4 ++++ home/home-configuration.scm | 37 +++++++++++++++++++++++++----------- home/sway/sway | 3 +++ install-guix-on-void.bash | 5 +++-- 5 files changed, 52 insertions(+), 35 deletions(-) create mode 100644 home/gnupg/gpg-agent.conf diff --git a/home/emacs/init.el b/home/emacs/init.el index b650b33..2d7e1be 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -276,6 +276,9 @@ completion-category-overrides '((file (styles basic partial-completion))))) (use-package consult + :config + (require 'consult-flymake) + (require 'consult-xref) :bind (:map evil-normal-state-map ("" . 'consult-find) @@ -351,25 +354,16 @@ (corfu-scroll-margin 5) (corfu-quit-no-match 'separator) (evil-collection-corfu-key-themes '(tab-n-go)) + (corfu-popupinfo-delay '(0.1 . 0.5)) :config (setq corfu-sort-override-function #'my/corfu-combined-sort) + (add-to-list 'savehist-additional-variables 'corfu-history) :commands global-corfu-mode :init - (global-corfu-mode)) - -(use-package corfu-history - :config - (add-to-list 'savehist-additional-variables 'corfu-history) - :hook - global-corfu-mode) - -(use-package corfu-popupinfo - :after corfu - :custom - (corfu-popupinfo-delay '(0.1 . 0.5)) - :hook - global-corfu-mode) + (global-corfu-mode) + (corfu-popupinfo-mode 1) + (corfu-history-mode 1)) (use-package nerd-icons-corfu :after corfu @@ -504,9 +498,6 @@ Point must be at the beginning of balanced expression (sexp)." (use-package flymake :delight '(:eval (cons "  " (flymake--mode-line-counters)))) -(use-package consult-flymake - :after (consult flymake)) - (defun my/eglot-capf () (setq-local completion-at-point-functions (list (cape-super-capf @@ -623,6 +614,14 @@ Point must be at the beginning of balanced expression (sexp)." :config (defalias 'run-geiser 'geiser)) +(use-package geiser-chicken) + +(use-package geiser-guile + :config + (when (executable-find "guix") + (add-to-list 'geiser-guile-load-path + (expand-file-name "~/.config/guix/current/share/guile/site/3.0")))) + ;; (use-package flymake-chicken ;; :hook ;; ((scheme-mode . flymake-chicken-init) @@ -639,11 +638,6 @@ Point must be at the beginning of balanced expression (sexp)." (zig-mode . eglot-ensure) :mode ("\\.zig\\'" . zig-mode)) -(use-package nix-mode - :hook - (nix-mode . eglot-ensure) - :mode ("\\.nix\\'" . nix-mode)) - ;; (use-package lsp-tailwindcss ;; :init ;; (setq lsp-tailwindcss-add-on-mode t diff --git a/home/gnupg/gpg-agent.conf b/home/gnupg/gpg-agent.conf new file mode 100644 index 0000000..515323b --- /dev/null +++ b/home/gnupg/gpg-agent.conf @@ -0,0 +1,4 @@ +grab +pinentry-program /home/zilti/.guix-home/profile/bin/pinentry-qt +allow-emacs-pinentry +allow-loopback-pinentry diff --git a/home/home-configuration.scm b/home/home-configuration.scm index a20018b..b974b7a 100644 --- a/home/home-configuration.scm +++ b/home/home-configuration.scm @@ -14,10 +14,9 @@ (gnu home) (gnu home services) (gnu home services desktop) - (gnu home services dict) - (gnu home services gnupg) + #;(gnu home services gnupg) (gnu home services guix) - (gnu home services mail) + #;(gnu home services mail) (gnu home services mcron) (gnu home services pm) (gnu home services shells) @@ -29,13 +28,19 @@ ;; Home profile, under ~/.guix-home/profile. (packages (specifications->packages - (list "chicken" + (list "bsd-games" + "chicken" + "emacs" "fuzzel" "gammastep" - "glibc-locales" + ;; "glibc-locales" "icecat" "kitty" + "password-store" + "pass-otp" + "passff-icecat" "pinentry-qt" + "swayfx" "swayidle" "waybar" "wlogout"))) @@ -44,7 +49,7 @@ (services (list (service home-shepherd-service-type) - (service home-msmtp-service-type + #;(service home-msmtp-service-type (home-msmtp-configuration (accounts (list @@ -67,7 +72,16 @@ (simple-service 'ziltis-environment-variable-service home-environment-variables-service-type `(("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store") - ("SSH_ASKPASS" . "ksshaskpass"))) + ("SSH_ASKPASS" . "ksshaskpass") + ("ELM_DISPLAY" . "wl") + ("SDL_VIDEODRIVER" . "wayland") + ("MOZ_ENABLE_WAYLAND" . "1") + ("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc") + ("CHICKEN_INSTALL_REPOSITORY" . "$XDG_DATA_HOME/chicken/eggs") + ("CHICKEN_INSTALL_PREFIX" . "$XDG_DATA_HOME/bin"))) + (simple-service 'ziltis-home-files-service + home-files-service-type + `((".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")))) (simple-service 'ziltis-xdg-configuration-files-service home-xdg-configuration-files-service-type `(("sway/config" ,(local-file "./sway/sway")) @@ -75,7 +89,8 @@ ("waybar/style.css" ,(local-file "./waybar/style.css")) ("emacs/init.el" ,(local-file "./emacs/init.el")) ("emacs/init.org" ,(local-file "./emacs/init.org")) - ("emacs/templates" ,(local-file "./emacs/templates")))) + ("emacs/templates" ,(local-file "./emacs/templates")) + ("kitty/kitty.conf" ,(local-file "./kitty/kitty.conf")))) (service home-bash-service-type (home-bash-configuration (aliases @@ -93,7 +108,6 @@ (local-file "./.bash_profile" "bash_profile"))))) - (service home-dicod-service-type) (service home-batsignal-service-type (home-batsignal-configuration (ignore-missing? #t))) @@ -118,8 +132,9 @@ (name "gitea.lyrion.ch") (host-name "gitea.lyrion.ch") (user "git") - (port 7920)))))) - (service home-gpg-agent-service-type + (port 7920) + (identity-file "~/.ssh/personal_ed")))))) + #;(service home-gpg-agent-service-type (home-gpg-agent-configuration (pinentry-program (file-append pinentry-qt "/bin/pinentry-qt")) diff --git a/home/sway/sway b/home/sway/sway index 07bbab4..1749f2a 100644 --- a/home/sway/sway +++ b/home/sway/sway @@ -22,6 +22,9 @@ set $term kitty ### Appearance +# output scaling +output eDP-1 scale 1.25 + # borders hide_edge_borders --i3 smart default_border pixel 2 diff --git a/install-guix-on-void.bash b/install-guix-on-void.bash index a3da2c1..047cb82 100644 --- a/install-guix-on-void.bash +++ b/install-guix-on-void.bash @@ -1,6 +1,7 @@ #!/usr/local/env bash -sudo xbps-install -SuA wget curl -curl https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh | sudo bash +sudo xbps-install -SuA nscd wget curl brightnessctl +sudo ln -sf /etc/sv/nscd /var/service/ +sudo bash <<< curl https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh sudo mkdir -p /etc/sv/guix-daemon/log sudo cat <<'EOF' > /etc/sv/guix-daemon/run