Move my packages to separate files, package newest radare2

5 files changed, 138 insertions, 33 deletions

diff --git a/.config/guix/modules/packages/bdwm.scm b/.config/guix/modules/packages/bdwm.scm
new file mode 100644
index 0000000..e82355e
--- /dev/null
+++ b/.config/guix/modules/packages/bdwm.scm
@@ -0,0 +1,20 @@
+(define-module (packages bdwm)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages suckless)
+  #:use-module (guix packages)
+  #:use-module (guix gexp)
+  #:export (bdwm))
+
+;;; Commentary:
+;;; my custom build of dwm
+;;; this package is no longer in use
+;;; Code:
+
+(define bdwm
+  (package
+    (inherit dwm)
+    (name "bdwm")
+    (inputs (modify-inputs (package-inputs dwm)))
+    (source (local-file "dwm" #:recursive? #t))))
+
+;;; bdwm.scm ends here
diff --git a/.config/guix/modules/packages/emacs-anki.scm b/.config/guix/modules/packages/emacs-anki.scm
new file mode 100644
index 0000000..db50b53
--- /dev/null
+++ b/.config/guix/modules/packages/emacs-anki.scm
@@ -0,0 +1,35 @@
+(define-module (packages emacs-anki)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages emacs-xyz)
+  #:use-module (guix packages)
+  #:use-module (guix gexp)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix git-download)
+  #:export (emacs-anki-editor-next))
+
+;;; Commentary:
+;;; provides the updated emacs-anki-editor
+;;; Code:
+
+(define emacs-anki-editor-next
+  (let ((url "https://github.com/anki-editor/anki-editor")
+        (commit "65b64b3c492aabae1289fff63120187b535a30ab")
+        (version "0.3.3")
+        (revision "0"))
+    (package
+      (inherit emacs-anki-editor)
+      (name "emacs-anki-editor-next")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url url)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1fgccmk1p91za13mahiz1fh6bb1b1shxhpm9zyrjmg7x73ihhjcn"))))
+      (home-page url))))
+
+;;; emacs-anki.scm ends here
diff --git a/.config/guix/modules/packages/packages.scm b/.config/guix/modules/packages/packages.scm
index ddb9ab1..f14ec0d 100644
--- a/.config/guix/modules/packages/packages.scm
+++ b/.config/guix/modules/packages/packages.scm
@@ -3,6 +3,8 @@
   #:use-module (gnu system)
   #:use-module (guix gexp)
   #:use-module (guix packages)
+  #:use-module (packages radare2-next)
+  #:use-module (packages bdwm)
   #:export (bd-packages-system
             bd-packages-laptop
             bd-packages-desktop
@@ -18,6 +20,7 @@
 (use-package-modules
  admin ;; netcat
  algebra ;; bc
+ base ;; make
  commencement ;; gcc-toolchain
  compression ;; unzip, zip
  compton ;; picom
@@ -26,7 +29,6 @@
  databases ;; recutils
  education ;; anki
  emulators ;; mupen64plus*, bsnes, mgba
- engineering ;; radare2
  fonts ;; font-terminus, font-awesome
  fontutils ;; fontconfig
  games ;; nethack
@@ -46,13 +48,13 @@
  man ;; man-pages
  package-management ;; stow
  password-utils ;; pass-otp, password-store
+ pkg-config ;; pkg-config
  pdf ;; xpdf, pdfgrep, zathura, zathura-pdf-mupdf
  pulseaudio ;; pavucontrol, pulseaudio,
  python ;; python
  rsync ;; rsync
  rust-apps ;; ripgrep
  screen ;; screen
- suckless ;; dwm
  texlive ;; texlive
  tex ;; texlive-dvipng
  tor-browsers ;; tor-browser
@@ -66,12 +68,6 @@
  xorg ;; xf86-input-libinput, xf86-video-fbdev, xinit...
  )
 
-(define bd-dwm
-  (package
-    (inherit dwm)
-    (name "bdunahu-dwm")
-    (inputs (modify-inputs (package-inputs dwm)))
-    (source (local-file "dwm" #:recursive? #t))))
 
 (define bd-packages-system
   (append!
@@ -135,7 +131,7 @@
 
 (define bd-packages-dwm
   (list
-   bd-dwm
+   bdwm
    xdotool
    xprop
    ))
@@ -165,11 +161,13 @@
    bc
    gcc-toolchain
    gdb
+   gnu-make
    jq
    netcat
    offlineimap3
+   pkg-config
    python
-   radare2
+   radare2-next
    rsync
    stow
    ))
diff --git a/.config/guix/modules/packages/radare2-next.scm b/.config/guix/modules/packages/radare2-next.scm
new file mode 100644
index 0000000..13f3c77
--- /dev/null
+++ b/.config/guix/modules/packages/radare2-next.scm
@@ -0,0 +1,72 @@
+(define-module (packages radare2-next)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages engineering)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages libevent)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages digest)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages compression)
+  #:use-module (guix packages)
+  #:use-module (guix gexp)
+  #:use-module (guix build-system meson)
+  #:use-module (guix git-download)
+  #:export (radare2-next))
+
+;;; Commentary:
+;;; provides an up-to-date radare2 package
+;;; Code:
+
+(define radare2-next
+  (package
+    (name "radare2-next")
+    (version "5.9.8")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/radareorg/radare2")
+                    (commit version)))
+              (sha256
+               (base32
+                "1l1vblj3n7gdw688xlibz0d7f0yhp45xbpzqa33magl44p9yyaax"))
+              (file-name (git-file-name name version))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "-Duse_sys_capstone=true"
+              "-Duse_sys_magic=true"
+              "-Duse_sys_xxhash=true"
+              "-Duse_sys_zlib=true"
+              "-Duse_sys_lz4=true"
+              "-Duse_sys_openssl=true"
+              "-Denable_tests=false"
+              )))
+    (native-inputs
+     (list python pkg-config))
+    (inputs
+     (list capstone
+           libuv
+           xxhash
+           openssl
+           zlib
+           lz4))
+    (home-page "https://radare.org/")
+    (synopsis "Reverse engineering framework")
+    (description
+     "Radare2 is a complete framework for reverse-engineering, debugging, and
+analyzing binaries.  It is composed of a set of small utilities that can be
+used together or independently from the command line.
+
+Radare2 is built around a scriptable disassembler and hexadecimal editor that
+support a variety of executable formats for different processors and operating
+systems, through multiple back ends for local and remote files and disk
+images.
+
+It can also compare (@dfn{diff}) binaries with graphs and extract information
+like relocation symbols.  It is able to deal with malformed binaries, making
+it suitable for security research and analysis.")
+    (license license:lgpl3)))
+
+;;; radare2-next.scm ends here
diff --git a/.config/guix/modules/services/emacs.scm b/.config/guix/modules/services/emacs.scm
index f371efe..7514168 100644
--- a/.config/guix/modules/services/emacs.scm
+++ b/.config/guix/modules/services/emacs.scm
@@ -6,9 +6,7 @@
   #:use-module (gnu system)
   #:use-module (guix gexp)
   #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix git-download)
+  #:use-module (packages emacs-anki)
   #:export (bd-home-emacs-service-type))
 
 ;;; Commentary:
@@ -24,26 +22,6 @@
  matrix
  lisp)
 
-(define emacs-anki-editor-next
-  (let ((url "https://github.com/anki-editor/anki-editor")
-        (commit "65b64b3c492aabae1289fff63120187b535a30ab")
-        (version "0.3.3")
-        (revision "0"))
-    (package
-      (inherit emacs-anki-editor)
-      (name "emacs-anki-editor-next")
-      (version (git-version version revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url url)
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1fgccmk1p91za13mahiz1fh6bb1b1shxhpm9zyrjmg7x73ihhjcn"))))
-      (home-page url))))
-
 (define (bd-emacs-package-list config)
   (list
    emacs-next
@@ -76,3 +54,5 @@ emacs packages.")
                         home-profile-service-type
                         bd-emacs-package-list)))
                 (default-value #f)))
+
+;;; emacs.scm ends here