From af435b10458e9e606b6c044d1b13eed00504d30b Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Wed, 6 Sep 2023 12:07:34 -0400 Subject: [PATCH] men --- home-config/home-configuration.scm | 60 ++++++++++++------------ modules/home-config/base-system.scm | 11 ++--- modules/home-services/virtualization.scm | 1 + 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index 506a4bd..372eb0f 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -7,16 +7,16 @@ (use-modules (gnu home) (gnu packages) (gnu packages vim) - (gnu packages gcc) - (gnu packages gnupg) + (gnu packages gcc) + (gnu packages gnupg) (gnu packages virtualization) (gnu services) - (guix packages) + (guix packages) (guix gexp) (gnu home services shells) - (gnu home services desktop) - (gnu home services gnupg) - (gnu home services) + (gnu home services desktop) + (gnu home services gnupg) + (gnu home services) (home-services pipewire) (home-packages mozillia) (home-packages audio)) @@ -26,40 +26,40 @@ (inherit neovim) (native-inputs (modify-inputs (package-native-inputs neovim) - (prepend gcc-12))))) + (prepend gcc-12))))) (home-environment ;; Below is the list of packages that will show up in your ;; Home profile, unser ~/.guix-home/profile. (packages (append (specifications->packages (list "xdg-utils" - "mako" + "mako" "i3-autotiling" "wofi" - "qrencode" + "qrencode" "sassc" - "binutils" - "gcc-toolchain" + "binutils" + "gcc-toolchain" "clang-toolchain" - "libreoffice" - "gnupg" - "pavucontrol" - "bind:utils" - "syncthing" - "imv" - "unzip" - "p7zip" - "curl" - "htop" - "curl" - "zathura" - "zathura-pdf-mupdf" - "gimp" - "weechat" - "mpv" - "git" + "libreoffice" + "gnupg" + "pavucontrol" + "bind:utils" + "syncthing" + "imv" + "unzip" + "p7zip" + "curl" + "htop" + "curl" + "zathura" + "zathura-pdf-mupdf" + "gimp" + "weechat" + "mpv" + "git" "pinentry" "ungoogled-chromium" - "element-desktop" + "element-desktop" "nm-tray" "pfetch" "acpi" @@ -77,7 +77,7 @@ "tree-sitter-cli" "python-pynvim")) - (list my-neovim easyeffects firefox-wayland-new))) + (list my-neovim easyeffects firefox-wayland-new))) ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. diff --git a/modules/home-config/base-system.scm b/modules/home-config/base-system.scm index f819d1a..e8e26de 100644 --- a/modules/home-config/base-system.scm +++ b/modules/home-config/base-system.scm @@ -1,17 +1,17 @@ (define-module (home-config base-system) #:use-module (gnu) - #:use-module (nongnu packages linux) #:use-module (gnu system setuid) + #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages avahi) - #:use-module (gnu packages) - #:use-module (guix packages) #:use-module (gnu packages shells) #:use-module (gnu packages tls) - #:use-module (srfi srfi-1) #:use-module (gnu packages security-token) - #:use-module (gnu services security-token) #:use-module (gnu packages virtualization) + #:use-module (guix packages) + #:use-module (nongnu packages linux) + #:use-module (srfi srfi-1) + #:use-module (gnu services security-token) #:use-module (gnu services cups) #:use-module (gnu services desktop) #:use-module (gnu services networking) @@ -93,7 +93,6 @@ "docker" "linux-pam" "pulseaudio" - ;;"pipewire" "libx11" "xorg-server-xwayland" "fprintd" diff --git a/modules/home-services/virtualization.scm b/modules/home-services/virtualization.scm index abc1335..3dd12c2 100644 --- a/modules/home-services/virtualization.scm +++ b/modules/home-services/virtualization.scm @@ -15,6 +15,7 @@ (inputs (modify-inputs (package-inputs libvirt) (append ovmf))))) + (define (ovmf-special-files config) `(("/usr/share/OVMF/OVMF_CODE.fd", (file-append ovmf "/share/firmware/ovmf_x64.bin"))))