We like to make music on rose too

files/sway-greetd.conf

@@ -1,28 +0,0 @@
-# sway config file
-#
-
-set $mod Mod1
-set $win Mod4
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-font pango:monospace 8
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# reload the configuration file
-bindsym $mod+Shift+x reload
-# restart sway inplace (preserves your layout/session, can be used to upgrade sway)
-bindsym $mod+Shift+o restart
-# exit sway (logs you out of your X session)
-bindsym $mod+Shift+p exec "swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your X session.' -B 'Yes, exit sway' 'swaymsg exit'"
-
-default_border pixel
-hide_edge_borders smart
-
-input type:keyboard {
-	xkb_layout fr
-	xkb_variant bepo
-	xkb_options ctrl:nocaps
-}

packages.scm

@@ -1,20 +1,15 @@
 (use-modules (gnu packages admin)
-             (gnu packages audio)
              (gnu packages chromium)
              (gnu packages compression)
              (gnu packages commencement)
-             (gnu packages cryptsetup)
              (gnu packages curl)
              (gnu packages databases)
              (gnu packages fonts)
              (gnu packages gnome)
              (gnu packages gnome-xyz)
-             (gnu packages gnuzilla)
              (gnu packages haskell)
              (gnu packages haskell-xyz)
-             (gnu packages image)
              (gnu packages libreoffice)
-             (gnu packages lxde)
              (gnu packages mail)
              (gnu packages man)
              (gnu packages music)
@@ -29,51 +24,33 @@
              (gnu packages virtualization)
              (gnu packages wm)
              (gnu packages web)
-             (gnu packages xdisorg)
              (gnu packages xfce)
              (gnu packages xorg)
-             (loom packages eyecandy)
-             (loom packages music))
+             (loom packages eyecandy))
 
 (define %desktop
   (list
-    adwaita-icon-theme
     arc-icon-theme
     arc-theme
-    audacious-gtk
-    cryptsetup
     evince
-    font-awesome
-    font-lohit
+    font-google-noto
     font-openmoji
-    font-sarasa-gothic
-    grim
     htop
-    kanshi
-    lxterminal
-    moka-icon-theme
     mplayer
-    neovim
-    nwg-launchers
+    nitrogen
     pavucontrol
     pwgen
+    quodlibet
     recutils
-    ristretto
-    slurp
-    thunar
     tmux
     toon-cursors
-    tumbler
     unzip
+    vim-full
     vim-solarized
-    waybar
-    wdisplays
-    wl-clipboard
-    wl-color-picker
     xarchiver
+    xfce4-screenshooter
     xrandr
     yaru-theme
-    zenity
     zip))
 
 (define %dev
@@ -86,8 +63,8 @@
 (define %web
   (list
     claws-mail
-    icecat-minimal
-    ungoogled-chromium))
+    ungoogled-chromium
+    ))
 
 (define %heavy
   (list
@@ -102,16 +79,3 @@
     netcat
     openssh
     rsync))
-
-(define %studio
-  (list
-    amsynth
-    audacity
-    calf
-    hydrogen
-    jack-1
-    lilypond
-    qjackctl
-    setbfree
-    sooperlooper
-    yoshimi))

pine.packages.scm

@@ -1,3 +1,3 @@
 (load "packages.scm")
 
-(packages->manifest (append %desktop %dev %heavy %network %studio %web))
+(packages->manifest (append %desktop %dev %heavy %network %web))

pine.system.scm

@@ -17,7 +17,8 @@
           (pam-mount "kook" "/dev/md0")
           pam-audio
           (ssh-only `(("kook" ,(local-file "files/authorized_keys")))))
-        (nonguix %greetd-sway-desktop)))
+        (desktop-environment (operating-system-keyboard-layout os))
+        (nonguix %desktop-services)))
     (kernel linux)
     (initrd microcode-initrd)
     (firmware (list linux-firmware))

rose.packages.scm

@@ -1,3 +1,3 @@
 (load "packages.scm")
 
-(packages->manifest (append %desktop %dev %heavy %network %studio %web))
+(packages->manifest (append %desktop %dev %heavy %network %web))

rose.system.scm

@@ -17,7 +17,8 @@
             "kook"
             "/dev/disk/by-uuid/c896e07f-d2ed-4390-8ce0-b82080d1bdc2")
           pam-audio)
-        (nonguix %greetd-sway-desktop)))
+        (desktop-environment (operating-system-keyboard-layout os))
+        (nonguix %desktop-services)))
     (kernel linux)
     (initrd microcode-initrd)
     (firmware (list linux-firmware))

system.scm

@@ -1,29 +1,17 @@
 (use-modules (gnu)
              ((gnu packages anthy) #:select (anthy))
+             ((gnu packages certs) #:select (nss-certs))
              ((gnu packages gnome) #:select (gvfs))
-             ((gnu packages fcitx5) #:select (fcitx5
-					      fcitx5-anthy
-					      fcitx5-gtk
-					      fcitx5-gtk4
-					      fcitx5-qt))
              ((gnu packages file-systems) #:select (davfs2))
-             ((gnu packages glib) #:select (dbus))
              ((gnu packages ibus) #:select (ibus ibus-anthy))
-             ((gnu packages wm) #:select (sway))
+             ((gnu packages wm) #:select (i3-wm))
              ((gnu services desktop) #:select (xfce-desktop-service-type))
              ((gnu services pam-mount) #:select (pam-mount-service-type pam-mount-configuration))
-             ((gnu services xorg) #:select (gdm-service-type set-xorg-configuration xorg-configuration))
+             ((gnu services xorg) #:select (set-xorg-configuration xorg-configuration))
              (gnu system))
 
 (define %utils
-  (list davfs2
-	fcitx5
-	fcitx5-anthy
-	fcitx5-gtk
-	fcitx5-gtk4
-	fcitx5-qt
-	gvfs
-	sway))
+  (list anthy davfs2 gvfs i3-wm ibus ibus-anthy nss-certs))
 
 (define (install-to root-fs)
   (operating-system
@@ -54,7 +42,7 @@
             %base-file-systems))))
 
 (define pam-audio
-  (service pam-limits-service-type
+  (pam-limits-service
     (list
       (pam-limits-entry "@audio" 'both 'rtprio 99)
       (pam-limits-entry "@audio" 'both 'memlock 'unlimited))))
@@ -86,26 +74,6 @@
     (set-xorg-configuration
       (xorg-configuration (keyboard-layout keyboard-layout)))))
 
-(define %greetd-sway-desktop
-  (cons
-    (service greetd-service-type
-             (greetd-configuration
-               (greeter-supplementary-groups (list "video" "input"))
-               (terminals
-                 (list
-                   (greetd-terminal-configuration
-                     (terminal-vt "7")
-                     (terminal-switch #t)
-                     (default-session-command
-                       (greetd-wlgreet-sway-session
-                         (wlgreet-session
-                           (greetd-wlgreet-session
-                             (command (file-append dbus "/bin/dbus-run-session"))
-                             (command-args (list (file-append sway "/bin/sway")))))
-                         (sway-configuration
-                           (local-file "files/sway-greetd.conf")))))))))
-    (modify-services %desktop-services (delete gdm-service-type))))
-
 (define (ssh-only authorized-keys)
   (service openssh-service-type
            (openssh-configuration