guix-config

guix system configuration/declaration
git clone git://git.eonn.xyz/guix-config.git
Log | Files | Refs | LICENSE

commit 53c6854ae2fd28ead3ac1515a88a6127477c92f1
parent c172f0f21857b7b6d6310f5f1256168277b3fbe3
Author: Ian Ressa <ian@eonn.xyz>
Date:   Tue, 13 Sep 2022 19:20:43 -0400

I'm changing my alias from eonn to shmage, so I'm renaming scheme modules in here.

Diffstat:
Mmanifest/clisp.scm | 2+-
Mmanifest/emacs.scm | 2+-
Mmanifest/games.scm | 2+-
Mmanifest/python.scm | 2+-
Mmanifest/texlive.scm | 2+-
Dmodules/eonn/guix/packages.scm | 177-------------------------------------------------------------------------------
Dmodules/eonn/guix/packages/suckless.scm | 43-------------------------------------------
Dmodules/eonn/guix/utils.scm | 21---------------------
Amodules/shmage/guix/packages.scm | 174+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Amodules/shmage/guix/packages/suckless.scm | 43+++++++++++++++++++++++++++++++++++++++++++
Amodules/shmage/guix/utils.scm | 21+++++++++++++++++++++
Mpackages | 4++--
Msystem/cocles.scm | 2+-
Msystem/orb.scm | 2+-
14 files changed, 247 insertions(+), 250 deletions(-)

diff --git a/manifest/clisp.scm b/manifest/clisp.scm @@ -1,5 +1,5 @@ (use-modules (guix profiles) - (eonn guix packages)) + (shmage guix packages)) (packages->manifest clisp-packages) diff --git a/manifest/emacs.scm b/manifest/emacs.scm @@ -1,5 +1,5 @@ (use-modules (guix profiles) - (eonn guix packages)) + (shmage guix packages)) (packages->manifest emacs-packages) diff --git a/manifest/games.scm b/manifest/games.scm @@ -1,5 +1,5 @@ (use-modules (guix profiles) - (eonn guix packages)) + (shmage guix packages)) (packages->manifest games-packages) diff --git a/manifest/python.scm b/manifest/python.scm @@ -1,5 +1,5 @@ (use-modules (guix profiles) - (eonn guix packages)) + (shmage guix packages)) (packages->manifest python-packages) diff --git a/manifest/texlive.scm b/manifest/texlive.scm @@ -1,5 +1,5 @@ (use-modules (guix profiles) - (eonn guix packages)) + (shmage guix packages)) (packages->manifest texlive-packages) diff --git a/modules/eonn/guix/packages.scm b/modules/eonn/guix/packages.scm @@ -1,177 +0,0 @@ -(define-module (eonn guix packages) - #:use-module (eonn guix utils) - #:export (build-common-packages - system-packages - xorg-packages - xorg-misc-packages - desktop-packages - tools-packages - texlive-packages - font-packages - theme-packages - emacs-packages - clisp-packages - python-packages - games-packages - virtualization-packages)) - -(define build-common-packages - (specifications->packages - "autoconf" - "automake" - "gcc-toolchain" - "gdb" - "gettext" - "make" - "pkg-config")) - -(define system-packages - (specifications->packages - "acpi" - "acpid" - "nss-certs")) - -(define xorg-packages - (specifications->packages - "mesa" - "xorg-server" - "xf86-input-evdev" - "xf86-input-libinput" - "xf86-video-fbdev" - "xf86-video-vesa" - "xinit")) - -(define xorg-misc-packages - (specifications->packages - "fontconfig" - "setxkbmap" - "xrandr" - "xrdb" - "xset" - "xsetroot" - "xev" - "xinitrc-xsession" - "xinput" - "xlsfonts" - "xmodmap")) - -(define desktop-packages - (specifications->packages - "alacritty" - "dbus" - "dconf" - "dmenu-eonn" - "dunst" - "dwm-eonn" - "evince" - "feh" - "flameshot" - "geeqie" - "gnome-keyring" - "icecat" - "keepassxc" - "mpv" - "mousepad" - "mumble" - "polkit-gnome" - "polybar" - "pulseaudio" - "pavucontrol" - "picom" - "pinentry" - "rofi" - "st-eonn" - "stumpwm" - "thunar" - "libreoffice" - "xarchiver")) - -(define tools-packages - (specifications->packages - "aspell" - "aspell-dict-en" - "cmus" - "cpio" - "curl" - "ffmpeg" - "file" - "git" - "gnupg" - "htop" - "light" - "lsof" - "lm-sensors" - "markdown" - "neomutt" - "newsboat" - "openssh" - "rsync" - "tmux" - "weechat" - "unzip" - "vim" - "wget" - "youtube-dl" - "zip")) - -(define texlive-packages - (specifications->packages - "texlive" - "texlive-pgf")) - -(define font-packages - (specifications->packages - "font-dejavu" - "font-gnu-freefont" - "font-liberation" - "font-misc-misc" - "font-openmoji" - "font-termsyn" - "font-termsyn:psf" - "font-termsyn:otf" - "font-ghostscript" - "unicode-emoji")) - -(define theme-packages - (specifications->packages - "greybird-gtk-theme" - "delft-icon-theme" - "hackneyed-x11-cursors")) - -(define emacs-packages - (specifications->packages - "emacs" - "emacs-auctex" - "emacs-auto-dictionary-mode" - "emacs-chess" - "emacs-geiser" - "emacs-guix" - "emacs-magit" - "emacs-markdown-mode" - "emacs-paredit" - "emacs-yasnippet")) - -(define clisp-packages - (specifications->packages - "sbcl" - "cl-asdf")) - -(define python-packages - (specifications->packages - "python" - "python-dbus" - "python-distro")) - -(define games-packages - (specifications->packages - "0ad" - "supertuxkart" ;; :^) - "xonotic")) - -(define virtualization-packages - (specifications->packages - "qemu" - "virt-manager" - "virt-viewer" - "libvirt" - "libvirt-glib")) diff --git a/modules/eonn/guix/packages/suckless.scm b/modules/eonn/guix/packages/suckless.scm @@ -1,43 +0,0 @@ -(define-module (eonn guix packages suckless) - #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (gnu packages suckless)) - -(define-public dmenu-eonn - (package - (inherit dmenu) - (name "dmenu-eonn") - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.eonn.xyz/dmenu.git") - (commit "9417e1f00d2b0239d8794f8d53776e4c4049f516"))) - (sha256 - (base32 - "1dwzd3sfp53z2b681hcbi6jmj61znk6ah68y89lyzmaskb89hy1f")))))) - -(define-public dwm-eonn - (package - (inherit dwm) - (name "dwm-eonn") - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.eonn.xyz/dwm.git") - (commit "7d01bc86c11b3c410bfddeebd352f2894f9f61fc"))) - (sha256 - (base32 - "1yahw4jcfmkjh9g4gavbqcy310lmc88k619sy6b3ad277piip7s4")))))) - -(define-public st-eonn - (package - (inherit st) - (name "st-eonn") - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.eonn.xyz/st.git") - (commit "841c63017bcfeef1295e18a1fc7838db70692aaa"))) - (sha256 - (base32 - "1s22p2jh0h4cywicvqb5wnm64v69jq7c8chijfx41q7vq75rm7cn")))))) diff --git a/modules/eonn/guix/utils.scm b/modules/eonn/guix/utils.scm @@ -1,21 +0,0 @@ -(define-module (eonn guix utils) - #:use-module (ice-9 match) - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) - #:use-module (guix packages) - #:use-module (guix profiles) - #:use-module (gnu packages) - #:export (specifications->packages)) - -(define (spec->package spec) - "Like `specification->package' but better." - (let-values (((package output) - (specification->package+output spec))) - (match output - ("out" package) - (_ (list package output))))) - -(define-syntax-rule (specifications->packages spec ...) - "Return PACKAGES matching SPEC specifications. -This is a plural form of `specification->package'." - (map spec->package (list spec ...))) diff --git a/modules/shmage/guix/packages.scm b/modules/shmage/guix/packages.scm @@ -0,0 +1,174 @@ +(define-module (shmage guix packages) + #:use-module (shmage guix utils) + #:export (build-common-packages + system-packages + xorg-packages + xorg-misc-packages + desktop-packages + tools-packages + texlive-packages + font-packages + theme-packages + emacs-packages + clisp-packages + python-packages + games-packages + virtualization-packages)) + +(define build-common-packages + (specifications->packages + "autoconf" + "automake" + "gcc-toolchain" + "gdb" + "gettext" + "make" + "pkg-config")) + +(define system-packages + (specifications->packages + "acpi" + "acpid" + "nss-certs")) + +(define xorg-packages + (specifications->packages + "mesa" + "xorg-server" + "xf86-input-evdev" + "xf86-input-libinput" + "xf86-video-fbdev" + "xf86-video-vesa" + "xinit")) + +(define xorg-misc-packages + (specifications->packages + "fontconfig" + "setxkbmap" + "xrandr" + "xrdb" + "xset" + "xsetroot" + "xev" + "xinitrc-xsession" + "xinput" + "xlsfonts" + "xmodmap")) + +(define desktop-packages + (specifications->packages + "alacritty" + "dbus" + "dconf" + "dunst" + "evince" + "feh" + "flameshot" + "geeqie" + "gnome-keyring" + "icecat" + "keepassxc" + "mpv" + "mousepad" + "mumble" + "polkit-gnome" + "polybar" + "pulseaudio" + "pavucontrol" + "picom" + "pinentry" + "rofi" + "stumpwm" + "thunar" + "libreoffice" + "xarchiver")) + +(define tools-packages + (specifications->packages + "aspell" + "aspell-dict-en" + "cmus" + "cpio" + "curl" + "ffmpeg" + "file" + "git" + "gnupg" + "htop" + "light" + "lsof" + "lm-sensors" + "markdown" + "neomutt" + "newsboat" + "openssh" + "rsync" + "tmux" + "weechat" + "unzip" + "vim" + "wget" + "youtube-dl" + "zip")) + +(define texlive-packages + (specifications->packages + "texlive" + "texlive-pgf")) + +(define font-packages + (specifications->packages + "font-dejavu" + "font-gnu-freefont" + "font-liberation" + "font-misc-misc" + "font-openmoji" + "font-termsyn" + "font-termsyn:psf" + "font-termsyn:otf" + "font-ghostscript" + "unicode-emoji")) + +(define theme-packages + (specifications->packages + "greybird-gtk-theme" + "delft-icon-theme" + "hackneyed-x11-cursors")) + +(define emacs-packages + (specifications->packages + "emacs" + "emacs-auctex" + "emacs-auto-dictionary-mode" + "emacs-chess" + "emacs-geiser" + "emacs-guix" + "emacs-magit" + "emacs-markdown-mode" + "emacs-paredit" + "emacs-yasnippet")) + +(define clisp-packages + (specifications->packages + "sbcl" + "cl-asdf")) + +(define python-packages + (specifications->packages + "python" + "python-dbus" + "python-distro")) + +(define games-packages + (specifications->packages + "0ad" + "supertuxkart" ;; :^) + "xonotic")) + +(define virtualization-packages + (specifications->packages + "qemu" + "virt-manager" + "virt-viewer" + "libvirt" + "libvirt-glib")) diff --git a/modules/shmage/guix/packages/suckless.scm b/modules/shmage/guix/packages/suckless.scm @@ -0,0 +1,43 @@ +(define-module (shmage guix packages suckless) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (gnu packages suckless)) + +(define-public dmenu-eonn + (package + (inherit dmenu) + (name "dmenu-eonn") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.eonn.xyz/dmenu.git") + (commit "9417e1f00d2b0239d8794f8d53776e4c4049f516"))) + (sha256 + (base32 + "1dwzd3sfp53z2b681hcbi6jmj61znk6ah68y89lyzmaskb89hy1f")))))) + +(define-public dwm-eonn + (package + (inherit dwm) + (name "dwm-eonn") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.eonn.xyz/dwm.git") + (commit "7d01bc86c11b3c410bfddeebd352f2894f9f61fc"))) + (sha256 + (base32 + "1yahw4jcfmkjh9g4gavbqcy310lmc88k619sy6b3ad277piip7s4")))))) + +(define-public st-eonn + (package + (inherit st) + (name "st-eonn") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.eonn.xyz/st.git") + (commit "841c63017bcfeef1295e18a1fc7838db70692aaa"))) + (sha256 + (base32 + "1s22p2jh0h4cywicvqb5wnm64v69jq7c8chijfx41q7vq75rm7cn")))))) diff --git a/modules/shmage/guix/utils.scm b/modules/shmage/guix/utils.scm @@ -0,0 +1,21 @@ +(define-module (shmage guix utils) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (guix packages) + #:use-module (guix profiles) + #:use-module (gnu packages) + #:export (specifications->packages)) + +(define (spec->package spec) + "Like `specification->package' but better." + (let-values (((package output) + (specification->package+output spec))) + (match output + ("out" package) + (_ (list package output))))) + +(define-syntax-rule (specifications->packages spec ...) + "Return PACKAGES matching SPEC specifications. +This is a plural form of `specification->package'." + (map spec->package (list spec ...))) diff --git a/packages b/packages @@ -1 +1 @@ -modules/eonn/guix/packages/ -\ No newline at end of file +modules/shmage/guix/packages/ +\ No newline at end of file diff --git a/system/cocles.scm b/system/cocles.scm @@ -10,7 +10,7 @@ (gnu packages wm) (nongnu packages linux) (nongnu system linux-initrd) - (eonn guix packages) + (shmage guix packages) ;;For concatenate (srfi srfi-1)) diff --git a/system/orb.scm b/system/orb.scm @@ -8,7 +8,7 @@ (gnu services xorg) (gnu packages android) (gnu packages wm) - (eonn guix packages) + (shmage guix packages) ;;For concatenate (srfi srfi-1))