update sway and waybar configuration, hanve around guix packages

2 files changed, 49 insertions, 12 deletions

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)))