diff options
Diffstat (limited to '.config/guix')
| -rw-r--r-- | .config/guix/channels.scm | 9 | ||||
| -rw-r--r-- | .config/guix/modules/packages/bdwm.scm | 20 | ||||
| -rw-r--r-- | .config/guix/modules/packages/emacs-anki.scm | 35 | ||||
| -rw-r--r-- | .config/guix/modules/packages/emacs-denote-journal.scm | 41 | ||||
| -rw-r--r-- | .config/guix/modules/packages/offlineimap-patched.scm | 80 | ||||
| -rw-r--r-- | .config/guix/modules/packages/packages.scm | 58 | ||||
| -rw-r--r-- | .config/guix/modules/packages/radare2-next.scm | 72 | ||||
| -rw-r--r-- | .config/guix/modules/services/base.scm | 33 | ||||
| -rw-r--r-- | .config/guix/modules/services/emacs.scm | 22 | ||||
| -rw-r--r-- | .config/guix/modules/services/xorg.scm | 6 | ||||
| -rw-r--r-- | .config/guix/modules/ymir.scm | 2 |
11 files changed, 87 insertions, 291 deletions
diff --git a/.config/guix/channels.scm b/.config/guix/channels.scm new file mode 100644 index 0000000..f0ed659 --- /dev/null +++ b/.config/guix/channels.scm @@ -0,0 +1,9 @@ +(append (list (channel + (name 'tanelorn) + (url "https://git.operationnull.com/tanelorn.git") + (introduction + (make-channel-introduction + "feb72dbc897bcf2db3901ea5b25caba4add860f7" + (openpgp-fingerprint + "5550 5CA6 9DE5 D342 7F31 F9AE 5F86 6C65 2A34 C996"))))) + %default-channels) diff --git a/.config/guix/modules/packages/bdwm.scm b/.config/guix/modules/packages/bdwm.scm deleted file mode 100644 index e82355e..0000000 --- a/.config/guix/modules/packages/bdwm.scm +++ /dev/null @@ -1,20 +0,0 @@ -(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 deleted file mode 100644 index db50b53..0000000 --- a/.config/guix/modules/packages/emacs-anki.scm +++ /dev/null @@ -1,35 +0,0 @@ -(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/emacs-denote-journal.scm b/.config/guix/modules/packages/emacs-denote-journal.scm deleted file mode 100644 index ac8e075..0000000 --- a/.config/guix/modules/packages/emacs-denote-journal.scm +++ /dev/null @@ -1,41 +0,0 @@ -(define-module (packages emacs-denote-journal) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages) - #:use-module (guix packages) - #:use-module (gnu packages emacs-xyz) - #:use-module (guix gexp) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system emacs) - #:use-module (guix git-download) - #:export (emacs-denote-journal)) - -;;; Commentary: -;;; provides the denote-journal package -;;; Code: - -(define emacs-denote-journal - (let ((url "https://github.com/protesilaos/denote-journal") - (version "0.1.1")) - (package - (name "emacs-denote-journal") - (version version) - (source - (origin - (method git-fetch) - (uri (git-reference - (url url) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ir3q60sazf1jz48l6dwqmzw15wp5wzlfa1gwknnf8cnci42f9f4")))) - (build-system emacs-build-system) - (propagated-inputs (list emacs-denote)) - (home-page "https://protesilaos.com/emacs/denote-journal") - (synopsis "Extension for Denote to do journaling.") - (description - "The denote-journal package makes it easier to use Denote for -journaling. While it is possible to use the generic denote command -(and related) to maintain a journal, this package defines extra -functionality to streamline the journaling workflow.") - (license license:gpl3+)))) diff --git a/.config/guix/modules/packages/offlineimap-patched.scm b/.config/guix/modules/packages/offlineimap-patched.scm deleted file mode 100644 index df00bfd..0000000 --- a/.config/guix/modules/packages/offlineimap-patched.scm +++ /dev/null @@ -1,80 +0,0 @@ -(define-module (packages offlineimap-patched) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages) - #:use-module (gnu packages python) - #:use-module (gnu packages python-build) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages python-web) - #:use-module (gnu packages documentation) - #:use-module (gnu packages mail) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix gexp) - #:use-module (guix build-system python) - #:use-module (guix git-download) - #:export (offlineimap3-patched)) - -;;; Commentary: -;;; provides a fixed offlineimap package -;;; https://issues.guix.gnu.org/77952 -;;; Code: - -(define python-urllib3-1.25 - (package - (inherit python-urllib3) - (version "1.25.19") - (source - (origin - (method url-fetch) - (uri (pypi-uri "urllib3" version)) - (sha256 - (base32 - "09rmjqm5syhhc8fx3v06h3yv6cqy0b1081jg8wm5grpwpr72j61h")))) - (native-inputs - (list python-setuptools - python-wheel)))) - -(define offlineimap3-patched - (let ((commit "db347452273bb0f1b1a8ea952f6fb46cf95fedbf") - (revision "0")) - (package - (name "offlineimap3") - (version (git-version "8.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OfflineIMAP/offlineimap3") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0af6qxnjihpk29ns5i8545yj5spa0a0w85vrikaja768xc56wkrg")))) - (build-system python-build-system) - (native-inputs - (list asciidoc python-wheel)) - (inputs - (list python-distro python-imaplib2 python-rfc6555 python-urllib3-1.25)) - (arguments - `(;; Tests require a modifiable IMAP account. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'build 'build-documentation - (lambda _ - (substitute* "docs/Makefile" - ;; Prevent xmllint and xsltproc from downloading a DTD file. - (("a2x -v") "a2x --no-xmllint --xsltproc-opts=--nonet -v")) - (invoke "make" "-C" "docs" "man"))) - (add-after 'install 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man"))) - (install-file "docs/offlineimap.1" (string-append man "/man1")) - (install-file "docs/offlineimapui.7" (string-append man "/man7")))))))) - (home-page "https://www.offlineimap.org") - (synopsis "Sync emails between two repositories") - (description - "OfflineImap synchronizes emails between two repositories, so that you -can read the same mailbox from multiple computers. It supports IMAP as REMOTE -repository and Maildir/IMAP as LOCAL repository.") - (license license:gpl2+)))) diff --git a/.config/guix/modules/packages/packages.scm b/.config/guix/modules/packages/packages.scm index 589f690..a3ebd3e 100644 --- a/.config/guix/modules/packages/packages.scm +++ b/.config/guix/modules/packages/packages.scm @@ -3,14 +3,13 @@ #:use-module (gnu system) #:use-module (guix gexp) #:use-module (guix packages) - #:use-module (packages radare2-next) - #:use-module (packages offlineimap-patched) - #:use-module (packages bdwm) + #:use-module (tanelorn packages fonts) + #:use-module (tanelorn packages wm) + #:use-module (tanelorn packages engineering) #:export (bd-packages-system bd-packages-laptop bd-packages-desktop - bd-packages-dwm - bd-packages-fun + bd-packages-fun bd-packages-extra bd-packages-development )) @@ -23,15 +22,20 @@ algebra ;; bc assembly ;; nasm base ;; make + chromium ;; ungoogled-chromium + clojure ;; clojure commencement ;; gcc-toolchain compression ;; unzip, zip compton ;; picom cryptsetup ;; cryptsetup curl ;; curl databases ;; recutils + education ;; anki emulators ;; mupen64plus*, bsnes, mgba - fonts ;; font-terminus, font-awesome + engineering ;; rizin, cutter + fonts ;; font-terminus, font-openmoji fontutils ;; fontconfig + freedesktop ;; xdg-utils games ;; nethack gdb ;; gdb gimp ;; gimp-next @@ -44,8 +48,9 @@ image-viewers ;; feh, nsxiv libreoffice ;; libreoffice librewolf ;; librewolf - linux ;; sysstat, tlp + linux ;; sysstat, tlp, alsa-plugins lisp ;; sbcl + mail ;; offlineimap man ;; man-pages networking ;; maccchanger package-management ;; stow @@ -57,8 +62,9 @@ rsync ;; rsync rust-apps ;; ripgrep screen ;; screen - texlive ;; texlive + texlive ;; texlive, texlive-biber tex ;; texlive-dvipng + tor-browsers ;; torbrowser version-control ;; git video ;; ffmpeg, mpv, yt-dlp vim ;; vim @@ -68,6 +74,7 @@ xorg ;; xf86-input-libinput, xf86-video-fbdev, xinit... ) + (define bd-packages-system (append! @@ -93,10 +100,16 @@ (define bd-packages-desktop (list + alsa-plugins + eww/x11 feh ffmpeg flameshot fontconfig + font-iosevka + font-medieval-sharp + font-openmoji + font-runa-mono font-terminus gnupg graphviz @@ -111,7 +124,11 @@ pulseaudio setxkbmap texlive + texlive-biber texlive-dvipng + texlive-pgfgantt + torbrowser + xdg-utils xf86-input-libinput xf86-video-fbdev xinit @@ -127,22 +144,13 @@ zathura-pdf-mupdf )) -(define bd-packages-dwm - (list - bdwm - xdotool - xprop - )) - (define bd-packages-fun (list - angband bsnes dolphin-emu mgba - mupen64plus-audio-sdl - mupen64plus-rsp-hle mupen64plus-ui-console + mupen64plus-video-glide64mk2 nethack )) @@ -152,24 +160,28 @@ librewolf pdfgrep qemu - xpdf; pdftotext + ungoogled-chromium + xpdf ; pdftotext )) (define bd-packages-development (list - cl-asdf - pandoc + anki bc + cl-asdf + clojure + clojure-tools gcc-toolchain gdb gnu-make jq nasm netcat - offlineimap3-patched + offlineimap3 + pandoc pkg-config python - radare2-next + radare2-6.0.7 rsync sbcl stow diff --git a/.config/guix/modules/packages/radare2-next.scm b/.config/guix/modules/packages/radare2-next.scm deleted file mode 100644 index 13f3c77..0000000 --- a/.config/guix/modules/packages/radare2-next.scm +++ /dev/null @@ -1,72 +0,0 @@ -(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/base.scm b/.config/guix/modules/services/base.scm index 98c27ca..f990846 100644 --- a/.config/guix/modules/services/base.scm +++ b/.config/guix/modules/services/base.scm @@ -94,7 +94,8 @@ (service home-bash-service-type (home-bash-configuration - (aliases '(("auth" . "echo -e \"$PWD\n\" >> $HOME/.config/guix/shell-authorized-directories") + (aliases '(("aardwolf" . "telnet aardmud.org 23") + ("auth" . "echo -e \"$PWD\n\" >> $HOME/.config/guix/shell-authorized-directories") ("cp" . "cp -i") ("grep" . "grep --color=auto") ("guix-rcfg" . "sudo guix system -L ${HOME}/.config/guix/modules/ reconfigure ${HOME}/.config/guix/${HOSTNAME}.scm") @@ -102,16 +103,15 @@ ("ls" . "ls -p --color=auto") ("mkd" . "mkdir -pv") ("mv" . "mv -i") + ("rig-shell" . "screen /dev/ttyUSB0 115200") ("rm" . "rm -i") ("suspend" . "sudo loginctl suspend") - ("rig-shell" . "sudo screen /dev/ttyUSB0 115200") ("vi" . "vim") ("xeb" . "emacsclient -nce '(switch-to-buffer nil)'") ("xet" . "emacsclient -nce '(shell)'") ("ytta" . "yt-dlp --extract-audio --format bestaudio/best") ("yttv" . "yt-dlp -f b"))) - (bashrc (list (plain-file "bashrc" " # converts above aliases into eshell aliases automatically alias | sed -E \"s/^alias ([^=]+)='(.*)'$/alias \\1 \\2 \\$*/g; s/'\\\\\\''/'/g;\" >~/.config/emacs/eshell/alias @@ -126,14 +126,10 @@ alias | sed -E \"s/^alias ([^=]+)='(.*)'$/alias \\1 \\2 \\$*/g; s/'\\\\\\''/'/g; ("NETHACKOPTIONS" . "@$XDG_CONFIG_HOME/nethack/config") ("PATH" . "$HOME/.local/bin:$PATH") + ("PYTHONPATH" . "$HOME/pt/cs598/nemesis/:$PYTHONPATH") ("ZATHURA_PLUGINS_PATH" . "$HOME/.guix-home/profile/lib/zathura") )))) - (simple-service 'gdbrc - home-files-service-type - `((".radare2rc" - ,(plain-file "radare2rc" "e bin.relocs.apply=true")))) - (service home-mcron-service-type (home-mcron-configuration (jobs @@ -165,25 +161,27 @@ alias | sed -E \"s/^alias ([^=]+)='(.*)'$/alias \\1 \\2 \\$*/g; s/'\\\\\\''/'/g; (host-name "localhost") (user "bdunahu") (port 2222) - (extra-content "UserKnownHostsFile=/dev/null\n StrictHostKeyChecking=no")))))) + (extra-content " UserKnownHostsFile=/dev/null + StrictHostKeyChecking=no +")))))) (service home-xdg-user-directories-service-type (home-xdg-user-directories-configuration (desktop "$HOME/dl") (documents "$HOME/dc") (download "$HOME/dl") - (music "$HOME/ik/music") + (music "$HOME/ik") (pictures "$HOME/md/ig") (publicshare "$HOME") (templates "$HOME") (videos "$HOME/md/vi"))) (service home-xdg-configuration-files-service-type - `(("gdbinit" - ,(plain-file - (plain-file-name %default-gdbinit) - (string-append (plain-file-content %default-gdbinit) - "set disassembly-flavor intel + `(("gdbinit" + ,(plain-file + (plain-file-name %default-gdbinit) + (string-append (plain-file-content %default-gdbinit) + "set disassembly-flavor intel set confirm no set history filename ~/.cache/gdb/history set history save on @@ -193,7 +191,10 @@ set history size unlimited"))))) (home-xdg-mime-applications-configuration (default '((application/x-bittorrent . torrent.desktop) - (x-scheme-handler/magnet . torrent.desktop))) + (x-scheme-handler/magnet . torrent.desktop) + (x-scheme-handler/http . librewolf.desktop) + (x-scheme-handler/https . librewolf.desktop) + )) (desktop-entries (list (xdg-desktop-entry diff --git a/.config/guix/modules/services/emacs.scm b/.config/guix/modules/services/emacs.scm index f284cef..ba3a0a7 100644 --- a/.config/guix/modules/services/emacs.scm +++ b/.config/guix/modules/services/emacs.scm @@ -6,6 +6,7 @@ #:use-module (gnu system) #:use-module (guix gexp) #:use-module (guix packages) + #:use-module (tanelorn packages emacs-xyz) #:export (bd-home-emacs-service-type)) ;;; Commentary: @@ -15,24 +16,36 @@ emacs photo aspell + emacs-build emacs-xyz cpp gnupg + python-xyz + machine-learning mail - lisp) + lisp + xdisorg) (define (bd-emacs-package-list config) (list emacs-next pinentry-emacs + emacs-atomic-chrome + emacs-cider + emacs-clojure-mode emacs-dash emacs-denote emacs-denote-journal emacs-elpher emacs-emms emacs-exwm + emacs-f + emacs-gptel emacs-guix + emacs-hydra + emacs-jeison + emacs-lua-mode emacs-paredit emacs-pinentry emacs-rainbow-delimiters @@ -40,12 +53,19 @@ emacs-s emacs-slime emacs-vterm + emacs-yasnippet aspell aspell-dict-en + wmctrl ;; for exwm + perl-image-exiftool ;; for emms + ccls ;; for eglot + python-lsp-server ;; + + llama-cpp ;; for emacs-gptel )) diff --git a/.config/guix/modules/services/xorg.scm b/.config/guix/modules/services/xorg.scm index c3e585f..065540b 100644 --- a/.config/guix/modules/services/xorg.scm +++ b/.config/guix/modules/services/xorg.scm @@ -39,7 +39,7 @@ ,(plain-file "Xresources" " Nsxiv.window.background: #000000 Nsxiv.window.foreground: #FFFFFF -Nsxiv.bar.font: Terminus:size=9 +Nsxiv.bar.font: MedievalSharp:size=9 ")) (".xinitrc" ,(plain-file "xinitrc" " @@ -67,8 +67,8 @@ xset s 600 touchpad-defaults xrandr-toggle xkeyboard-auto & -test -f ~/.xkb/symbols/rocker && - xkbcomp -I$HOME/.xkb ~/.xkb/keymap/rocket $DISPLAY +eww daemon +eww open bar exec emacs -mm")) (".config/gtk-2.0/settings.ini" ,(plain-file "settings.ini" " diff --git a/.config/guix/modules/ymir.scm b/.config/guix/modules/ymir.scm index e416e82..7327980 100644 --- a/.config/guix/modules/ymir.scm +++ b/.config/guix/modules/ymir.scm @@ -23,6 +23,7 @@ "netdev" "video" "wheel" + "dialout" "kvm")))) @@ -50,6 +51,7 @@ (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) (targets (list "/boot/efi")) + (timeout 1) (keyboard-layout keyboard-layout))) ;; OVERRIDE THESE |