This commit is contained in:
Daniel Ziltener 2023-12-17 15:51:31 +01:00
parent f0de87fe68
commit 23b58233e3
Signed by: zilti
GPG Key ID: B38976E82C9DAE42
2 changed files with 142 additions and 137 deletions

View File

@ -11,12 +11,12 @@
#+begin_src makefile :tangle Makefile #+begin_src makefile :tangle Makefile
reconfigure: reconfigure:
mkdir -p ~/.config/guix mkdir -p ~/.config/guix
cp channels.scm ~/.config/guix/channels.scm cp channels.scm ~/.config/guix/channels.scm
guix archive --authorize < signing-key.pub 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' 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 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 flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
#+end_src #+end_src
* System Installation Script * System Installation Script
@ -24,15 +24,15 @@
This is to be run after setting up the partitions. This is to be run after setting up the partitions.
#+begin_src sh :tangle sysinst.sh #+begin_src sh :tangle sysinst.sh
#!/bin/sh #!/bin/sh
set euxo -pipefail set euxo -pipefail
mount /dev/disk/by-label/guix /mnt mount /dev/disk/by-label/guix /mnt
mkdir -p /mnt/boot/efi mkdir -p /mnt/boot/efi
mount /dev/disk/by-label/EFI /mnt/boot/efi mount /dev/disk/by-label/EFI /mnt/boot/efi
herd start cow-store /mnt herd start cow-store /mnt
guix pull -C./channels.scm guix pull -C./channels.scm
hash guix hash guix
guix system -L. init ./config.scm /mnt --substitute-urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org" guix system -L. init ./config.scm /mnt --substitute-urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org"
#+end_src #+end_src
* Modules * Modules

View File

@ -84,125 +84,130 @@
;; Below is the list of Home services. To search for available ;; Below is the list of Home services. To search for available
;; services, run 'guix home search KEYWORD' in a terminal. ;; services, run 'guix home search KEYWORD' in a terminal.
(services (services
(list (list
(service home-shepherd-service-type) (service home-shepherd-service-type)
(service home-msmtp-service-type (service home-msmtp-service-type
(home-msmtp-configuration (home-msmtp-configuration
(default-account "LMail") (default-account "LMail")
(accounts (accounts
(list (list
(msmtp-account (msmtp-account
(name "LMail") (name "LMail")
(configuration (configuration
(msmtp-configuration (msmtp-configuration
(host "lyrion.ch") (host "lyrion.ch")
(port 465) (port 465)
(auth? #t) (auth? #t)
(tls? #t) (tls? #t)
(tls-starttls? #f) (tls-starttls? #f)
(user "dziltener") (user "dziltener")
(from "dziltener@lyrion.ch") (from "dziltener@lyrion.ch")
(password-eval "pass Privat/Mailaccount | head -n 1")))) (password-eval "pass Privat/Mailaccount | head -n 1"))))
(msmtp-account (msmtp-account
(name "Red Sky") (name "Red Sky")
(configuration (configuration
(msmtp-configuration (msmtp-configuration
(host "gmail.com") (host "gmail.com")
(port 587) (port 587)
(auth? #t) (auth? #t)
(tls? #t) (tls? #t)
(tls-starttls? #f) (tls-starttls? #f)
(user "dz@redsky.io") (user "dz@redsky.io")
(from "dziltener@lyrion.ch") (from "dziltener@lyrion.ch")
(password-eval "pass Privat/RedSkyGMail")))))))) (password-eval "pass Privat/RedSkyGMail"))))))))
(simple-service 'ziltis-environment-variable-service (simple-service 'ziltis-environment-variable-service
home-environment-variables-service-type home-environment-variables-service-type
`(("PATH" . "$PATH:~/.local/bin") `(("PATH" . "$PATH:~/.local/bin")
("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store") ("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store")
("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$XDG_DATA_HOME/flatpak/exports/share") ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$XDG_DATA_HOME/flatpak/exports/share")
("SSH_ASKPASS" . "ksshaskpass") ("SSH_ASKPASS" . "ksshaskpass")
("ELM_DISPLAY" . "wl") ("ELM_DISPLAY" . "wl")
("SDL_VIDEODRIVER" . "wayland") ("SDL_VIDEODRIVER" . "wayland")
("MOZ_ENABLE_WAYLAND" . "1") ("MOZ_ENABLE_WAYLAND" . "1")
("SSL_CERT_FILE" . "$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt") ("SSL_CERT_FILE" . "$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt")
("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc") ("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc")
;; ("CHICKEN_INSTALL_REPOSITORY" . "$XDG_DATA_HOME/chicken/eggs") ;; ("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_REPOSITORY_PATH" . "$HOME/.guix-home/profile/var/lib/chicken/11/:$XDG_DATA_HOME/chicken/eggs")
;; ("CHICKEN_INSTALL_PREFIX" . "$HOME/.local") ;; ("CHICKEN_INSTALL_PREFIX" . "$HOME/.local")
)) ))
(simple-service 'ziltis-home-files-service (simple-service 'ziltis-home-files-service
home-files-service-type home-files-service-type
`(#;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")))) `(#;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))))
(simple-service 'ziltis-xdg-configuration-files-service (simple-service 'ziltis-xdg-configuration-files-service
home-xdg-configuration-files-service-type home-xdg-configuration-files-service-type
`(("sway/config" ,(local-file "./sway/sway")) `(("sway/config" ,(local-file "./sway/sway"))
("waybar/config" ,(local-file "./waybar/config")) ("waybar/config" ,(local-file "./waybar/config"))
("waybar/style.css" ,(local-file "./waybar/style.css")) ("waybar/style.css" ,(local-file "./waybar/style.css"))
("fuzzel/fuzzel.ini" ,(local-file "./fuzzel/fuzzel.ini")) ("fuzzel/fuzzel.ini" ,(local-file "./fuzzel/fuzzel.ini"))
("git/config" ,(local-file "./git/config")) ("git/config" ,(local-file "./git/config"))
("emacs/init.el" ,(local-file "./emacs/init.el")) ("emacs/init.el" ,(local-file "./emacs/init.el"))
("emacs/early-init.el" ,(local-file "./emacs/early-init.el")) ("emacs/early-init.el" ,(local-file "./emacs/early-init.el"))
("emacs/init.org" ,(local-file "./emacs/init.org")) ("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")) ("kitty/kitty.conf" ,(local-file "./kitty/kitty.conf"))
("senpai/senpai.scfg" ,(local-file "./senpai/senpai.scfg")))) ("senpai/senpai.scfg" ,(local-file "./senpai/senpai.scfg"))))
(service home-bash-service-type (service home-bash-service-type
(home-bash-configuration (home-bash-configuration
(aliases (aliases
'(("hh" . "hstr") '(("hh" . "hstr")
("l" . "ls -alh") ("l" . "ls -alh")
("ll" . "ls -l") ("ll" . "ls -l")
("ls" . "ls --color=tty") ("ls" . "ls --color=tty")
("create-guix-patch" . "git format-patch --minimal --to guix-patches@gnu.org --cc dziltener@lyrion.ch --inline --no-attach master; ls *.patch | xargs sed -i '1d'") ("create-guix-patch" . "git format-patch --minimal --to guix-patches@gnu.org --cc dziltener@lyrion.ch --inline --no-attach master; ls *.patch | xargs sed -i '1d'")
("send-guix-patch-series" . "for FILE in $(ls *.patch); do cat $FILE | msmtp -t; done"))) ("send-guix-patch-series" . "for FILE in $(ls *.patch); do cat $FILE | msmtp -t; done")))
(bashrc (bashrc
(list (list
(local-file (local-file
"./.bashrc" "./.bashrc"
"bashrc"))) "bashrc")))
(bash-profile (bash-profile
(list (list
(local-file (local-file
"./.bash_profile" "./.bash_profile"
"bash_profile"))))) "bash_profile")))))
(service home-batsignal-service-type (service home-batsignal-service-type
(home-batsignal-configuration (home-batsignal-configuration
(ignore-missing? #t))) (ignore-missing? #t)))
(service home-mcron-service-type (service home-mcron-service-type
(home-mcron-configuration (home-mcron-configuration
(jobs (jobs
'()))) '())))
(simple-service 'ziltis-channels (simple-service 'ziltis-channels
home-channels-service-type home-channels-service-type
(list (list
(channel (channel
(name 'ziltis-channel) (name 'ziltis-channel)
(url "https://gitea.lyrion.ch/zilti/guixchannel")) (url "https://gitea.lyrion.ch/zilti/guixchannel"))
(channel (channel
(name 'nongnu-guix) (name 'nongnu-guix)
(url "https://gitlab.com/nonguix/nonguix")))) (url "https://gitlab.com/nonguix/nonguix"))))
(service home-openssh-service-type (service home-openssh-service-type
(home-openssh-configuration (home-openssh-configuration
(hosts (hosts
(list (list
(openssh-host (openssh-host
(name "www.opencode.net") (name "github.com")
(host-name "www.opencode.net") (host-name "github.com")
(user "git") (user "git")
(identity-file "~/.ssh/personal_ed")) (identity-file "~/.ssh/personal_ed"))
(openssh-host (openssh-host
(name "gitea.lyrion.ch") (name "www.opencode.net")
(host-name "gitea.lyrion.ch") (host-name "www.opencode.net")
(user "git") (user "git")
(port 7920) (identity-file "~/.ssh/personal_ed"))
(identity-file "~/.ssh/personal_ed")))))) (openssh-host
(service home-gpg-agent-service-type (name "gitea.lyrion.ch")
(home-gpg-agent-configuration (host-name "gitea.lyrion.ch")
(pinentry-program (user "git")
(file-append pinentry-qt "/bin/pinentry-qt")) (port 7920)
(ssh-support? #t) (identity-file "~/.ssh/personal_ed"))))))
(default-cache-ttl 7200) (service home-gpg-agent-service-type
(default-cache-ttl-ssh 7200) (home-gpg-agent-configuration
(extra-content "grab\nallow-emacs-pinentry\nallow-loopback-pinentry"))) (pinentry-program
(service home-dbus-service-type) (file-append pinentry-qt "/bin/pinentry-qt"))
))) (ssh-support? #t)
(default-cache-ttl 7200)
(default-cache-ttl-ssh 7200)
(extra-content "grab\nallow-emacs-pinentry\nallow-loopback-pinentry")))
(service home-dbus-service-type)
)))