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

.

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:
mkdir -p ~/.config/guix
ln -sf `pwd`/channels.scm ~/.config/guix/channels.scm
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 hosts-firefox-user

8
channels.scm
View File

@ -7,7 +7,7 @@
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
(channel
(channel
(name 'emacs)
(url "https://github.com/babariviere/guix-emacs")
(introduction
@ -15,7 +15,7 @@
"72ca4ef5b572fea10a4589c37264fa35d4564783"
(openpgp-fingerprint
"261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18"))))
(channel
(channel
(name 'rosenthal)
(url "https://codeberg.org/hako/rosenthal.git")
(branch "trunk")
@ -24,7 +24,7 @@
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))
(channel
(channel
(name 'ziltis-channel)
(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.
#+NAME: root-channels
#+begin_src scheme
#+begin_src scheme :tangle channels.scm
(cons* (channel
(name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix")
@ -167,6 +167,8 @@ This adds the Nonguix channel.
%default-channels)
#+end_src
#+RESULTS: root-channels :tangle channels.scm
#+RESULTS: root-channels
** Packages
@ -246,7 +248,6 @@ These services are unmodified, or have just few settings.
| virtlog | () |
| fstrim | () |
| fprintd | () |
| sddm | () |
#+NAME: root-simple-service-block
#+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
(modify-services
%desktop-services
(delete gdm-service-type)
(delete screen-locker-service-type)
(delete login-service-type)
(delete pulseaudio-service-type)
(guix-service-type config => (guix-configuration
(inherit config)

6
config.scm
View File

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

523
home/home-configuration.scm
View File

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

1
sysinst.sh
View File

@ -4,7 +4,6 @@ mount /dev/disk/by-label/guix /mnt
mkdir -p /mnt/boot/efi
mount /dev/disk/by-label/EFI /mnt/boot/efi
herd start cow-store /mnt
guix pull -C./channels.scm
GUIX_PROFILE="/root/.config/guix/current"
. "$GUIX_PROFILE/etc/profile"
hash guix