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-03 16:15:08 +02:00
parent 6cf352842b
commit b6b4696773
Signed by: zilti
GPG key ID: B38976E82C9DAE42
5 changed files with 63 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
channels.scm
View file

@ -10,14 +10,28 @@
(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-melpa) (name 'emacs)
(url "https://github.com/babariviere/guix-emacs") (url "https://github.com/babariviere/guix-emacs")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"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
(name 'rosenthal)
(url "https://codeberg.org/hako/rosenthal.git")
(branch "trunk")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"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")
#;(introduction
(make-channel-introduction
"2aa768893d7da14d9831d45e6f1b1625240ff222"
(openpgp-fingerprint
"37F6 55BA F43B C0FF 300A 91A1 B389 76E8 2C9D AE42")))))
) )

17
config.org
View file

@ -61,6 +61,7 @@ There are many community modules at [[https://whereis.みんな/][Whereis]].
- gnu services xorg - gnu services xorg
- gnu system nss - gnu system nss
- rosenthal packages wm - rosenthal packages wm
- zilti packages sway
- nongnu packages firmware - nongnu packages firmware
- nongnu packages linux - nongnu packages linux
- nongnu system linux-initrd - nongnu system linux-initrd
@ -157,7 +158,7 @@ This adds the Nonguix channel.
"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://github.com/rakino/rosenthal") (url "https://codeberg.org/hako/rosenthal.git")
(branch "trunk") (branch "trunk")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
@ -167,7 +168,7 @@ This adds the Nonguix channel.
(channel (channel
(name 'ziltis-channel) (name 'ziltis-channel)
(url "https://gitea.lyrion.ch/zilti/guixchannel") (url "https://gitea.lyrion.ch/zilti/guixchannel")
(introduction #;(introduction
(make-channel-introduction (make-channel-introduction
"2aa768893d7da14d9831d45e6f1b1625240ff222" "2aa768893d7da14d9831d45e6f1b1625240ff222"
(openpgp-fingerprint (openpgp-fingerprint
@ -175,6 +176,8 @@ This adds the Nonguix channel.
) )
#+end_src #+end_src
#+RESULTS: root-channels
** Packages ** Packages
#+NAME: root-packages #+NAME: root-packages
@ -226,7 +229,7 @@ This adds the Nonguix channel.
<<root-modified-desktop-services>> <<root-modified-desktop-services>>
<<root-simple-service-block>> <<root-simple-service-block>>
(list polkit-wheel-service) (list polkit-wheel-service)
(list #;(list
<<greeter-service>>) <<greeter-service>>)
(list (list
<<screen-lock-service>>) <<screen-lock-service>>)
@ -243,7 +246,7 @@ These services are unmodified, or have just few settings.
#+NAME: root-simple-services #+NAME: root-simple-services
| Service | Options | | Service | Options |
|----------------+------------------------------------------------------| |-------------+------------------------------------------------------|
| tlp | () | | tlp | () |
| thermald | ((adaptive? #t)) | | thermald | ((adaptive? #t)) |
| bluetooth | () | | bluetooth | () |
@ -253,8 +256,7 @@ These services are unmodified, or have just few settings.
| virtlog | () | | virtlog | () |
| fstrim | () | | fstrim | () |
| fprintd | () | | fprintd | () |
| seatd | () | | sddm | () |
| sddm | ((display-server "wayland")) |
#+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
@ -321,9 +323,6 @@ These services are unmodified, or have just few settings.
(delete gdm-service-type) (delete gdm-service-type)
(delete screen-locker-service-type) (delete screen-locker-service-type)
(delete login-service-type) (delete login-service-type)
(delete elogind-service-type)
(delete mingetty-service-type)
(delete console-font-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)

35
config.scm
View file

@ -16,7 +16,8 @@
(gnu services virtualization) (gnu services virtualization)
(gnu services xorg) (gnu services xorg)
(gnu system nss) (gnu system nss)
(zilti packages hyprland) (rosenthal packages wm)
(zilti packages sway)
(nongnu packages firmware) (nongnu packages firmware)
(nongnu packages linux) (nongnu packages linux)
(nongnu system linux-initrd)) (nongnu system linux-initrd))
@ -91,6 +92,7 @@
git git
glu glu
hwdata hwdata
hyprcursor
hyprland hyprland
i915-firmware i915-firmware
libdrm libdrm
@ -100,6 +102,7 @@
readline readline
swayfx-0.3.2 swayfx-0.3.2
tuxedo-keyboard tuxedo-keyboard
xdg-desktop-portal-hyprland
xf86-video-amdgpu xf86-video-amdgpu
xf86-video-intel xf86-video-intel
xorg-server-xwayland xorg-server-xwayland
@ -116,9 +119,6 @@
(delete gdm-service-type) (delete gdm-service-type)
(delete screen-locker-service-type) (delete screen-locker-service-type)
(delete login-service-type) (delete login-service-type)
(delete elogind-service-type)
(delete mingetty-service-type)
(delete console-font-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)
@ -156,15 +156,10 @@
(service (service
fprintd-service-type fprintd-service-type
(fprintd-configuration)) (fprintd-configuration))
(service (service sddm-service-type (sddm-configuration)))
seatd-service-type
(seatd-configuration))
(service
sddm-service-type
(sddm-configuration (display-server "wayland"))))
(list polkit-wheel-service) (list polkit-wheel-service)
(list #;(list
(service greetd-service-type (service greetd-service-type
(greetd-configuration (greetd-configuration
(greeter-supplementary-groups (greeter-supplementary-groups
@ -217,16 +212,30 @@
(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-melpa) (name 'emacs)
(url "https://github.com/babariviere/guix-emacs") (url "https://github.com/babariviere/guix-emacs")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"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
(name 'rosenthal)
(url "https://codeberg.org/hako/rosenthal.git")
(branch "trunk")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"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")
#;(introduction
(make-channel-introduction
"2aa768893d7da14d9831d45e6f1b1625240ff222"
(openpgp-fingerprint
"37F6 55BA F43B C0FF 300A 91A1 B389 76E8 2C9D AE42")))))
))))) )))))
)) ))
(name-service-switch %mdns-host-lookup-nss)) (name-service-switch %mdns-host-lookup-nss))

11
home/emacs/init.el
View file

@ -325,11 +325,6 @@
:hook :hook
(visual-line-mode . adaptive-wrap-prefix-mode)) (visual-line-mode . adaptive-wrap-prefix-mode))
;;;; Security
(use-package keychain-environment
:init
(keychain-refresh-environment))
(use-package pass) (use-package pass)
;;;; Evil Mode ;;;; Evil Mode
@ -498,6 +493,8 @@
:commands :commands
global-corfu-mode global-corfu-mode
:init :init
(require 'corfu-popupinfo)
(require 'corfu-history)
(global-corfu-mode) (global-corfu-mode)
(corfu-popupinfo-mode 1) (corfu-popupinfo-mode 1)
(corfu-history-mode 1)) (corfu-history-mode 1))
@ -789,9 +786,7 @@ Point must be at the beginning of balanced expression (sexp)."
;; (setq package-install-upgrade-built-in t) ;; (setq package-install-upgrade-built-in t)
;; You must also make sure the updated version is loaded, by evaluating the `progn` form below. ;; You must also make sure the updated version is loaded, by evaluating the `progn` form below.
(use-package magit (use-package magit
:after transient :after transient)
:autoload
magit)
(use-package magit-todos (use-package magit-todos
:after magit :after magit

4
home/home-configuration.scm
View file

@ -161,6 +161,10 @@
"guile" "guile"
"glibc-locales" "glibc-locales"
"hstr" "hstr"
"hyprcursor"
"hyprpaper"
"hypridle"
"hyprlock"
"icecat" "icecat"
"icedove-wayland" "icedove-wayland"
"kitty" "kitty"