modules/rosenthal/examples/dot-config/fcitx5/config

@@ -1,5 +0,0 @@
-# The default Ctrl+Space has conflict with Emacs, change it to Super+Space.
-[Hotkey/TriggerKeys]
-0=Super+space
-1=Zenkaku_Hankaku
-2=Hangul

modules/rosenthal/examples/emacs/init-fonts.el

@@ -1,7 +1,5 @@
 ;;; -*- lexical-binding: t -*-
 
-;; https://github.com/nykma/nema/blob/develop/my-sample/font.el
-
 ;;guix:font-adobe-source-serif
 ;;guix:font-google-noto-emoji
 ;;guix:font-sarasa-gothic

modules/rosenthal/examples/guix/config.tmpl

@@ -1,229 +0,0 @@
-;;; -*- mode: scheme -*-
-
-(use-modules (gnu)
-             (nonguix)
-             (rosenthal)
-             (rosenthal services keyboard)
-             (rosenthal services shellutils)
-             (gnu home services fontutils)
-             (gnu home services shells)
-             (gnu packages fcitx5)
-             (gnu packages gnome-xyz)
-             (gnu packages shells))
-
-(define %my-keyboard-layout
-  (keyboard-layout "us"))
-
-(define %my-user
-  (user-account
-    (name "alice")
-    ;; Initial password: test
-    ;; Change your password via `passwd' after logged in.
-    (password (crypt "test" "$6$abc"))
-    (group "users")
-    (supplementary-groups '("wheel" "audio" "video"))
-    (shell (file-append fish "/bin/fish"))))
-
-(define %my-home
-  (home-environment
-    (packages (specifications->packages
-               '(;; File manager.
-                 "exo"
-                 "file-roller"
-                 "thunar"
-                 "thunar-archive-plugin"
-                 "thunar-media-tags-plugin"
-                 "thunar-volman"
-                 "tumbler"
-
-                 ;; Web browser.
-                 "librewolf"
-                 "ublock-origin-icecat"
-
-                 ;; Text editors, see also `%rosenthal-skeletons'.
-                 "emacs-pgtk"
-                 "neovim"
-
-                 "emacs-corfu"
-                 "emacs-daemons"
-                 "emacs-doom-modeline"
-                 "emacs-envrc"
-                 "emacs-flycheck"
-                 "emacs-flycheck-guile"
-                 "emacs-forge"
-                 "emacs-gcmh"
-                 "emacs-geiser"
-                 "emacs-geiser-guile"
-                 "emacs-helpful"
-                 "emacs-hl-todo"
-                 "emacs-macrostep"
-                 "emacs-macrostep-geiser"
-                 "emacs-magit"
-                 "emacs-mwim"
-                 "emacs-no-littering"
-                 "emacs-orderless"
-                 "emacs-puni"
-                 "emacs-rainbow-delimiters"
-                 "emacs-vertico"
-
-                 ;; Fonts, see also `home-fontconfig-service-type'.
-                 "font-adobe-source-serif"
-                 "font-google-noto"
-                 "font-google-noto-emoji"
-                 "font-nerd-symbols"
-                 "font-sarasa-gothic"
-                 "font-victor-mono"
-                 )))
-    (services
-     (cons* (service home-fish-service-type)
-            (service home-keyboard-service-type %my-keyboard-layout)
-
-            (service home-noctalia-shell-service-type)
-            (service home-polkit-gnome-service-type)
-
-            ;; Default cursor theme.
-            (service home-theme-service-type
-              (home-theme-configuration
-                (packages (list qogir-icon-theme))
-                (icon-theme "Qogir")
-                (cursor-theme "Qogir")))
-
-            ;; Input method.
-            (service home-fcitx5-service-type
-              (home-fcitx5-configuration
-                (gtk-im-module? #t)
-                (qt-im-module? #t)
-                (themes
-                 (list fcitx5-material-color-theme))
-                (input-method-editors
-                 (list fcitx5-anthy
-                       fcitx5-chewing
-                       fcitx5-chinese-addons
-                       fcitx5-hangul
-                       fcitx5-rime
-                       fcitx5-skk
-                       fcitx5-unikey))))
-
-            ;; Font config.
-            (simple-service 'extend-fontconfig home-fontconfig-service-type
-              (let ((sans  "Noto Sans")
-                    (serif "Noto Serif")
-                    (mono  "Victor Mono")
-                    (emoji "Noto Color Emoji"))
-                `((alias
-                   (family "sans-serif")
-                   (prefer
-                    (family ,sans)
-                    (family ,emoji)))
-                  (alias
-                   (family "serif")
-                   (prefer
-                    (family ,serif)
-                    (family ,emoji)))
-                  (alias
-                   (family "monospace")
-                   (prefer
-                    (family ,mono)
-                    (family ,emoji)))
-
-                  ,@(map (lambda (name)
-                           `(alias
-                             (family ,name)
-                             (prefer
-                              (family ,sans)
-                              (family "sans-serif"))))
-                         '("BlinkMacSystemFont"
-                           "-apple-system"
-                           "system-ui"
-                           "ui-sans-serif"))
-                  (alias
-                   (family "ui-serif")
-                   (prefer
-                    (family ,serif)
-                    (family "serif")))
-                  (alias
-                   (family "ui-monospace")
-                   (prefer
-                    (family ,mono)
-                    (family "monospace"))))))
-
-            %rosenthal-desktop-home-services))))
-
-(define %my-os
-  (operating-system
-    (host-name "antelope")
-    (timezone "Europe/Paris")
-    (locale "en_US.utf8")
-    (keyboard-layout %my-keyboard-layout)
-
-    (kernel linux)
-    (firmware (cons* linux-firmware %base-firmware))
-
-    ;; Use the UEFI variant of GRUB with the EFI System
-    ;; Partition mounted on /boot/efi.
-    (bootloader
-      (bootloader-configuration
-        (bootloader grub-efi-bootloader)
-        (targets '("/boot/efi"))
-        (keyboard-layout %my-keyboard-layout)))
-
-    ;; Assume the target root file system is labelled "my-root",
-    ;; and the EFI System Partition has UUID 1234-ABCD.
-    (file-systems
-     (cons* (file-system
-              (device (file-system-label "my-root"))
-              (mount-point "/")
-              (type "ext4"))
-            (file-system
-              (device (uuid "1234-ABCD" 'fat))
-              (mount-point "/boot/efi")
-              (type "vfat"))
-            %base-file-systems))
-
-    (skeletons %rosenthal-skeletons)
-
-    (users
-     (cons* %my-user
-            (user-account
-              (inherit %root-account)
-              ;; Don't initialize password for root.
-              (password #f))
-            %base-user-accounts))
-
-    (packages
-     (append (specifications->packages
-              '(;; CLI utilities.
-                "curl"
-                "fd"
-                "git"
-                "gnupg"
-                "mosh"
-                "ncurses"
-                "ripgrep"
-                "rsync"
-                "unzip"
-
-                ;; Desktop, see also `%rosenthal-skeletons'.
-                "niri"
-                "dconf"
-                "wl-clipboard"
-                "xdg-desktop-portal-gnome"
-                "xdg-desktop-portal-gtk"
-                "xdg-utils"
-                "imv"                ;image viewer
-                "wezterm"            ;terminal emulator
-                "xwayland-satellite" ;rootless XWayland support
-                ))
-             %base-packages))
-
-    (services
-     (cons* (service guix-home-service-type
-              `((,(user-account-name %my-user) ,%my-home)))
-
-            %rosenthal-desktop-services/tuigreet))))
-
-((compose
-  ;; (nonguix-transformation-nvidia)
-  (nonguix-transformation-guix)
-  (rosenthal-transformation-guix))
- %my-os)

modules/rosenthal/services/desktop.scm

@@ -77,7 +77,6 @@
             home-waybar-service-type
 
             %rosenthal-skeletons
-            %rosenthal-skeletons-installer
             %rosenthal-desktop-services/gdm
             %rosenthal-desktop-services/tuigreet
 
@@ -580,23 +579,14 @@ gtk-key-theme-name = ~a~%"
 
     (".config/autostart/shepherd.desktop"
      ,(local-file "../examples/dot-config/autostart/shepherd.desktop"))
-    (".config/fcitx5/config"
-     ,(local-file "../examples/dot-config/fcitx5/config"))
     (".config/niri/config.kdl"
      ,(local-file "../examples/dot-config/niri/config.kdl"))
-    (".config/xfce4/helpers.rc"
+    (".config/noctalia/settings.json"
-     ,(local-file "../examples/dot-config/xfce4/helpers.rc"))
-
-    ;; Selected from the default skeletons.
-    (".config/gdb/gdbinit" ,%default-gdbinit)
-    (".config/nano/nanorc" ,%default-nanorc)
-    (".guile" ,%default-dotguile)))
-
-(define %rosenthal-skeletons-installer
-  `((".config/noctalia/settings.json"
      ,(local-file "../examples/dot-config/noctalia/settings.json"))
     (".config/wezterm/wezterm.lua"
      ,(local-file "../examples/dot-config/wezterm/wezterm.lua"))
+    (".config/xfce4/helpers.rc"
+     ,(local-file "../examples/dot-config/xfce4/helpers.rc"))
     ;; Prevent Noctalia shell initial screen.
     (".cache/noctalia/shell-state.json"
      ,(computed-file "noctalia-shell-state.json"
@@ -613,7 +603,11 @@ gtk-key-theme-name = ~a~%"
                       ("instanceId" . "")))
                    port
                    #:pretty #t)))))))
-    ,@%rosenthal-skeletons))
+
+    ;; Selected from the default skeletons.
+    (".config/gdb/gdbinit" ,%default-gdbinit)
+    (".config/nano/nanorc" ,%default-nanorc)
+    (".guile" ,%default-dotguile)))
 
 
 ;;;