summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbd <bdunahu@operationnull.com>2025-12-10 21:13:20 -0500
committerbd <bdunahu@operationnull.com>2025-12-10 21:13:20 -0500
commita38f3b4b23d7005f0b25d47fbe735f46f538f178 (patch)
tree7bb73bace6db3a3c269352b62d917fb23a2aeb24
parentc051c49aebe1d046cfb9260f9925d859d7084daa (diff)
guix: Remove guix-channel subproject, update to tanelorn
-rw-r--r--.config/guix/channels.scm12
m---------.config/guix/guix-channel0
-rw-r--r--.config/guix/modules/packages/packages.scm13
-rw-r--r--.config/guix/modules/services/emacs.scm2
-rw-r--r--.gitmodules3
5 files changed, 14 insertions, 16 deletions
diff --git a/.config/guix/channels.scm b/.config/guix/channels.scm
index 577b874..f0ed659 100644
--- a/.config/guix/channels.scm
+++ b/.config/guix/channels.scm
@@ -1,5 +1,9 @@
(append (list (channel
- (name 'bd-channel)
- (url (string-append "file://" (getenv "HOME")
- "/.config/guix/guix-channel"))))
- %default-channels)
+ (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/guix-channel b/.config/guix/guix-channel
deleted file mode 160000
-Subproject 7cc4a096ea565850fdb80dd8c5103fa3d0fe3ae
diff --git a/.config/guix/modules/packages/packages.scm b/.config/guix/modules/packages/packages.scm
index c5d4de9..ce1ca8f 100644
--- a/.config/guix/modules/packages/packages.scm
+++ b/.config/guix/modules/packages/packages.scm
@@ -3,9 +3,8 @@
#:use-module (gnu system)
#:use-module (guix gexp)
#:use-module (guix packages)
- #:use-module (bd font-medieval-sharp)
- #:use-module (bd font-runa-mono)
- #:use-module (bd eww)
+ #:use-module (tanelorn packages fonts)
+ #:use-module (tanelorn packages wm)
#:export (bd-packages-system
bd-packages-laptop
bd-packages-desktop
@@ -74,6 +73,7 @@
xorg ;; xf86-input-libinput, xf86-video-fbdev, xinit...
)
+
(define bd-packages-system
(append!
@@ -146,11 +146,8 @@
(define bd-packages-fun
(list
bsnes
- ;; dolphin-emu
- ;; mgba
- mupen64plus-core
- mupen64plus-audio-sdl
- mupen64plus-rsp-hle
+ dolphin-emu
+ mgba
mupen64plus-ui-console
mupen64plus-video-glide64mk2
nethack
diff --git a/.config/guix/modules/services/emacs.scm b/.config/guix/modules/services/emacs.scm
index 5d3a664..ba3a0a7 100644
--- a/.config/guix/modules/services/emacs.scm
+++ b/.config/guix/modules/services/emacs.scm
@@ -6,7 +6,7 @@
#:use-module (gnu system)
#:use-module (guix gexp)
#:use-module (guix packages)
- #:use-module (bd emacs-jeison)
+ #:use-module (tanelorn packages emacs-xyz)
#:export (bd-home-emacs-service-type))
;;; Commentary:
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index af8edf7..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule ".config/guix/guix-channel"]
- path = .config/guix/guix-channel
- url = https://git.operationnull.com/guix-channel.git