.
This commit is contained in:
parent
6cf352842b
commit
b6b4696773
5 changed files with 63 additions and 42 deletions
18
channels.scm
18
channels.scm
|
@ -10,14 +10,28 @@
|
|||
(openpgp-fingerprint
|
||||
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
|
||||
(channel
|
||||
(name 'emacs-melpa)
|
||||
(name 'emacs)
|
||||
(url "https://github.com/babariviere/guix-emacs")
|
||||
(introduction
|
||||
(make-channel-introduction
|
||||
"72ca4ef5b572fea10a4589c37264fa35d4564783"
|
||||
(openpgp-fingerprint
|
||||
"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
|
||||
(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")))))
|
||||
)
|
||||
|
|
37
config.org
37
config.org
|
@ -61,6 +61,7 @@ There are many community modules at [[https://whereis.みんな/][Whereis]].
|
|||
- gnu services xorg
|
||||
- gnu system nss
|
||||
- rosenthal packages wm
|
||||
- zilti packages sway
|
||||
- nongnu packages firmware
|
||||
- nongnu packages linux
|
||||
- nongnu system linux-initrd
|
||||
|
@ -157,7 +158,7 @@ This adds the Nonguix channel.
|
|||
"261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18"))))
|
||||
(channel
|
||||
(name 'rosenthal)
|
||||
(url "https://github.com/rakino/rosenthal")
|
||||
(url "https://codeberg.org/hako/rosenthal.git")
|
||||
(branch "trunk")
|
||||
(introduction
|
||||
(make-channel-introduction
|
||||
|
@ -167,7 +168,7 @@ This adds the Nonguix channel.
|
|||
(channel
|
||||
(name 'ziltis-channel)
|
||||
(url "https://gitea.lyrion.ch/zilti/guixchannel")
|
||||
(introduction
|
||||
#;(introduction
|
||||
(make-channel-introduction
|
||||
"2aa768893d7da14d9831d45e6f1b1625240ff222"
|
||||
(openpgp-fingerprint
|
||||
|
@ -175,6 +176,8 @@ This adds the Nonguix channel.
|
|||
)
|
||||
#+end_src
|
||||
|
||||
#+RESULTS: root-channels
|
||||
|
||||
** Packages
|
||||
|
||||
#+NAME: root-packages
|
||||
|
@ -226,7 +229,7 @@ This adds the Nonguix channel.
|
|||
<<root-modified-desktop-services>>
|
||||
<<root-simple-service-block>>
|
||||
(list polkit-wheel-service)
|
||||
(list
|
||||
#;(list
|
||||
<<greeter-service>>)
|
||||
(list
|
||||
<<screen-lock-service>>)
|
||||
|
@ -242,19 +245,18 @@ This adds the Nonguix channel.
|
|||
These services are unmodified, or have just few settings.
|
||||
|
||||
#+NAME: root-simple-services
|
||||
| Service | Options |
|
||||
|----------------+------------------------------------------------------|
|
||||
| tlp | () |
|
||||
| thermald | ((adaptive? #t)) |
|
||||
| bluetooth | () |
|
||||
| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) |
|
||||
| inputattach | () |
|
||||
| libvirt | ((unix-sock-group "libvirt")) |
|
||||
| virtlog | () |
|
||||
| fstrim | () |
|
||||
| fprintd | () |
|
||||
| seatd | () |
|
||||
| sddm | ((display-server "wayland")) |
|
||||
| Service | Options |
|
||||
|-------------+------------------------------------------------------|
|
||||
| tlp | () |
|
||||
| thermald | ((adaptive? #t)) |
|
||||
| bluetooth | () |
|
||||
| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) |
|
||||
| inputattach | () |
|
||||
| libvirt | ((unix-sock-group "libvirt")) |
|
||||
| virtlog | () |
|
||||
| fstrim | () |
|
||||
| fprintd | () |
|
||||
| sddm | () |
|
||||
|
||||
#+NAME: root-simple-service-block
|
||||
#+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 screen-locker-service-type)
|
||||
(delete login-service-type)
|
||||
(delete elogind-service-type)
|
||||
(delete mingetty-service-type)
|
||||
(delete console-font-service-type)
|
||||
(delete pulseaudio-service-type)
|
||||
(guix-service-type config => (guix-configuration
|
||||
(inherit config)
|
||||
|
|
35
config.scm
35
config.scm
|
@ -16,7 +16,8 @@
|
|||
(gnu services virtualization)
|
||||
(gnu services xorg)
|
||||
(gnu system nss)
|
||||
(zilti packages hyprland)
|
||||
(rosenthal packages wm)
|
||||
(zilti packages sway)
|
||||
(nongnu packages firmware)
|
||||
(nongnu packages linux)
|
||||
(nongnu system linux-initrd))
|
||||
|
@ -91,6 +92,7 @@
|
|||
git
|
||||
glu
|
||||
hwdata
|
||||
hyprcursor
|
||||
hyprland
|
||||
i915-firmware
|
||||
libdrm
|
||||
|
@ -100,6 +102,7 @@
|
|||
readline
|
||||
swayfx-0.3.2
|
||||
tuxedo-keyboard
|
||||
xdg-desktop-portal-hyprland
|
||||
xf86-video-amdgpu
|
||||
xf86-video-intel
|
||||
xorg-server-xwayland
|
||||
|
@ -116,9 +119,6 @@
|
|||
(delete gdm-service-type)
|
||||
(delete screen-locker-service-type)
|
||||
(delete login-service-type)
|
||||
(delete elogind-service-type)
|
||||
(delete mingetty-service-type)
|
||||
(delete console-font-service-type)
|
||||
(delete pulseaudio-service-type)
|
||||
(guix-service-type config => (guix-configuration
|
||||
(inherit config)
|
||||
|
@ -156,15 +156,10 @@
|
|||
(service
|
||||
fprintd-service-type
|
||||
(fprintd-configuration))
|
||||
(service
|
||||
seatd-service-type
|
||||
(seatd-configuration))
|
||||
(service
|
||||
sddm-service-type
|
||||
(sddm-configuration (display-server "wayland"))))
|
||||
(service sddm-service-type (sddm-configuration)))
|
||||
|
||||
(list polkit-wheel-service)
|
||||
(list
|
||||
#;(list
|
||||
(service greetd-service-type
|
||||
(greetd-configuration
|
||||
(greeter-supplementary-groups
|
||||
|
@ -217,16 +212,30 @@
|
|||
(openpgp-fingerprint
|
||||
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
|
||||
(channel
|
||||
(name 'emacs-melpa)
|
||||
(name 'emacs)
|
||||
(url "https://github.com/babariviere/guix-emacs")
|
||||
(introduction
|
||||
(make-channel-introduction
|
||||
"72ca4ef5b572fea10a4589c37264fa35d4564783"
|
||||
(openpgp-fingerprint
|
||||
"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
|
||||
(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))
|
||||
|
|
|
@ -325,11 +325,6 @@
|
|||
:hook
|
||||
(visual-line-mode . adaptive-wrap-prefix-mode))
|
||||
|
||||
;;;; Security
|
||||
(use-package keychain-environment
|
||||
:init
|
||||
(keychain-refresh-environment))
|
||||
|
||||
(use-package pass)
|
||||
|
||||
;;;; Evil Mode
|
||||
|
@ -498,6 +493,8 @@
|
|||
:commands
|
||||
global-corfu-mode
|
||||
:init
|
||||
(require 'corfu-popupinfo)
|
||||
(require 'corfu-history)
|
||||
(global-corfu-mode)
|
||||
(corfu-popupinfo-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)
|
||||
;; You must also make sure the updated version is loaded, by evaluating the `progn` form below.
|
||||
(use-package magit
|
||||
:after transient
|
||||
:autoload
|
||||
magit)
|
||||
:after transient)
|
||||
|
||||
(use-package magit-todos
|
||||
:after magit
|
||||
|
|
|
@ -161,6 +161,10 @@
|
|||
"guile"
|
||||
"glibc-locales"
|
||||
"hstr"
|
||||
"hyprcursor"
|
||||
"hyprpaper"
|
||||
"hypridle"
|
||||
"hyprlock"
|
||||
"icecat"
|
||||
"icedove-wayland"
|
||||
"kitty"
|
||||
|
|
Loading…
Reference in a new issue