From abd25d60335bb6c2cb26959dcc4f4725868bdec0 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Tue, 3 Oct 2023 10:36:12 -0400 Subject: [PATCH] changed pass to guix version --- home-config/home-configuration.scm | 1 + home-config/nix-home-manager/home.nix | 3 +- modules/ryan-packages/web-server.scm | 63 +++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 modules/ryan-packages/web-server.scm diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index 9a67cf5..d590e4d 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -94,6 +94,7 @@ "tcpdump" "pamixer" "git" + "password-store" "node" "git-lfs")) (list my-neovim wl-mirror firefox-wayland-new))) diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 8a37125..292f8ba 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -28,8 +28,7 @@ # # "Hello, world!" when run. # pkgs.hello yt-dlp - xdg-desktop-portal-hyprland - pass + #pass rustup gcc pkg-config diff --git a/modules/ryan-packages/web-server.scm b/modules/ryan-packages/web-server.scm new file mode 100644 index 0000000..eb1c539 --- /dev/null +++ b/modules/ryan-packages/web-server.scm @@ -0,0 +1,63 @@ +(define-module (ryan-packages web-server) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (gnu packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system go) + #:use-module (guix git-download) + #:use-module (gnu packages golang) + #:use-module (guix utils)) + +(define-public go-github-com-caddy-certmagic + (package + (name "certmagic") + (version "0.19.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/caddyserver/certmagic") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0jgbkj0azkbs828vsd3gycpab8pycgf55vrxkvnfmwfjpdiq1551")))) + (build-system go-build-system) + (arguments + (list #:tests? #f + #:go go-1.20 + #:import-path "github.com/caddyserver/certmagic")) + (home-page "https://github.com/caddyserver/certmagic") + (synopsis "Certbot ACME") + (description "Automagic certificate management in Caddy") + (license license:expat))) + +(define-public caddy + (package + (name "Caddy") + (version "2.7.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/caddyserver/caddy") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0jgbkj0azkbs828vsd3gycpab8pycgf55vrxkvnfmwfjpdiq1551")))) + (build-system go-build-system) + (native-inputs (list go-github-com-google-uuid + go-go-uber-org-zap + go-github-com-caddy-certmagic + go-github-com-prometheus-client-golang + go-golang-org-x-term + go-golang-org-x-sys)) + (arguments + (list #:tests? #f + #:go go-1.20 + ;#:unpack-path "github.com/caddyserver/caddy" + #:import-path "github.com/caddyserver/caddy")) + (home-page "https://github.com/caddyserver/caddy") + (synopsis "Web server") + (description "This package serves the web") + (license license:expat))) + +caddy