zilti/guixconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.

Browse source
This commit is contained in:
Daniel Ziltener 2024-04-05 13:25:10 +02:00
parent f2fd2cd352
commit 32a450a550
Signed by: zilti
GPG key ID: B38976E82C9DAE42
6 changed files with 271 additions and 276 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,4 @@
reconfigure: reconfigure:
mkdir -p ~/.config/guix
ln -sf `pwd`/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 hosts-firefox-user make -C /home/zilti/.guix-home/profile/lib/browserpass hosts-firefox-user

8
channels.scm
View file

@ -7,7 +7,7 @@
"897c1a470da759236cc11798f4e0a5f7d4d59fbc" "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint (openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
(channel (channel
(name 'emacs) (name 'emacs)
(url "https://github.com/babariviere/guix-emacs") (url "https://github.com/babariviere/guix-emacs")
(introduction (introduction
@ -15,7 +15,7 @@
"72ca4ef5b572fea10a4589c37264fa35d4564783" "72ca4ef5b572fea10a4589c37264fa35d4564783"
(openpgp-fingerprint (openpgp-fingerprint
"261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18"))))
(channel (channel
(name 'rosenthal) (name 'rosenthal)
(url "https://codeberg.org/hako/rosenthal.git") (url "https://codeberg.org/hako/rosenthal.git")
(branch "trunk") (branch "trunk")
@ -24,7 +24,7 @@
"7677db76330121a901604dfbad19077893865f35" "7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint (openpgp-fingerprint
"13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))
(channel (channel
(name 'ziltis-channel) (name 'ziltis-channel)
(url "https://gitea.lyrion.ch/zilti/guixchannel")) (url "https://gitea.lyrion.ch/zilti/guixchannel"))
%default-channels) %default-channels)

7
config.org
View file

@ -134,7 +134,7 @@ There are many community modules at [[https://whereis.みんな/][Whereis]].
This adds the Nonguix channel. This adds the Nonguix channel.
#+NAME: root-channels #+NAME: root-channels
#+begin_src scheme #+begin_src scheme :tangle channels.scm
(cons* (channel (cons* (channel
(name 'nonguix) (name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix") (url "https://gitlab.com/nonguix/nonguix")
@ -167,6 +167,8 @@ This adds the Nonguix channel.
%default-channels) %default-channels)
#+end_src #+end_src
#+RESULTS: root-channels :tangle channels.scm
#+RESULTS: root-channels #+RESULTS: root-channels
** Packages ** Packages
@ -246,7 +248,6 @@ These services are unmodified, or have just few settings.
| virtlog | () | | virtlog | () |
| fstrim | () | | fstrim | () |
| fprintd | () | | fprintd | () |
| sddm | () |
#+NAME: root-simple-service-block #+NAME: root-simple-service-block
#+begin_src scheme :noweb yes :exports none :results output #+begin_src scheme :noweb yes :exports none :results output
@ -310,9 +311,7 @@ These services are unmodified, or have just few settings.
#+begin_src scheme :exports none :results code :noweb no-export #+begin_src scheme :exports none :results code :noweb no-export
(modify-services (modify-services
%desktop-services %desktop-services
(delete gdm-service-type)
(delete screen-locker-service-type) (delete screen-locker-service-type)
(delete login-service-type)
(delete pulseaudio-service-type) (delete pulseaudio-service-type)
(guix-service-type config => (guix-configuration (guix-service-type config => (guix-configuration
(inherit config) (inherit config)

6
config.scm
View file

@ -97,6 +97,7 @@
hyprland hyprland
i915-firmware i915-firmware
libdrm libdrm
linux-pam
mesa mesa
nss-certs nss-certs
network-manager network-manager
@ -120,9 +121,7 @@
(append (append
(modify-services (modify-services
%desktop-services %desktop-services
(delete gdm-service-type)
(delete screen-locker-service-type) (delete screen-locker-service-type)
(delete login-service-type)
(delete pulseaudio-service-type) (delete pulseaudio-service-type)
(guix-service-type config => (guix-configuration (guix-service-type config => (guix-configuration
(inherit config) (inherit config)
@ -191,8 +190,7 @@
(fstrim-configuration)) (fstrim-configuration))
(service (service
fprintd-service-type fprintd-service-type
(fprintd-configuration)) (fprintd-configuration)))
(service sddm-service-type (sddm-configuration)))
(list polkit-wheel-service) (list polkit-wheel-service)
(list (list

523
home/home-configuration.scm
View file

@ -31,266 +31,267 @@
(home-environment (home-environment
;; 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 (
(list services
(service home-shepherd-service-type) (list
(service home-msmtp-service-type (service home-shepherd-service-type)
(home-msmtp-configuration (service home-msmtp-service-type
(default-account "LMail") (home-msmtp-configuration
(accounts (default-account "LMail")
(list (accounts
(msmtp-account (list
(name "LMail") (msmtp-account
(configuration (name "LMail")
(msmtp-configuration (configuration
(host "lyrion.ch") (msmtp-configuration
(port 465) (host "lyrion.ch")
(auth? #t) (port 465)
(tls? #t) (auth? #t)
(tls-starttls? #f) (tls? #t)
(user "dziltener") (tls-starttls? #f)
(from "dziltener@lyrion.ch") (user "dziltener")
(password-eval "pass Privat/Mailaccount | head -n 1")))) (from "dziltener@lyrion.ch")
(msmtp-account (password-eval "pass Privat/Mailaccount | head -n 1"))))
(name "Red Sky") (msmtp-account
(configuration (name "Red Sky")
(msmtp-configuration (configuration
(host "gmail.com") (msmtp-configuration
(port 587) (host "gmail.com")
(auth? #t) (port 587)
(tls? #t) (auth? #t)
(tls-starttls? #f) (tls? #t)
(user "dz@redsky.io") (tls-starttls? #f)
(from "dziltener@lyrion.ch") (user "dz@redsky.io")
(password-eval "pass Privat/RedSkyGMail")))))))) (from "dziltener@lyrion.ch")
(simple-service 'ziltis-environment-variable-service (password-eval "pass Privat/RedSkyGMail"))))))))
home-environment-variables-service-type (simple-service 'ziltis-environment-variable-service
`(("PATH" . "$PATH:~/.local/bin") home-environment-variables-service-type
("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store") `(("PATH" . "$PATH:~/.local/bin")
("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$XDG_DATA_HOME/flatpak/exports/share") ("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store")
("XDG_CURRENT_DESKTOP" . "sway") ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$XDG_DATA_HOME/flatpak/exports/share")
("RTC_USE_PIPEWIRE" . "true") ("XDG_CURRENT_DESKTOP" . "sway")
("SSH_ASKPASS" . "ksshaskpass") ("RTC_USE_PIPEWIRE" . "true")
("ELM_DISPLAY" . "wl") ("SSH_ASKPASS" . "ksshaskpass")
("SDL_VIDEODRIVER" . "wayland") ("ELM_DISPLAY" . "wl")
("MOZ_ENABLE_WAYLAND" . "1") ("SDL_VIDEODRIVER" . "wayland")
("SSL_CERT_FILE" . "$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt") ("MOZ_ENABLE_WAYLAND" . "1")
("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc") ("SSL_CERT_FILE" . "$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt")
;; ("CHICKEN_INSTALL_REPOSITORY" . "$XDG_DATA_HOME/chicken/eggs") ("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc")
;; ("CHICKEN_REPOSITORY_PATH" . "$HOME/.guix-home/profile/var/lib/chicken/11/:$XDG_DATA_HOME/chicken/eggs") ;; ("CHICKEN_INSTALL_REPOSITORY" . "$XDG_DATA_HOME/chicken/eggs")
;; ("CHICKEN_INSTALL_PREFIX" . "$HOME/.local") ;; ("CHICKEN_REPOSITORY_PATH" . "$HOME/.guix-home/profile/var/lib/chicken/11/:$XDG_DATA_HOME/chicken/eggs")
("XCURSOR_SIZE" . "48") ;; ("CHICKEN_INSTALL_PREFIX" . "$HOME/.local")
)) ("XCURSOR_SIZE" . "48")
(simple-service 'ziltis-home-files-service ))
home-files-service-type (simple-service 'ziltis-home-files-service
`(#;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")))) home-files-service-type
(simple-service 'ziltis-xdg-configuration-files-service `(#;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))))
home-xdg-configuration-files-service-type (simple-service 'ziltis-xdg-configuration-files-service
`(("sway/config" ,(local-file "./sway/sway")) home-xdg-configuration-files-service-type
("swaylock/config" ,(local-file "./swaylock/config")) `(("sway/config" ,(local-file "./sway/sway"))
("swayidle/config" ,(local-file "./swayidle/config")) ("swaylock/config" ,(local-file "./swaylock/config"))
("liquidpromptrc" ,(local-file "./liquidprompt/liquidpromptrc")) ("swayidle/config" ,(local-file "./swayidle/config"))
("xdg-desktop-portal-wlr/config" ,(local-file "./xdg-desktop-portal-wlr/config")))) ("liquidpromptrc" ,(local-file "./liquidprompt/liquidpromptrc"))
(service home-syncthing-service-type) ("xdg-desktop-portal-wlr/config" ,(local-file "./xdg-desktop-portal-wlr/config"))))
(service home-batsignal-service-type (service home-syncthing-service-type)
(home-batsignal-configuration (service home-batsignal-service-type
(ignore-missing? #t))) (home-batsignal-configuration
(service home-mcron-service-type (ignore-missing? #t)))
(home-mcron-configuration (service home-mcron-service-type
(jobs (home-mcron-configuration
'()))) (jobs
(simple-service 'ziltis-packages '())))
home-profile-service-type (simple-service 'ziltis-packages
(specifications->packages home-profile-service-type
(list "bind:utils" (specifications->packages
"bsd-games" (list "bind:utils"
"bolt" "bsd-games"
"browserpass-native" "bolt"
"chicken" "browserpass-native"
"chicken-apropos" "chicken"
"chicken-chicken-doc" "chicken-apropos"
"chicken-srfi-18" "chicken-chicken-doc"
"curl" "chicken-srfi-18"
"deluge" "curl"
"direnv" "deluge"
"emacs-pgtk-xwidgets" "direnv"
"emacs-desktop-environment" "emacs-pgtk-xwidgets"
"entr" "emacs-desktop-environment"
"eternalterminal" "entr"
"diff-so-fancy" "eternalterminal"
"firefox" "diff-so-fancy"
"flatpak" "firefox"
"font-libertinus" "flatpak"
"font-nerdfont-monaspice" "font-libertinus"
"font-nerdfont-iosevka-term-slab" "font-nerdfont-monaspice"
"fuzzel" "font-nerdfont-iosevka-term-slab"
"fzf" "fuzzel"
"gammastep" "fzf"
"gash" "gammastep"
"grim" "gash"
"guile" "grim"
"glibc-locales" "guile"
"hstr" "glibc-locales"
"hyprcursor" "hstr"
"hyprpaper" "hyprcursor"
"hypridle" "hyprpaper"
"hyprlock" "hypridle"
"icecat" "hyprlock"
"icedove-wayland" "icecat"
"kitty" "icedove-wayland"
"ksshaskpass" "kitty"
"kwayland-integration" "ksshaskpass"
"le-certs" "kwayland-integration"
"ledger" "le-certs"
"libaacs" "ledger"
"libbdplus" "libaacs"
"libbluray" "libbdplus"
"liquidprompt" "libbluray"
"libsecret" "liquidprompt"
"make" "libsecret"
"nix" "make"
"nm-tray" "nix"
"nnn" "nm-tray"
"nss-certs" "nnn"
"nwg-displays" "nss-certs"
"okular" "nwg-displays"
"openssh" "okular"
"password-store" "openssh"
"pass-otp" "password-store"
"pavucontrol" "pass-otp"
"perl-mozilla-ca" "pavucontrol"
"pinentry-qt" "perl-mozilla-ca"
"plasma-wayland-protocols" "pinentry-qt"
"process-compose" "plasma-wayland-protocols"
"qt5ct" "process-compose"
"qtwayland@5.15.10" "qt5ct"
"pv" "qtwayland@5.15.10"
"rsync" "pv"
"rust" "rsync"
"rust-cargo" "rust"
"sddm" "rust-cargo"
"senpai" "sddm"
"sideload" "senpai"
"slurp" "sideload"
"sshfs" "slurp"
"steam" "sshfs"
"stow" "steam"
;; "sponge" https://linux.die.net/man/1/sponge "stow"
"swappy" ;; "sponge" https://linux.die.net/man/1/sponge
"swayidle" "swappy"
"swaylock-effects" "swayidle"
"swaynotificationcenter" "swaylock-effects"
"telegram-desktop" "swaynotificationcenter"
"tig" "telegram-desktop"
"tmate" "tig"
"tmux" "tmate"
"tree-sitter" "tmux"
"ungoogled-chromium-wayland" "tree-sitter"
"unzip" "ungoogled-chromium-wayland"
"virt-manager" "unzip"
"visidata" "virt-manager"
"waybar" "visidata"
"wlogout" "waybar"
"xdg-dbus-proxy" "wlogout"
"xdg-utils" "xdg-dbus-proxy"
"xdg-utils"
;; "emacs-adaptive-wrap" ;; "emacs-adaptive-wrap"
;; "emacs-adoc-mode" ;; "emacs-adoc-mode"
;; "emacs-cape" ;; "emacs-cape"
;; "emacs-catppuccin-theme" ;; "emacs-catppuccin-theme"
;; "emacs-cider@1.13.0" ;; "emacs-cider@1.13.0"
;; ;;"emacs-code-review" ;; ;;"emacs-code-review"
;; "emacs-color-theme-modern" ;; "emacs-color-theme-modern"
;; "emacs-consult-eglot" ;; "emacs-consult-eglot"
;; "emacs-consult-notes" ;; "emacs-consult-notes"
;; "emacs-corfu" ;; "emacs-corfu"
;; "emacs-dhall-mode" ;; "emacs-dhall-mode"
;; "emacs-editorconfig" ;; "emacs-editorconfig"
;; "emacs-eglot" ;; "emacs-eglot"
;; "emacs-el-patch" ;; "emacs-el-patch"
;; "emacs-embark-consult" ;; "emacs-embark-consult"
;; "emacs-envrc" ;; "emacs-envrc"
;; "emacs-evil" ;; "emacs-evil"
;; "emacs-evil-collection" ;; "emacs-evil-collection"
;; "emacs-evil-easymotion" ;; "emacs-evil-easymotion"
;; "emacs-evil-snipe" ;; "emacs-evil-snipe"
;; "emacs-forge" ;; "emacs-forge"
;; "emacs-geiser" ;; "emacs-geiser"
;; "emacs-geiser-chicken" ;; "emacs-geiser-chicken"
;; "emacs-geiser-guile" ;; "emacs-geiser-guile"
;; "emacs-git-gutter" ;; "emacs-git-gutter"
;; "emacs-goto-chg" ;; "emacs-goto-chg"
;; "emacs-guix" ;; "emacs-guix"
;; "emacs-highlight-parentheses" ;; "emacs-highlight-parentheses"
;; "emacs-keychain-environment" ;; "emacs-keychain-environment"
;; "emacs-ledger-mode" ;; "emacs-ledger-mode"
;; "emacs-ligature" ;; "emacs-ligature"
;; "emacs-magit" ;; "emacs-magit"
;; "emacs-magit-todos" ;; "emacs-magit-todos"
;; "emacs-marginalia" ;; "emacs-marginalia"
;; "emacs-moe-theme" ;; "emacs-moe-theme"
;; "emacs-nerd-icons-completion" ;; "emacs-nerd-icons-completion"
;; "emacs-nerd-icons-corfu" ;; "emacs-nerd-icons-corfu"
;; "emacs-orderless" ;; "emacs-orderless"
;; "emacs-org" ;; "emacs-org"
;; "emacs-org-modern" ;; "emacs-org-modern"
;; "emacs-org-rainbow-tags" ;; "emacs-org-rainbow-tags"
;; "emacs-org-roam" ;; "emacs-org-roam"
;; "emacs-org-roam-ui" ;; "emacs-org-roam-ui"
;; "emacs-paredit" ;; "emacs-paredit"
;; "emacs-paren-face" ;; "emacs-paren-face"
;; "emacs-pass" ;; "emacs-pass"
;; "emacs-pinentry" ;; "emacs-pinentry"
;; "emacs-seq" ;; "emacs-seq"
;; "emacs-tempel" ;; "emacs-tempel"
;; "emacs-transient" ;; "emacs-transient"
;; "emacs-tree-sitter" ;; "emacs-tree-sitter"
;; "emacs-unicode-fonts" ;; "emacs-unicode-fonts"
;; "emacs-vertico" ;; "emacs-vertico"
;; "emacs-visual-fill-column" ;; "emacs-visual-fill-column"
;; "emacs-websocket" ;; "emacs-websocket"
;; "emacs-wgrep" ;; "emacs-wgrep"
;; "emacs-which-key" ;; "emacs-which-key"
;; "emacs-xref-union" ;; "emacs-xref-union"
;; "emacs-zig-mode" ;; "emacs-zig-mode"
;; "emacs-corfu-terminal" ;; "emacs-corfu-terminal"
))) )))
(service home-openssh-service-type (service home-openssh-service-type
(home-openssh-configuration (home-openssh-configuration
(add-keys-to-agent "yes") (add-keys-to-agent "yes")
;(extra-content "IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh") ;(extra-content "IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh")
(hosts (hosts
(list (list
(openssh-host (openssh-host
(name "*") (name "*")
(identity-file "~/.ssh/redsky_do_rsa")) (identity-file "~/.ssh/redsky_do_rsa"))
(openssh-host (openssh-host
(name "git.sr.ht") (name "git.sr.ht")
(host-name "git.sr.ht") (host-name "git.sr.ht")
(user "git") (user "git")
(identity-file "~/.ssh/personal_ed")) (identity-file "~/.ssh/personal_ed"))
(openssh-host (openssh-host
(name "gitlab.com") (name "gitlab.com")
(host-name "gitlab.com") (host-name "gitlab.com")
(user "git") (user "git")
(identity-file "~/.ssh/personal_ed")) (identity-file "~/.ssh/personal_ed"))
(openssh-host (openssh-host
(name "github.com") (name "github.com")
(host-name "github.com") (host-name "github.com")
(user "git") (user "git")
(identity-file "~/.ssh/personal_ed")) (identity-file "~/.ssh/personal_ed"))
(openssh-host (openssh-host
(name "www.opencode.net") (name "www.opencode.net")
(host-name "www.opencode.net") (host-name "www.opencode.net")
(user "git") (user "git")
(identity-file "~/.ssh/personal_ed")) (identity-file "~/.ssh/personal_ed"))
(openssh-host (openssh-host
(name "gitea.lyrion.ch") (name "gitea.lyrion.ch")
(host-name "gitea.lyrion.ch") (host-name "gitea.lyrion.ch")
(user "git") (user "git")
(port 7920) (port 7920)
(identity-file "~/.ssh/personal_ed")))))) (identity-file "~/.ssh/personal_ed"))))))
(service home-dbus-service-type) (service home-dbus-service-type)
(service home-pipewire-service-type (service home-pipewire-service-type
(home-pipewire-configuration (home-pipewire-configuration
(wireplumber wireplumber-minimal)))))) (wireplumber wireplumber-minimal))))))

1
sysinst.sh
View file

@ -4,7 +4,6 @@ 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_PROFILE="/root/.config/guix/current" GUIX_PROFILE="/root/.config/guix/current"
. "$GUIX_PROFILE/etc/profile" . "$GUIX_PROFILE/etc/profile"
hash guix hash guix