summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbd <bdunahu@operationnull.com>2024-09-02 10:05:06 -0400
committerbd <bdunahu@operationnull.com>2024-09-02 10:05:06 -0400
commit9c98374a7b901b13dbf4e326cedd17d88231bba8 (patch)
treed3e2e3b232e180cd42a1cd3adf756928a3f3b7ee
parenta997a95c84339337bcb80ffa14a6740a606c7c1d (diff)
Remove virtual machine packages
-rw-r--r--.config/guix/garm.scm134
-rw-r--r--.config/guix/modules/ymir.scm55
2 files changed, 88 insertions, 101 deletions
diff --git a/.config/guix/garm.scm b/.config/guix/garm.scm
index 31d6625..71998fe 100644
--- a/.config/guix/garm.scm
+++ b/.config/guix/garm.scm
@@ -15,11 +15,6 @@
#:use-module (gnu services)
#:use-module (gnu services guix)
#:use-module (gnu services pm)
-
- ;; sem 24.2
- #:use-module (gnu packages virtualization)
- #:use-module (gnu services virtualization)
-
#:use-module (guix gexp)
#:use-module (modules base)
#:use-module (modules dwm)
@@ -33,7 +28,8 @@
(define home
(home-environment
(services
- `(,@bd-base-home-services
+ `(
+ ,@bd-base-home-services
,@bd-mail-home-services
,@bd-desktop-home-services
,@bd-pdf-services
@@ -42,75 +38,67 @@
(operating-system
- (inherit ymir)
- (host-name "garm")
-
- ;; (all packages are system wide)
- (packages
- `(,@bd-base-system-packages
- ,@bd-desktop-system-packages
- ,@bd-dwm-system-packages
- ,@bd-mpd-package
- ,@bd-games-packages
-
- ;; machine-specific packages
- ,@(list
- brightnessctl
- macchanger
- tlp
+ (inherit ymir)
+ (host-name "garm")
- ;; sem 24.2
- qemu
- virt-manager
- )))
+ ;; (all packages are system wide)
+ (packages
+ `(,@bd-base-system-packages
+ ,@bd-desktop-system-packages
+ ,@bd-dwm-system-packages
+ ,@bd-mpd-package
+ ,@bd-games-packages
- (services
- `(,@bd-base-system-services
- ,@bd-desktop-system-services
- ,@bd-mpd-service
- ,(service guix-home-service-type
- `((,username ,home)))
- ,(service tlp-service-type
- (tlp-configuration
- (cpu-scaling-governor-on-ac (list "powersave"))
- (cpu-scaling-governor-on-bat (list "powersave"))
- (energy-perf-policy-on-ac "powersave")
- (energy-perf-policy-on-bat "powersave")
- (pcie-aspm-on-ac "powersave")
- (pcie-aspm-on-bat "powersave")
- (sched-powersave-on-bat? #t)
- (sched-powersave-on-ac? #t)
- (sata-linkpwr-on-ac "min_power")
- (sata-linkpwr-on-bat "min_power")
- (start-charge-thresh-bat0 60)
- (stop-charge-thresh-bat0 80)))
- ,(service thermald-service-type)
- ,(simple-service 'network-manager-applet
- profile-service-type
- (list network-manager-applet))
+ ;; machine-specific packages
+ ,@(list
+ brightnessctl
+ macchanger
+ tlp)))
- ;; sem 24.2
- ,(service libvirt-service-type)))
+ (services
+ `(,@bd-base-system-services
+ ,@bd-desktop-system-services
+ ,@bd-mpd-service
+ ,(service guix-home-service-type
+ `((,username ,home)))
+ ,(service tlp-service-type
+ (tlp-configuration
+ (cpu-scaling-governor-on-ac (list "powersave"))
+ (cpu-scaling-governor-on-bat (list "powersave"))
+ (energy-perf-policy-on-ac "powersave")
+ (energy-perf-policy-on-bat "powersave")
+ (pcie-aspm-on-ac "powersave")
+ (pcie-aspm-on-bat "powersave")
+ (sched-powersave-on-bat? #t)
+ (sched-powersave-on-ac? #t)
+ (sata-linkpwr-on-ac "min_power")
+ (sata-linkpwr-on-bat "min_power")
+ (start-charge-thresh-bat0 60)
+ (stop-charge-thresh-bat0 80)))
+ ,(service thermald-service-type)
+ ,(simple-service 'network-manager-applet
+ profile-service-type
+ (list network-manager-applet))))
- (mapped-devices (list (mapped-device
- (source (uuid "671c8094-c8cd-47f9-8332-25513f16917b"))
- (target "hidden")
- (type luks-device-mapping))))
+ (mapped-devices (list (mapped-device
+ (source (uuid "671c8094-c8cd-47f9-8332-25513f16917b"))
+ (target "hidden")
+ (type luks-device-mapping))))
- (file-systems (cons* (file-system
- (mount-point "/boot/efi")
- (device (uuid
- "1A7A-026F"
- 'fat32))
- (type "vfat"))
- (file-system
- (mount-point "/home")
- (device "/dev/mapper/hidden")
- (type "ext4")
- (dependencies mapped-devices))
- (file-system
- (mount-point "/")
- (device (uuid
- "0a0b9520-308f-4072-a62b-b91ffacdc5b0"
- 'ext4))
- (type "ext4")) %base-file-systems)))
+ (file-systems (cons* (file-system
+ (mount-point "/boot/efi")
+ (device (uuid
+ "1A7A-026F"
+ 'fat32))
+ (type "vfat"))
+ (file-system
+ (mount-point "/home")
+ (device "/dev/mapper/hidden")
+ (type "ext4")
+ (dependencies mapped-devices))
+ (file-system
+ (mount-point "/")
+ (device (uuid
+ "0a0b9520-308f-4072-a62b-b91ffacdc5b0"
+ 'ext4))
+ (type "ext4")) %base-file-systems)))
diff --git a/.config/guix/modules/ymir.scm b/.config/guix/modules/ymir.scm
index 1260984..4a889ce 100644
--- a/.config/guix/modules/ymir.scm
+++ b/.config/guix/modules/ymir.scm
@@ -18,7 +18,6 @@
(group "users")
(home-directory (string-append "/home/" username))
(supplementary-groups '("audio"
- "libvirt"
"netdev"
;; "transmission"
"video"
@@ -27,33 +26,33 @@
(define ymir
(operating-system
- (host-name "ymir")
- (locale "en_US.utf8")
- (timezone "America/New_York")
- (keyboard-layout (keyboard-layout "us"))
- (kernel-arguments
- (delete "quiet"
- %default-kernel-arguments))
+ (host-name "ymir")
+ (locale "en_US.utf8")
+ (timezone "America/New_York")
+ (keyboard-layout (keyboard-layout "us"))
+ (kernel-arguments
+ (delete "quiet"
+ %default-kernel-arguments))
- ;; 'root' is implicit
- (users (cons* user
- %base-user-accounts))
+ ;; 'root' is implicit
+ (users (cons* user
+ %base-user-accounts))
- ;; grub (uefi)
- (bootloader (bootloader-configuration
- (bootloader grub-efi-bootloader)
- (targets (list "/boot/efi"))
- (keyboard-layout keyboard-layout)))
+ ;; grub (uefi)
+ (bootloader (bootloader-configuration
+ (bootloader grub-efi-bootloader)
+ (targets (list "/boot/efi"))
+ (keyboard-layout keyboard-layout)))
- ;; OVERRIDE THESE
- (packages
- %base-packages)
- (services
- %base-services)
- (file-systems (cons*
- (file-system
- (mount-point "/")
- (device "none")
- (type "tmpfs")
- (check? #f))
- %base-file-systems))))
+ ;; OVERRIDE THESE
+ (packages
+ %base-packages)
+ (services
+ %base-services)
+ (file-systems (cons*
+ (file-system
+ (mount-point "/")
+ (device "none")
+ (type "tmpfs")
+ (check? #f))
+ %base-file-systems))))