.

2023-12-13 03:02:44 +01:00 · 2023-12-13 03:02:44 +01:00 · 9c8e94145f
commit 9c8e94145f
parent 1b8aca7d3f
6 changed files with 277 additions and 193 deletions
--- a/4
+++ b/4
@ -2,6 +2,8 @@
 	mkdir -p ~/.config/guix
 	cp channels.scm ~/.config/guix/channels.scm

-install:
+reconfigure:
 	guix archive --authorize < signing-key.pub
 	guix system reconfigure ./config.scm --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org'
+	make -C /home/zilti/.guix-home/profile/lib/browserpass make hosts-firefox-user
+	flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
--- a/config.org
+++ b/config.org
@ -10,13 +10,13 @@
 * Makefile

 #+begin_src makefile :tangle Makefile
-  ~/.config/guix/channels.scm:
+  reconfigure:
  	mkdir -p ~/.config/guix
  	cp channels.scm ~/.config/guix/channels.scm
-
-  install:
  	guix archive --authorize < signing-key.pub
  	guix system reconfigure ./config.scm --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org'
+  	make -C /home/zilti/.guix-home/profile/lib/browserpass make hosts-firefox-user
+  	flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 #+end_src

 * System Installation Script
@ -57,6 +57,14 @@ This is to be run after setting up the partitions.
  <<list-to-use(use-call="use-modules",entries=module-list,all-parens=1)>>
 #+end_src

+#+RESULTS:
+: ice-9/boot-9.scm:1685:16: In procedure raise-exception:
+: Syntax error:
+: unknown file:13:51: source expression failed to match any pattern in form or
+: 
+: Entering a new prompt.  Type `,bt' for a backtrace or `,q' to continue.
+: scheme@(guile-user) [1]> 
+
 ** Service Modules

 #+NAME: service-module-list
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@ -95,12 +95,14 @@
  (tab-always-indent 'complete)
  (tool-bar-mode nil)
  :custom-face
-  (default ((t (:weight bold :height 113 :width normal :family "VictorMono Nerd Font"))))
+  ;;(default ((t (:weight bold :height 113 :width normal :family "VictorMono Nerd Font"))))
+  (default ((t (:weight regular :height 105 :width normal :family "MonaspiceXe Nerd Font Mono"))))
  :hook
  (minibuffer-setup . cursor-intangible-mode)
  :config
  (advice-add 'risky-local-variable-p :override #'ignore)
-  (global-display-fill-column-indicator-mode t))
+  (global-display-fill-column-indicator-mode t)
+  (pixel-scroll-precision-mode 1))

 ;;;; Org Mode
 (use-package org
@ -165,21 +167,40 @@
  ;;(load-theme 'catppuccin)
  )

+(use-package unicode-fonts
+   :ensure t
+   :config
+    (unicode-fonts-setup))
+
+(use-package ligature
+  :config
+  (ligature-set-ligatures
+   't
+   '( ;; SS01
+     "==" "===" "=/=" "!=" "!==" "/=" "/==" "~~" "=~" "!~"
+     ;; SS02
+     ">=" "<="
+     ;; SS03
+     "->" "<-" "=>" "<!--" "-->" "<~" "<~~" "~>" "~~>" "<~>"
+     ;; SS04
+     "</" "/>" "</>" "/\\" "\\/"
+     ;; SS05
+     "|>" "<|"
+     ;; SS06
+     "##" "###"
+     ;; SS07
+     "***" "/*" "*/" "/*/" "(*" "*)" "(*)"
+     ;; SS08
+     ".=" ".-" "..<"
+     ;; CALT
+     "//" "///" "&&" "!!" "??" "?." "?:" "||" "::" ":::" ";;" ".." "..." "=!=" "#=" ":=" "=:" "=:="
+     ":>" ">:" "<:" ":<" "..=" "..-"
+     ))
+  (global-ligature-mode t))
+
 (set-frame-parameter nil 'alpha-background 80)
 (add-to-list 'default-frame-alist '(alpha-background . 80))

-;; (use-package powerline
-;;   :init
-;;   (require 'powerline)
-;;   :config
-;;   (powerline-default-theme))
-
-;; (use-package airline-themes
-;;   :after powerline
-;;   :init (require 'airline-themes)
-;;   :config
-;;   (load-theme 'airline-badwolf t))
-
 (use-package lambda-line
  :straight (:type git :host github :repo "lambda-emacs/lambda-line")
  :custom
@ -290,6 +311,11 @@
        completion-category-defaults nil
        completion-category-overrides '((file (styles basic partial-completion)))))

+(use-package embark-consult
+  :after (embark consult)
+  :hook
+  (embark-collect-mode . consult-preview-at-point-mode))
+
 (use-package consult
  :config
  (require 'consult-flymake)
@ -309,11 +335,6 @@
  ("C-<SPC>" . 'embark-act)
  ("C-M-<return>" . 'embark-bindings))

-(use-package embark-consult
-  :after (embark consult)
-  :hook
-  (embark-collect-mode . consult-preview-at-point-mode))
-
 (use-package wgrep
  :config
  (setq wgrep-auto-save-buffer t))
@ -347,10 +368,9 @@

 ;;;;; Code Completion
 (use-package cape
-  :init
+  :preface
  (defun my/capf ()
-    (interactive)
-    (setq-local completion-at-point-functions
+    (setq completion-at-point-functions
          (list (cape-capf-super
                 #'tempel-complete
                 #'cape-dabbrev
@ -359,9 +379,11 @@
                 #'cape-line
                 #'cape-emoji
                 #'cape-keyword))))
+  :config
  (advice-add 'eglot-completion-at-point :around #'cape-wrap-buster)
-  (add-hook 'org-mode-hook #'my/capf)
-  (add-hook 'prog-mode-hook #'my/capf))
+  :hook
+  (org-mode . my/capf)
+  (prog-mode . my/capf))

 (defun my/corfu-combined-sort (candidates)
  "Sort CANDIDATES using both display-sort-function and corfu-sort-function."
@ -472,6 +494,8 @@ Point must be at the beginning of balanced expression (sexp)."
  clojure-ts-mode
  emacs-lisp-mode
  scheme-mode
+  :custom
+  (sp-undo-pairs-separately t)
  :config
  (add-to-list 'sp-clojure-modes 'clojure-ts-mode)
  (add-to-list 'sp-clojure-modes 'clojurec-ts-mode)
@ -479,6 +503,10 @@ Point must be at the beginning of balanced expression (sexp)."
  (add-to-list 'sp-lisp-modes 'clojure-ts-mode)
  (add-to-list 'sp-lisp-modes 'clojurec-ts-mode)
  (add-to-list 'sp-lisp-modes 'clojurescript-ts-mode)
+  (sp-local-pair '(emacs-lisp-mode scheme-mode clojure-ts-mode)
+                 "'" nil)
+  (sp-local-pair '(emacs-lisp-mode scheme-mode clojure-ts-mode)
+                 "`" nil)
  (evil-define-key 'insert smartparens-mode-map
    (kbd "r") (conditional-keybind #'looking-at-opening-paren
                                   #'sp-raise-sexp)
@ -488,6 +516,8 @@ Point must be at the beginning of balanced expression (sexp)."
                                   #'cc/move-sexp-forward)
    (kbd "c") (conditional-keybind #'looking-at-opening-paren 
                                   #'sp-clone-sexp)
+    (kbd "m") (conditional-keybind #'looking-at-opening-paren
+                                   #'sp-mark-sexp)
    (kbd "DEL") (conditional-keybind #'being-past-closing-paren
                                     #'sp-backward-delete-sexp
                                     #'evil-delete-backward-char-and-join)
@ -529,8 +559,7 @@ Point must be at the beginning of balanced expression (sexp)."
 (use-package eglot
  :preface
  (defun my/eglot-capf ()
-    (interactive)
-    (setq-local completion-at-point-functions
+    (setq completion-at-point-functions
          (list (cape-capf-super
                 #'eglot-completion-at-point
                 #'tempel-complete
@ -578,7 +607,7 @@ Point must be at the beginning of balanced expression (sexp)."
                                      (call-interactively #'eglot-format-buffer))
                                    nil 'local)))
  (eglot-managed-mode . eglot-inlay-hints-mode)
-  (eglot-managed-mode . #'my/eglot-capf))
+  (eglot-managed-mode . my/eglot-capf))

 (use-package consult-eglot
  :after (consult eglot))
@ -628,10 +657,24 @@ Point must be at the beginning of balanced expression (sexp)."
 ;;;;; Scheme

 (use-package geiser
+  :preface
+  (defun my/geiser-capf ()
+    (setq completion-at-point-functions
+          (append geiser-capf--capfs
+                  (list (cape-capf-super
+                         #'tempel-complete
+                         #'cape-dabbrev
+                         #'cape-file
+                         #'cape-dict
+                         #'cape-line
+                         #'cape-emoji
+                         #'cape-keyword)))))
  :custom
  (geiser-chicken-match-limit 200)
  :config
-  (defalias 'run-geiser 'geiser))
+  (defalias 'run-geiser 'geiser)
+  :hook
+  (geiser-mode . my/geiser-capf))

 (use-package paren-face
  :hook
@ -644,10 +687,8 @@ Point must be at the beginning of balanced expression (sexp)."
 ;;;;;; Chicken Scheme
 (use-package scheme
  :config
-  (eval-after-load 'eglot
-    '(add-to-list 'eglot-server-programs
-                  '(scheme-mode
-                    . ("chicken-lsp-server"))))
+  (setq prettify-symbols-alist
+        '(("lambda" . "λ")))
  :hook
  (scheme-mode . eglot-ensure))

@ -752,5 +793,10 @@ Point must be at the beginning of balanced expression (sexp)."
      :encryption tls
      :channels ()))))

+;;;; Wrapping Up
+(use-package envrc
+  :config
+  (envrc-global-mode))
+
 (provide 'init)
 ;;; init.el ends here
--- a/home/emacs/templates
+++ b/home/emacs/templates
@ -15,6 +15,34 @@ prog-mode

 scheme-mode

+(crate-dependency
+ "(\"rust-" crate-name "\" ,rust-" (s crate-name) "-" p ")")
+
+(define-guix-crate
+ "(define-public rust-" (s egg-name) "-" (s maj-version)
+ n> "(package"
+ n> "(name \"rust-" egg-name "\")"
+ n> "(version \"" maj-version "." (s egg-version) "\")"
+ n> "(source"
+ n> "(origin"
+ n> "(method url-fetch)"
+ n> "(uri (crate-uri \"" egg-name "\" version))"
+ n> "(sha256"
+ n> "(base32"
+ n> "\"0z05x7f154n9bgmainrsmncf5i6dil43r9ymr3rdgwbg4wnxmz4s\"))))"
+ n> "(build-system cargo-build-system)"
+ n> "(arguments"
+ n> "`(#:cargo-inputs"
+ n> "(" p ")"
+ n> "#:cargo-development-inputs"
+ n> "(" p ")"
+ n> "#:cargo-build-inputs"
+ n> "(" p ")))"
+ n> "(synopsis \"" (s synopsis) "\")"
+ n> "(home-page \"https://crates.io/crates/" egg-name "\")"
+ n> "(description \"" synopsis ".\")"
+ n> "(license license:" (s license) ")))")
+
 (define-guix-egg
 "(define-public chicken-" (s egg-name)
 n> "(package"
--- a/home/home-configuration.scm
+++ b/home/home-configuration.scm
@ -30,6 +30,7 @@
  (specifications->packages
   (list "bsd-games"
         "bolt"
+         "browserpass-native"
         "chicken"
         "chicken-apropos"
         "chicken-chicken-doc"
@ -37,10 +38,11 @@
         "curl"
         "direnv"
 	 "emacs"
-         "emacs-direnv"
+         "eternalterminal"
         "diff-so-fancy"
         "firefox"
         "flatpak"
+         "font-nerdfont-monaspice"
         "fuzzel"
         "gammastep"
         "grim"
@ -49,6 +51,9 @@
         "icecat"
         "icedove-wayland"
         "kitty"
+         "ksshaskpass"
+         "make"
+         "nm-tray"
         #;"nss-certs" ; This package is broken
         "password-store"
         "pass-otp"
@ -65,13 +70,14 @@
 	 "swayfx"
         "swayidle"
         "swaylock-effects"
+         "unzip"
         "waybar"
         "wlogout"
         "xdg-desktop-portal")))
 ;; Below is the list of Home services.  To search for available
 ;; services, run 'guix home search KEYWORD' in a terminal.
 (services
-(list
+  (list
   (service home-shepherd-service-type)
   (service home-msmtp-service-type
            (home-msmtp-configuration
@ -106,6 +112,7 @@
                   home-environment-variables-service-type
                   `(("PATH"               . "$PATH:~/.local/bin")
                     ("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store")
+                     ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$XDG_DATA_HOME/flatpak/exports/share")
                     ("SSH_ASKPASS"        . "ksshaskpass")
                     ("ELM_DISPLAY"        . "wl")
                     ("SDL_VIDEODRIVER"    . "wayland")
--- a/library.org
+++ b/library.org
@ -23,24 +23,17 @@ Converting org lists into guix ~use-~ calls.

 Converting Org lists into Scheme symbol lists.

-#+NAME: sym-list-sample
+#+NAME: list-sample
 - Entry 1
 - Entry 2

 #+NAME: org-to-scheme-sym-list
-#+begin_src scheme :var input=sym-list-sample :results output
+#+begin_src scheme :var data=list-sample
  (pretty-print 
-   `(list
-     ,@(map (lambda (x) (string->symbol x)) input)))
+   (cons 'list
+         (map string->symbol input)))
 #+end_src

-#+RESULTS: org-to-scheme-sym-list
-: ice-9/boot-9.scm:1685:16: In procedure raise-exception:
-: Wrong type to apply: "Entry 1"
-: 
-: Entering a new prompt.  Type `,bt' for a backtrace or `,q' to continue.
-: scheme@(guile-user) [1]> 
-
 * Converting Tables

 #+NAME: service-converter