diff options
Diffstat (limited to 'desktop.scm')
| -rw-r--r-- | desktop.scm | 121 |
1 files changed, 59 insertions, 62 deletions
diff --git a/desktop.scm b/desktop.scm index 9128241..321f8e9 100644 --- a/desktop.scm +++ b/desktop.scm @@ -1,76 +1,67 @@ (use-modules (gnu) (srfi srfi-1) ((gnu packages linux) #:prefix gnu-linux:) - (gnu packages admin) - (gnu packages certs) - (gnu packages freedesktop) - (gnu packages linux) - (gnu packages ssh) - (gnu packages vim) - (gnu packages wm) - (gnu packages wget) - (gnu packages xdisorg) - (gnu packages xorg) - (gnu packages video) - (gnu packages virtualization) - (gnu services virtualization) - (gnu services pm) + (gnu system locale) (nongnu packages linux) (nongnu system linux-initrd)) +(use-package-modules admin certs freedesktop linux ssh vim wm wget xdisorg xorg + video virtualization) +(use-service-modules desktop networking ssh xorg pm sddm virtualization security-token) -;; Keyboard layout -(define us-keyboard-for-bootloader-and-linux (keyboard-layout "us")) -(define my-real-keyboard-layout - (keyboard-layout "es,us,ru" #:options '("grp:alt_space_toggle"))) +(define keyboard-layout + (keyboard-layout "us,es" + #:options '("eurosign:e" + "grp:alt_space_toggle" + "lv3:ralt_switch"))) -;; My services -(use-service-modules desktop networking ssh xorg) (define my-services (list (udev-rules-service 'light gnu-linux:light) - (service gnome-desktop-service-type) + (service pcscd-service-type) + (service tor-service-type) (service thermald-service-type) (service power-profiles-daemon-service-type) (simple-service 'adwaita-dark-theme session-environment-service-type '(("GTK_THEME" . "Adwaita:dark"))) - (service bluetooth-service-type - (bluetooth-configuration (auto-enable? #t))) - (set-xorg-configuration - (xorg-configuration - (keyboard-layout my-real-keyboard-layout) - (modules (append %default-xorg-modules - (list xf86-input-wacom))) - (extra-config - '("\n" - "\n" - "Section \"InputClass\"\n" - " Identifier \"libinput touchpad catchall\"\n" - " Driver \"libinput\"\n" - " MatchIsTouchpad \"on\"\n" - " MatchDevicePath \"/dev/input/event*\"\n" - " Option \"Tapping\" \"on\"\n" - " Option \"TappingDrag\" \"on\"\n" - " Option \"DisableWhileTyping\" \"on\"\n" - "EndSection\n" - "\n" - ; https://wiki.archlinux.org/title/Libinput#Via_xinput - "Section \"InputClass\"\n" - " Identifier \"USB Mouse Pad USB Mouse Pad Mouse\"\n" - " Driver \"libinput\"\n" - " MatchDevicePath \"/dev/input/event*\"\n" - " MatchUSBID \"062a:8255\"\n" - " Option \"Middle Emulation\" \"on\"\n" - " Option \"AccelSpeed\" \"-0.9\"" - "EndSection\n" - "\n" - "\n" - "Section \"Device\"\n" - " Identifier \"modesetting\"\n" - " Driver \"modesetting\"\n" - " Option \"TearFree\" \"True\"\n" - "EndSection" - "\n")))) + (service bluetooth-service-type) + (service sddm-service-type + (sddm-configuration + (xorg-configuration + (xorg-configuration + (keyboard-layout keyboard-layout) + (modules (append %default-xorg-modules + (list xf86-input-wacom))) + (extra-config + '("\n" + "\n" + "Section \"InputClass\"\n" + " Identifier \"libinput touchpad catchall\"\n" + " Driver \"libinput\"\n" + " MatchIsTouchpad \"on\"\n" + " MatchDevicePath \"/dev/input/event*\"\n" + " Option \"Tapping\" \"on\"\n" + " Option \"TappingDrag\" \"on\"\n" + " Option \"DisableWhileTyping\" \"on\"\n" + "EndSection\n" + "\n" + ; https://wiki.archlinux.org/title/Libinput#Via_xinput + "Section \"InputClass\"\n" + " Identifier \"USB Mouse Pad USB Mouse Pad Mouse\"\n" + " Driver \"libinput\"\n" + " MatchDevicePath \"/dev/input/event*\"\n" + " MatchUSBID \"062a:8255\"\n" + " Option \"Middle Emulation\" \"on\"\n" + " Option \"AccelSpeed\" \"-0.9\"" + "EndSection\n" + "\n" + "\n" + "Section \"Device\"\n" + " Identifier \"modesetting\"\n" + " Driver \"modesetting\"\n" + " Option \"TearFree\" \"True\"\n" + "EndSection" + "\n")))))) (service qemu-binfmt-service-type (qemu-binfmt-configuration (platforms (lookup-qemu-platforms "riscv64" "aarch64")) @@ -83,14 +74,19 @@ (kernel-loadable-modules `(,tuxedo-keyboard)) (initrd microcode-initrd) (firmware (list linux-firmware)) - (locale "en_US.utf8") + (locale "en_IE.utf8") + (locale-definitions + (list (locale-definition (name "en_IE.utf8") (source "en_IE")) + (locale-definition (name "en_US.utf8") (source "en_US")) + (locale-definition (name "es_ES.utf8") (source "es_ES")) + (locale-definition (name "eu_ES.utf8") (source "eu_ES")))) (timezone "Europe/Madrid") - (keyboard-layout us-keyboard-for-bootloader-and-linux) + (keyboard-layout keyboard-layout) (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) (targets (list "/boot/efi")) - (keyboard-layout us-keyboard-for-bootloader-and-linux))) + (keyboard-layout keyboard-layout))) (swap-devices (list (swap-space (target "/dev/sda3")))) (file-systems @@ -137,7 +133,7 @@ intel-vaapi-driver xf86-input-wacom gnu-linux:ntfs-3g - qemu + qemu-7.2.4 %base-packages)) (services @@ -147,6 +143,7 @@ ;; development. If using a 3/4G modem or something we have ;; to activate it. (delete modem-manager-service-type) + (delete gdm-service-type) ;; Configure nonguix substitutes (guix-service-type config => |