Switched to gnome (test)

This commit is contained in:
Aleksandr Lebedev 2025-12-17 16:12:52 +01:00
parent 7ea90427b0
commit bb31de27eb
3 changed files with 13 additions and 24 deletions

View file

@ -3,7 +3,7 @@
(url "https://git.guix.gnu.org/guix.git") (url "https://git.guix.gnu.org/guix.git")
(branch "master") (branch "master")
(commit (commit
"7c7bad305a66da1e83299ce7fa2e96c803667d0a") "291c1506e090d395cf70bc965fe8bbc9a5325079")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad" "9edb3f66fd807b096b48283debdcddccfea34bad"

View file

@ -41,8 +41,8 @@
#:use-module (guix-config packages fonts) #:use-module (guix-config packages fonts)
#:use-module (guix-config home services emacs) #:use-module (guix-config home services emacs)
#:use-module (guix-config home services flatpak) #:use-module (guix-config home services flatpak)
#:use-module (guix-config home services secretsd) ;#:use-module (guix-config home services secretsd)
#:use-module (gnu home services niri) ;#:use-module (gnu home services niri)
#:use-module (guix transformations) #:use-module (guix transformations)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages gimp) #:use-module (gnu packages gimp)
@ -70,35 +70,23 @@
font-nerd-fonts-symbols-mono font-nerd-fonts-symbols-mono
font-openmoji font-openmoji
direnv direnv
(package
(inherit neochat)
(propagated-inputs (modify-inputs (package-propagated-inputs neochat)
(append qtpositioning))))
birdtray
nextcloud-client nextcloud-client
krita krita
gimp gimp
inkscape inkscape
icedove
nautilus
dankmaterialshell
secretsd
`(,isc-bind "utils") ;; dig for dns `(,isc-bind "utils") ;; dig for dns
inetutils inetutils
xournalpp)) xournalpp
geary
gnome-calendar
gnome-contacts
))
;; 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
(append (list ;(service home-dankmaterialshell-service-type (append (list (service home-pipewire-service-type)
; (home-dankmaterialshell-configuration
; (launch-command (file-append niri "/bin/niri msg action spawn-sh --"))))
(service home-niri-service-type
(niri-configuration
(environment-variables (list (string-append "DMSDEFAULTCONFIG=" (package-output (open-connection) dankmaterialshell) "/share/quickshell")))))
(service home-pipewire-service-type)
;(service home-wayland-service-type)
(service home-dbus-service-type) (service home-dbus-service-type)
(service home-bash-service-type (service home-bash-service-type
(home-bash-configuration (home-bash-configuration

View file

@ -11,7 +11,7 @@
(define %my-desktop-services (define %my-desktop-services
(modify-services %desktop-services (modify-services %desktop-services
(delete gdm-service-type) ;(delete gdm-service-type)
(elogind-service-type config => (elogind-service-type config =>
(elogind-configuration (elogind-configuration
(inherit config) (inherit config)
@ -42,7 +42,7 @@
(define base-system (define base-system
(operating-system (operating-system
(locale "ru_RU.utf8") (locale "en_US.utf8")
(timezone "Europe/Berlin") (timezone "Europe/Berlin")
(keyboard-layout (keyboard-layout "eu,ru" (keyboard-layout (keyboard-layout "eu,ru"
#:options '("grp:alt_shift_toggle"))) #:options '("grp:alt_shift_toggle")))
@ -62,10 +62,11 @@
;; Below is the list of system services. To search for available ;; Below is the list of system services. To search for available
;; services, run 'guix system search KEYWORD' in a terminal. ;; services, run 'guix system search KEYWORD' in a terminal.
(services (services
(append (list (append (list (service gnome-desktop-service-type)
;; To configure OpenSSH, pass an 'openssh-configuration' ;; To configure OpenSSH, pass an 'openssh-configuration'
;; record as a second argument to 'service' below. ;; record as a second argument to 'service' below.
(service openssh-service-type) (service openssh-service-type)
(service gnome-keyring-service-type)
(service cups-service-type (service cups-service-type
(cups-configuration (cups-configuration
(web-interface? #t) (web-interface? #t)