emacs-xyz: fix build inputs

.guix-channel

@@ -1,3 +0,0 @@
-(channel
-  (version 0)
-  (url "git.fixergrid.net/adam/adam-guix.git"))

adam/packages/emacs-xyz.scm

@@ -1,7 +1,9 @@
 (define-module (adam packages emacs-xyz)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system emacs)
+  #:use-module (gnu packages emacs-xyz)
   #:use-module ((guix licenses) #:prefix license:))
 
 
@@ -13,8 +15,10 @@
             (method url-fetch)
             (uri (string-append "https://stable.melpa.org/packages/rufo-"
 				version ".tar"))
+	    ;; I had to change the hash previously because it changed on melpa
+	    ;; I wonder if it change when melpa upgrades packages
             (sha256 (base32
-                     "0z46yllbf6h08i042718p4cbd2d96crlqw7pihvq8b1iymb709f4"))))
+                     "1jgdv0r1zhqf74ca0vrax16yhv4n27pk8kbs6nq1h5axx96i2dnb"))))
    (build-system emacs-build-system)
    (home-page "https://github.com/danielma/rufo.el")
    (synopsis "use rufo to automatically format ruby files")
@@ -25,4 +29,39 @@ saved.  To use it, require it, make sure `rufo is in your path and add it to
 your favorite ruby mode: (add-hook ruby-mode-hook #'rufo-minor-mode)")
    (license license:gpl3+)))
 
+(define-public emacs-caddyfile-mode
+  (package
+   (name "emacs-caddyfile-mode")
+   (version "0.2.0-fc41148f5a7eb320f070666f046fb9d88cf17680")
+   (source (origin
+	    (method git-fetch)
+	    (uri (git-reference
+		  (url "https://github.com/Schnouki/caddyfile-mode")
+		  (commit "fc41148f5a7eb320f070666f046fb9d88cf17680")))
+	    (sha256
+	     (base32 "1s9kbav5wbyividn9zncd153h89nil0i9aj9hgxa95q9fy84r23w"))))
+   (build-system emacs-build-system)
+   (propagated-inputs (list
+	    emacs-loop))
+   (home-page "https://github.com/Schnouki/caddyfile-mode")
+   (synopsis "Syntax highlighting for Caddyfile")
+   (description "This package provides syntax highlighting for Caddyfiles")
+   (license #f)))
 
+(define-public emacs-rego-mode
+  (package
+   (name "emacs-rego-mode")
+   (version "0.0.0-be110e6c")
+   (source (origin
+	    (method git-fetch)
+	    (uri (git-reference
+		  (url "https://github.com/adammohammed/rego-mode")
+		  (commit "be110e6cef5d34eef0529a8739c68e619cf15310")))
+	    (sha256
+	     (base32 "1lm53zg30n96bq8z5g836dhk0y02njdyp8c6vjgsrcii4ff42jp5"))))
+   (build-system emacs-build-system)
+   (inputs (list emacs-reformatter))
+   (home-page "https://github.com/adammohammed/rego-mode")
+   (synopsis "Emacs major mode for OPA's rego language")
+   (description "")
+   (license license:gpl3+)))

adam/packages/guile-contrib.scm

@@ -0,0 +1,30 @@
+(define-module (adam packages guile-contrib)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages guile)
+  #:use-module (guix packages)
+  #:use-module (guix gexp)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system guile))
+
+(define-public guile-equinix-metal
+  (package
+   (name "guile-equinix-metal")
+   (version "0.0.5")
+   (source (origin
+	    (method url-fetch)
+	    (uri (string-append "https://git.fixegrid.net/adam/equinix-scm/archive/v"
+				version ".tar.gz"))
+	    (sha256
+	     (base32
+	      "0fmbily7grv4jyfbs5lswxp94nxbpd8k1zfhhnk4m6ybprzi3ly8"))))
+   (build-system guile-build-system)
+   (arguments
+    (list #:source-directory "src"))
+   (native-inputs (list pkg-config guile-3.0))
+   (inputs (list guile-3.0 guile-json-4))
+   (synopsis "Equinix Metal SDK")
+   (home-page "https://git.fixergrid.net/adam/equinix-scm")
+   (description "Equinix-scm supports token exchange and talking to Metal API")
+   (license #f)))

adam/packages/kubernetes.scm

@@ -2,6 +2,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system copy)
+  #:use-module (gnu packages compression)
   #:use-module ((guix licenses) #:prefix license:))
 
 (define-public kubectl
@@ -15,13 +16,74 @@
      (sha256 (base32 "1qx7gb6gavc4nj98przr7vaa5hafp4zgblsdccvgs68ic7h1ydf8"))))
    (build-system copy-build-system)
    (arguments
-    `(#:phases (modify-phases %standard-phases)
+    `(#:phases (modify-phases %standard-phases
-	       (add-after 'unpack 'chmod
+			      (add-after 'unpack 'chmod
-			  (lambda* (#:key #:allow-other-keys)
+					 (lambda* (#:key #:allow-other-keys)
-				   (cmod "kubectl" #o755)))
+						  (chmod "kubectl" #o755))))
 	       #:substitutable? #f
 	       #:install-plan '(("kubectl" "/bin/"))))
    (synopsis "kubectl binary")
    (description "kubectl binary")
    (home-page "https://github.com/kubernetes/kubernetes")
    (license license:asl2.0)))
+
+;; https://github.com/ahmetb/kubectx/releases/download/v0.9.5/kubectx_v0.9.5_linux_x86_64.tar.gz
+(define-public kubectx
+  (package
+   (name "kubectx")
+   (version "0.9.5")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append
+	   "https://github.com/ahmetb/kubectx/releases/download/v" version
+	   "/kubectx_v" version "_linux_x86_64.tar.gz"))
+     (sha256 (base32 "0j06sq6lx0nk6sckrxm308gm2wkiklvp708fvnmqk7z74gypy952"))))
+   (build-system copy-build-system)
+   (arguments
+    `(#:substitutable? #f
+      #:install-plan '(("kubectx" "/bin/ktx"))))
+   (synopsis "kube context switcher")
+   (description "kube context switcher")
+   (home-page "https://github.com/ahmetb/kubectx")
+   (license license:asl2.0)))
+
+(define-public kubens
+  (package
+   (name "kubens")
+   (version "0.9.5")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append
+	   "https://github.com/ahmetb/kubectx/releases/download/v" version
+	   "/kubens_v" version "_linux_x86_64.tar.gz"))
+     (sha256 (base32 "1ficf219wqlnp554373b8cc5scx7hkkx0pfjzbjzn8mpyv3skhdc"))))
+   (build-system copy-build-system)
+   (arguments
+    `(#:substitutable? #f
+      #:install-plan '(("kubens" "/bin/kns"))))
+   (synopsis "kube context namespace switcher")
+   (description "kube context namespace switcher")
+   (home-page "https://github.com/ahmetb/kubectx")
+   (license license:asl2.0)))
+
+;; https://github.com/int128/kubelogin/releases/download/v1.28.0/kubelogin_linux_amd64.zip
+(define-public kube-oidc-login
+  (package
+   (name "kube-oidc-login")
+   (version "1.28.0")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append "https://github.com/int128/kubelogin/releases/download/v" version "/kubelogin_linux_amd64.zip"))
+     (sha256 (base32 "17p8apx47s23gv0nvpjn5b8blb13wk3h1dpd8qmy63n7zi422a43"))))
+   (build-system copy-build-system)
+   (inputs (list unzip))
+   (arguments
+    `(#:substitutable? #f
+		       #:install-plan '(("kubelogin" "/bin/kubectl-oidc_login"))))
+   (synopsis "kubenetes oidc login plugin")
+   (description "kubenetes oidc login plugin")
+   (home-page "https://github.com/int128/kubelogin")
+   (license license:asl2.0)))

adam/packages/markups.scm

@@ -0,0 +1,51 @@
+(define-module (adam packages markups)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system copy)
+  #:use-module ((guix licenses) #:prefix license:))
+
+;;https://github.com/mikefarah/yq/releases/download/v4.40.7/yq_linux_amd64
+(define-public yq
+  (package
+   (name "yq")
+   (version "4.40.7")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append "https://github.com/mikefarah/yq/releases/download/v" version "/yq_linux_amd64"))
+     (sha256 (base32 "1va8ky7ipsnp226amyldmqhcjz7009scing7c67px7x40f9yw4sg"))))
+   (build-system copy-build-system)
+   (arguments
+    `(#:phases (modify-phases %standard-phases
+			      (add-after 'unpack 'chmod
+					 (lambda* (#:key #:allow-other-keys)
+						  (chmod "yq_linux_amd64" #o755))))
+	       #:substitutable? #f
+	       #:install-plan '(("yq_linux_amd64" "/bin/yq"))))
+   (synopsis "Yaml parser")
+   (description "Yaml parser")
+   (home-page "https://github.com/mikefarah/yq")
+   (license license:expat)))
+
+;; https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64
+(define-public jq
+  (package
+   (name "jq")
+   (version "1.7.1")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append "https://github.com/jqlang/jq/releases/download/jq-" version "/jq-linux-amd64"))
+     (sha256 (base32 "1xcgkk8q32y5sy9km4wkvy82bzmky5rh5qxk3vk0wlafjfqcjhjr"))))
+   (build-system copy-build-system)
+   (arguments
+    `(#:phases (modify-phases %standard-phases
+			      (add-after 'unpack 'chmod
+					 (lambda* (#:key #:allow-other-keys)
+						  (chmod "jq-linux-amd64" #o755))))
+	       #:substitutable? #f
+	       #:install-plan '(("jq-linux-amd64" "/bin/jq"))))
+   (synopsis "JSON parser")
+   (description "JSON parser")
+   (home-page "https://github.com/jqlang/jq")
+   (license license:expat)))