From 6f0cbdd2e0cc12eadb4d38ddff62f7ec6020dd1b Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sat, 23 Oct 2021 22:48:13 +0200 Subject: Move to separate file and config notearing --- README.md | 2 +- config.scm | 119 ------------------------------------------------------- desktop.scm | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 129 insertions(+), 120 deletions(-) delete mode 100644 config.scm create mode 100644 desktop.scm diff --git a/README.md b/README.md index ef970a1..23da7dd 100644 --- a/README.md +++ b/README.md @@ -6,5 +6,5 @@ Probably going to obsolete my dotfiles Reconfigure the system with this command: ``` -sudo -E guix system reconfigure config.scm +sudo -E guix system reconfigure $CONFIGURATION_FILE_YOU_WANT ``` diff --git a/config.scm b/config.scm deleted file mode 100644 index ce4e561..0000000 --- a/config.scm +++ /dev/null @@ -1,119 +0,0 @@ -;; This is an operating system configuration generated -;; by the graphical installer. -(use-modules (gnu) - (srfi srfi-1) - ((gnu packages linux) #:prefix gnu-linux:) - (gnu packages admin) - (gnu packages certs) - (gnu packages ssh) - (gnu packages vim) - (gnu packages wm) - (gnu packages wget) - (gnu packages xdisorg) - (gnu packages xorg) - (tuxedo-keyboard) - (nongnu packages linux) - (nongnu system linux-initrd)) - -(use-service-modules desktop networking ssh xorg) - -(operating-system - (kernel linux) - (kernel-loadable-modules `(,tuxedo-keyboard)) - (initrd microcode-initrd) - (firmware (list linux-firmware)) - (locale "en_US.utf8") - (timezone "Europe/Madrid") - (keyboard-layout - (keyboard-layout "es")) - (bootloader - (bootloader-configuration - (bootloader grub-efi-bootloader) - (target "/boot/efi") - (keyboard-layout keyboard-layout) - - ; Doesn't work (YET) - #;(menu-entries - (cons (menu-entry - (label "Ubuntu - Tuxedo OS") - (device "primary") - (linux "/vmlinuz") - (initrd "/initrd")) - '())))) - - (swap-devices (list "/dev/sda3")) - (file-systems - (cons* (file-system - (mount-point "/boot/efi") - (device (uuid "6BB8-3AFE" 'fat32)) - (type "vfat")) - (file-system - (mount-point "/") - (device - (uuid "eee511d3-b473-4bc0-ba63-bf3971341576" - 'ext4)) - (type "ext4")) - (file-system - (mount-point "/home") - (device - (uuid "abed4b79-5f03-409f-84ee-7cb0b3af72af" - 'ext4)) - (type "ext4")) - %base-file-systems)) - (host-name "tuxedo") - (hosts-file - (plain-file "hosts" - (string-append (local-host-aliases host-name) - "51.255.193.230 vps\n"))) - - (users (cons* (user-account - (name "Ekaitz") - (comment "Ekaitz") - (group "users") - (home-directory "/home/Ekaitz") - (supplementary-groups - '("wheel" "netdev" "audio" "video" "lp" "dialout"))) - %base-user-accounts)) - (packages - (cons* - htop - gnu-linux:light - i3-wm - neovim - nss-certs - tree - wget - tcpdump - openssh - xf86-video-intel - xf86-input-wacom - %base-packages)) - - (services (cons* (udev-rules-service 'light gnu-linux:light) - (service gnome-desktop-service-type) - (bluetooth-service #:auto-enable? #t) - (set-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" - )))) - ; Removes ModemManager because it interferes with USB - ; development. If using a 3/4G modem or something we have - ; to activate it. - (remove (lambda (x) (eqv? (service-type-name - (service-kind x)) - 'modem-manager)) - %desktop-services)))) diff --git a/desktop.scm b/desktop.scm new file mode 100644 index 0000000..48b96da --- /dev/null +++ b/desktop.scm @@ -0,0 +1,128 @@ +;; This is an operating system configuration generated +;; by the graphical installer. +(use-modules (gnu) + (srfi srfi-1) + ((gnu packages linux) #:prefix gnu-linux:) + (gnu packages admin) + (gnu packages certs) + (gnu packages ssh) + (gnu packages vim) + (gnu packages wm) + (gnu packages wget) + (gnu packages xdisorg) + (gnu packages xorg) + (gnu packages video) + (tuxedo-keyboard) + (nongnu packages linux) + (nongnu system linux-initrd)) + +(use-service-modules desktop networking ssh xorg) + +(operating-system + (kernel linux) + (kernel-loadable-modules `(,tuxedo-keyboard)) + (initrd microcode-initrd) + (firmware (list linux-firmware)) + (locale "en_US.utf8") + (timezone "Europe/Madrid") + (keyboard-layout + (keyboard-layout "es")) + (bootloader + (bootloader-configuration + (bootloader grub-efi-bootloader) + (target "/boot/efi") + (keyboard-layout keyboard-layout) + + ; Doesn't work (YET) + #;(menu-entries + (cons (menu-entry + (label "Ubuntu - Tuxedo OS") + (device "primary") + (linux "/vmlinuz") + (initrd "/initrd")) + '())))) + + (swap-devices (list "/dev/sda3")) + (file-systems + (cons* (file-system + (mount-point "/boot/efi") + (device (uuid "6BB8-3AFE" 'fat32)) + (type "vfat")) + (file-system + (mount-point "/") + (device + (uuid "eee511d3-b473-4bc0-ba63-bf3971341576" + 'ext4)) + (type "ext4")) + (file-system + (mount-point "/home") + (device + (uuid "abed4b79-5f03-409f-84ee-7cb0b3af72af" + 'ext4)) + (type "ext4")) + %base-file-systems)) + (host-name "tuxedo") + (hosts-file + (plain-file "hosts" + (string-append (local-host-aliases host-name) + "51.255.193.230 vps\n"))) + + (users (cons* (user-account + (name "Ekaitz") + (comment "Ekaitz") + (group "users") + (home-directory "/home/Ekaitz") + (supplementary-groups + '("wheel" "netdev" "audio" "video" "lp" "dialout" "kvm"))) + %base-user-accounts)) + (packages + (cons* + htop + gnu-linux:light + i3-wm + neovim + nss-certs + tree + wget + tcpdump + openssh + intel-vaapi-driver + xf86-input-wacom + %base-packages)) + + (services (cons* (udev-rules-service 'light gnu-linux:light) + (service gnome-desktop-service-type) + (bluetooth-service #:auto-enable? #t) + (set-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" + "\n" + "Section \"Device\"" + " Identifier \"modesetting\"" + " Driver \"modesetting\"" + " Option \"TearFree\" \"true\"" + "EndSection" + "\n" + )))) + ; Removes ModemManager because it interferes with USB + ; development. If using a 3/4G modem or something we have + ; to activate it. + (remove (lambda (x) (eqv? (service-type-name + (service-kind x)) + 'modem-manager)) + %desktop-services)))) -- cgit v1.2.3