This commit is contained in:
Daniel Ziltener 2023-12-20 17:21:33 +01:00
parent 722048f2a1
commit 6e3fd648cf
Signed by: zilti
GPG key ID: B38976E82C9DAE42
8 changed files with 16 additions and 92 deletions

View file

@ -1,10 +1,3 @@
;; Channels
;; This adds the Nonguix channel.
;; #+NAME: root-channels
;; [[file:config.org::root-channels][root-channels]]
(cons* (channel
(name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix")
@ -18,4 +11,3 @@
(name 'ziltis-channel)
(url "https://gitea.lyrion.ch/zilti/guixchannel"))
%default-channels)
;; root-channels ends here

View file

@ -1,7 +1,7 @@
#+TITLE: GUIX System Configuration
#+AUTHOR: Daniel Ziltener
#+PROPERTY: scheme-implementation guile
#+PROPERTY: header-args:scheme :comments both :session *guile*
#+PROPERTY: header-args:scheme :comments none :session *guile*
#+begin_src emacs-lisp :results none
(org-babel-lob-ingest "./library.org")
@ -80,6 +80,7 @@ This is to be run after setting up the partitions.
#+NAME: package-module-list
- bootloaders
- certs
- containers
- emacs
- emacs-xyz
- fonts
@ -149,6 +150,7 @@ This adds the Nonguix channel.
- hwdata
- nss-certs
- network-manager
- podman
- readline
#+NAME: root-package-block

View file

@ -1,27 +1,3 @@
;; Modules
;; #+NAME: module-list
;; - gnu
;; - gnu image
;; - gnu packages gnome
;; - gnu services admin
;; - gnu services authentication
;; - gnu services base
;; - gnu services configuration
;; - gnu services dbus
;; - gnu services desktop
;; - gnu services linux
;; - gnu services networking
;; - gnu services pm
;; - gnu services sound
;; - gnu services virtualization
;; - gnu services xorg
;; - gnu system nss
;; - nongnu packages linux
;; - nongnu system linux-initrd
;; [[file:config.org::*Modules][Modules:1]]
(use-modules
(gnu)
(gnu image)
@ -41,39 +17,13 @@
(gnu system nss)
(nongnu packages linux)
(nongnu system linux-initrd))
;; Modules:1 ends here
;; Service Modules
;; #+NAME: service-module-list
;; - desktop
;; - xorg
;; [[file:config.org::*Service Modules][Service Modules:1]]
(use-service-modules desktop xorg)
;; Service Modules:1 ends here
;; Package Modules
;; #+NAME: package-module-list
;; - bootloaders
;; - certs
;; - emacs
;; - emacs-xyz
;; - fonts
;; - pciutils
;; - readline
;; - terminals
;; - version-control
;; - wm
;; - xorg
;; [[file:config.org::*Package Modules][Package Modules:1]]
(use-package-modules
bootloaders
certs
containers
emacs
emacs-xyz
fonts
@ -83,14 +33,7 @@
version-control
wm
xorg)
;; Package Modules:1 ends here
;; Operating System
;; This is the full operating system specification.
;; [[file:config.org::*Operating System][Operating System:1]]
(operating-system
(host-name "ziltis-machine")
(timezone "Europe/Berlin")
@ -137,6 +80,7 @@
hwdata
nss-certs
network-manager
podman
readline)
%base-packages))
@ -240,4 +184,3 @@
%default-channels)))))
))
(name-service-switch %mdns-host-lookup-nss))
;; Operating System:1 ends here

View file

@ -142,7 +142,7 @@
;;;; Org Mode
(use-package org
:preface
(define (cc/org-local-stuff)
(defun cc/org-local-stuff ()
(setq-local visual-fill-column-center-text t))
:elpaca (:repo "https://git.savannah.gnu.org/git/emacs/org-mode.git" :branch "emacs-sync")
:after visual-fill-column
@ -721,14 +721,14 @@ Point must be at the beginning of balanced expression (sexp)."
"Renames the symbol at point."
(interactive "sRename: \nsRename %s to: ")
(funcall-interactively #'eglot-rename to))
(defun (cc/clojure-local-stuff)
(setq-local sesman-system 'CIDER
prettify-symbols-alist '(("fn" . "λ"))))
(defun cc/clojure-local-stuff ()
(setq-local sesman-system 'CIDER)
(setq-local prettify-symbols-alist '(("fn" . "λ"))))
:delight ""
:after (tree-sitter embark)
:after (tree-sitter embark cider)
:config
(require 'sesman)
(sesman-install-menu clojure-mode-map)
(sesman-install-menu clojure-ts-mode-map)
(defvar-keymap embark-clj-identifier-map
:parent embark-identifier-map
"c" #'embark-eglot-rename)

View file

@ -69,6 +69,10 @@
("MOZ_ENABLE_WAYLAND" . "1")
("SSL_CERT_FILE" . "$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt")
("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc")
;; To be removed once the nss-certs thing has been figured out
("SSL_CERT_DIR" . "$HOME/.guix-profile/etc/ssl/certs")
("SSL_CERT_FILE" . "$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt")
("GIT_SSL_CAINFO" . "$SSL_CERT_FILE")
;; ("CHICKEN_INSTALL_REPOSITORY" . "$XDG_DATA_HOME/chicken/eggs")
;; ("CHICKEN_REPOSITORY_PATH" . "$HOME/.guix-home/profile/var/lib/chicken/11/:$XDG_DATA_HOME/chicken/eggs")
;; ("CHICKEN_INSTALL_PREFIX" . "$HOME/.local")
@ -153,6 +157,7 @@
"make"
"nm-tray"
"nnn"
"nss-certs"
"nwg-displays"
#;"nss-certs" ; This package is broken
"openssh"

View file

@ -1,12 +1,6 @@
;; #+NAME: guix-bordeaux-pubkey
;; [[file:../config.org::guix-bordeaux-pubkey][guix-bordeaux-pubkey]]
(public-key
(ecc
(curve Ed25519)
(q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)
)
)
;; guix-bordeaux-pubkey ends here

View file

@ -1,12 +1,6 @@
;; #+NAME: guix-ci-pubkey
;; [[file:../config.org::guix-ci-pubkey][guix-ci-pubkey]]
(public-key
(ecc
(curve Ed25519)
(q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#)
)
)
;; guix-ci-pubkey ends here

View file

@ -1,12 +1,6 @@
;; Modified Desktop Services
;; #+NAME: nonguix-pubkey
;; [[file:../config.org::nonguix-pubkey][nonguix-pubkey]]
(public-key
(ecc
(curve Ed25519)
(q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
)
)
;; nonguix-pubkey ends here