From bb31de27eb68b5f691cd63fc9b75a240bc157be2 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Wed, 17 Dec 2025 16:12:52 +0100 Subject: [PATCH 1/3] Switched to gnome (test) --- guix-config/channels-lock.scm | 2 +- guix-config/home/workstation.scm | 28 ++++++++-------------------- guix-config/system/base-system.scm | 7 ++++--- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/guix-config/channels-lock.scm b/guix-config/channels-lock.scm index 725d3aa..34d162e 100644 --- a/guix-config/channels-lock.scm +++ b/guix-config/channels-lock.scm @@ -3,7 +3,7 @@ (url "https://git.guix.gnu.org/guix.git") (branch "master") (commit - "7c7bad305a66da1e83299ce7fa2e96c803667d0a") + "291c1506e090d395cf70bc965fe8bbc9a5325079") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" diff --git a/guix-config/home/workstation.scm b/guix-config/home/workstation.scm index 01b67a5..439bb7e 100644 --- a/guix-config/home/workstation.scm +++ b/guix-config/home/workstation.scm @@ -41,8 +41,8 @@ #:use-module (guix-config packages fonts) #:use-module (guix-config home services emacs) #:use-module (guix-config home services flatpak) - #:use-module (guix-config home services secretsd) - #:use-module (gnu home services niri) + ;#:use-module (guix-config home services secretsd) + ;#:use-module (gnu home services niri) #:use-module (guix transformations) #:use-module (guix packages) #:use-module (gnu packages gimp) @@ -70,35 +70,23 @@ font-nerd-fonts-symbols-mono font-openmoji direnv - (package - (inherit neochat) - (propagated-inputs (modify-inputs (package-propagated-inputs neochat) - (append qtpositioning)))) - birdtray nextcloud-client krita gimp inkscape - icedove - nautilus - dankmaterialshell - secretsd `(,isc-bind "utils") ;; dig for dns inetutils - xournalpp)) + xournalpp + geary + gnome-calendar + gnome-contacts + )) ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. (services - (append (list ;(service home-dankmaterialshell-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) + (append (list (service home-pipewire-service-type) (service home-dbus-service-type) (service home-bash-service-type (home-bash-configuration diff --git a/guix-config/system/base-system.scm b/guix-config/system/base-system.scm index 8333e64..c860962 100644 --- a/guix-config/system/base-system.scm +++ b/guix-config/system/base-system.scm @@ -11,7 +11,7 @@ (define %my-desktop-services (modify-services %desktop-services - (delete gdm-service-type) + ;(delete gdm-service-type) (elogind-service-type config => (elogind-configuration (inherit config) @@ -42,7 +42,7 @@ (define base-system (operating-system - (locale "ru_RU.utf8") + (locale "en_US.utf8") (timezone "Europe/Berlin") (keyboard-layout (keyboard-layout "eu,ru" #:options '("grp:alt_shift_toggle"))) @@ -62,10 +62,11 @@ ;; Below is the list of system services. To search for available ;; services, run 'guix system search KEYWORD' in a terminal. (services - (append (list + (append (list (service gnome-desktop-service-type) ;; To configure OpenSSH, pass an 'openssh-configuration' ;; record as a second argument to 'service' below. (service openssh-service-type) + (service gnome-keyring-service-type) (service cups-service-type (cups-configuration (web-interface? #t) From f80010a1a8a13c42bfe74bcd843583a254cfc054 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Wed, 17 Dec 2025 19:05:14 +0100 Subject: [PATCH 2/3] GNOME (not dwarf) --- guix-config/channels-lock.scm | 2 +- guix-config/home/workstation.scm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/guix-config/channels-lock.scm b/guix-config/channels-lock.scm index 34d162e..1437020 100644 --- a/guix-config/channels-lock.scm +++ b/guix-config/channels-lock.scm @@ -3,7 +3,7 @@ (url "https://git.guix.gnu.org/guix.git") (branch "master") (commit - "291c1506e090d395cf70bc965fe8bbc9a5325079") + "facb375f88802201347cb6bed867645aacc69bd0") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" diff --git a/guix-config/home/workstation.scm b/guix-config/home/workstation.scm index 439bb7e..6e40b23 100644 --- a/guix-config/home/workstation.scm +++ b/guix-config/home/workstation.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages inkscape) #:use-module (gnu packages wm) #:use-module (gnu packages dns) + #:use-module (gnu packages gnome-xyz) ) (define tune @@ -81,6 +82,8 @@ geary gnome-calendar gnome-contacts + gnome-tweaks + gnome-shell-extension-paperwm )) ;; Below is the list of Home services. To search for available From 66fb28d5a97ec20b395a1c386728df2dc655fc64 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Wed, 17 Dec 2025 22:09:34 +0100 Subject: [PATCH 3/3] deleted gnome --- guix-config/home/workstation.scm | 17 +++++++++++++---- guix-config/system/base-system.scm | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/guix-config/home/workstation.scm b/guix-config/home/workstation.scm index 6e40b23..96ceee6 100644 --- a/guix-config/home/workstation.scm +++ b/guix-config/home/workstation.scm @@ -41,8 +41,8 @@ #:use-module (guix-config packages fonts) #:use-module (guix-config home services emacs) #:use-module (guix-config home services flatpak) - ;#:use-module (guix-config home services secretsd) - ;#:use-module (gnu home services niri) + #:use-module (guix-config home services secretsd) + #:use-module (gnu home services niri) #:use-module (guix transformations) #:use-module (guix packages) #:use-module (gnu packages gimp) @@ -78,18 +78,27 @@ inkscape `(,isc-bind "utils") ;; dig for dns inetutils + nautilus + dankmaterialshell + secretsd xournalpp geary gnome-calendar gnome-contacts - gnome-tweaks - gnome-shell-extension-paperwm + adwaita-icon-theme + icedove + + evolution-data-server + gnome-online-accounts )) ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. (services (append (list (service home-pipewire-service-type) + (service home-niri-service-type + (niri-configuration + (environment-variables (list (string-append "DMSDEFAULTCONFIG=" (package-output (open-connection) dankmaterialshell) "/share/quickshell"))))) (service home-dbus-service-type) (service home-bash-service-type (home-bash-configuration diff --git a/guix-config/system/base-system.scm b/guix-config/system/base-system.scm index c860962..8bf512e 100644 --- a/guix-config/system/base-system.scm +++ b/guix-config/system/base-system.scm @@ -11,7 +11,7 @@ (define %my-desktop-services (modify-services %desktop-services - ;(delete gdm-service-type) + (delete gdm-service-type) (elogind-service-type config => (elogind-configuration (inherit config) @@ -62,7 +62,7 @@ ;; Below is the list of system services. To search for available ;; services, run 'guix system search KEYWORD' in a terminal. (services - (append (list (service gnome-desktop-service-type) + (append (list ;(service gnome-desktop-service-type) ;; To configure OpenSSH, pass an 'openssh-configuration' ;; record as a second argument to 'service' below. (service openssh-service-type)