diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/home-config/base-system.scm | 23 | ||||
| -rw-r--r-- | modules/home-packages/gcc.scm | 12 | ||||
| -rw-r--r-- | modules/home-packages/web.scm | 49 |
3 files changed, 64 insertions, 20 deletions
diff --git a/modules/home-config/base-system.scm b/modules/home-config/base-system.scm index 6900561..67fb4ef 100644 --- a/modules/home-config/base-system.scm +++ b/modules/home-config/base-system.scm @@ -6,12 +6,15 @@ #:use-module (gnu packages avahi) #:use-module (gnu packages shells) #:use-module (gnu packages tls) - #:use-module (gnu packages gcc) + #:use-module (gnu packages vpn) #:use-module (gnu packages 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) + #:use-module (gnu services linux) + #:use-module (gnu services authentication) #:use-module (gnu services security-token) #:use-module (gnu services cups) #:use-module (gnu services desktop) @@ -23,7 +26,6 @@ #:use-module (gnu services docker) #:use-module (gnu services avahi) #:use-module (gnu services spice) - #:use-module (gnu services authentication) #:use-module (gnu services virtualization) #:use-module (home-packages wm) #:use-module (home-packages virtualization)) @@ -50,7 +52,7 @@ (locale "en_US.utf8") (timezone "America/New_York") (keyboard-layout (keyboard-layout "us")) - (host-name "ThisWillChange") + (host-name "ThisWillChange") ;; The list of user accounts ('root' is implicit). (users (cons* (user-account @@ -88,6 +90,7 @@ "bluez" "blueman" "opendoas" + "wireguard-tools" "xdg-desktop-portal" "xdg-desktop-portal-wlr" "v4l2loopback-linux-module" @@ -111,6 +114,12 @@ "vulkan-headers" "spirv-tools" "spirv-headers" + "sdl2" + "openal" + "freealut" + "wxwidgets" + "libpcap" + "v4l2loopback-linux-module" "neovim")) (list swaylock-effects-new virt-manager-new) %my-base-packages)) @@ -124,6 +133,9 @@ (service openssh-service-type) (service pcscd-service-type) (service spice-vdagent-service-type) + (simple-service 'wireguard-module + kernel-module-loader-service-type + '("wireguard")) (service cups-service-type (cups-configuration (web-interface? #t))) @@ -143,11 +155,6 @@ (service bluetooth-service-type) (service pam-limits-service-type) (service fprintd-service-type) - ;; (service special-files-service-type - ;; `(("/lib64" ,(directory-union "rustup-libs" - ;; (list - ;; (file-append glibc "/lib") - ;; (file-append gcc "/lib")))))) (udev-rules-service 'fido2 libfido2 #:groups '("plugdev"))) ;; This is the default list of services we diff --git a/modules/home-packages/gcc.scm b/modules/home-packages/gcc.scm deleted file mode 100644 index 5d6a208..0000000 --- a/modules/home-packages/gcc.scm +++ /dev/null @@ -1,12 +0,0 @@ -(define-module (home-packages gcc) - #:use-module (gnu) - #:use-module (guix packages) - #:use-module (gnu packages gcc)) - -(define-public gcc-new - (package - (inherit gcc) - (name "gcc-new") - (outputs (package-outputs gcc)))) - - diff --git a/modules/home-packages/web.scm b/modules/home-packages/web.scm new file mode 100644 index 0000000..c9d236e --- /dev/null +++ b/modules/home-packages/web.scm @@ -0,0 +1,49 @@ +(define-module (home-packages web) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) + #:use-module (gnu packages base) + #:use-module (gnu packages version-control) + #:use-module (gnu packages golang) + #:use-module (gnu packages) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix download) + #:use-module (guix build-system go) + #:use-module (guix build-system trivial) + #:use-module (guix utils)) + +(define-public caddy + (package + (name "caddy") + (version "2.7.4") + ;; (source (origin + ;; (method url-fetch) + ;; (uri (string-append "https://github.com/caddyserver/caddy/archive/refs/tags/v" version + ;; ".tar.gz")) + ;; (sha256 + ;; (base32 + ;; "0ccwwas8kagvg0hb0qbr2yvhrf8aiyg66cn95japbqpvv70qgxlp")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/caddyserver/caddy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jgbkj0azkbs828vsd3gycpab8pycgf55vrxkvnfmwfjpdiq1551")))) +; (native-inputs `(("git" ,git) +; ("sed" ,sed))) + ;; (build-system trivial-build-system) + (build-system go-build-system) + (arguments (list + #:import-path "cmd" + ;; #:unpack-path "github.com/caddyserver/caddy/cmd/caddy" + #:install-source? #f + #:tests? #f)) + (synopsis "A powerful, enterprise-ready, open source web server with automatic HTTPS written in Go ") + (description "Caddy simplifies your infrastructure. It takes care of TLS certificate renewals, OCSP stapling, static file serving, reverse proxying, Kubernetes ingress, and more. + Its modular architecture means you can do more with a single, static binary that compiles for any platform. + Caddy runs great in containers because it has no dependencies—not even libc. Run Caddy practically anywhere.") + (home-page "https://caddyserver.com/") + (license license:asl2.0))) |