Merge branch 'master' of ssh://git.kylekrein.com/kylekrein/dotfiles

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 
@@ -70,35 +71,34 @@
 		 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
+		 `(,isc-bind "utils") ;; dig for dns
+		 inetutils
 		 nautilus
 		 dankmaterialshell
 		 secretsd
-		 `(,isc-bind "utils") ;; dig for dns
-		 inetutils
-		 xournalpp))
+		 xournalpp
+		 geary
+		 gnome-calendar
+		 gnome-contacts
+		 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-dankmaterialshell-service-type
-		;	 (home-dankmaterialshell-configuration
-		;	  (launch-command (file-append niri "/bin/niri msg action spawn-sh --"))))
-	        (service home-niri-service-type
+  (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-pipewire-service-type)
-		;(service home-wayland-service-type)
 		(service home-dbus-service-type)
 		(service home-bash-service-type
                          (home-bash-configuration

guix-config/system/base-system.scm

@@ -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)