From 6c2a4167f2e11ff1ced87780bb7ea908855d6afa Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.si>
Date: Fri, 12 Aug 2022 12:16:47 +0200
Subject: [PATCH] hosts/kirsty: use current-module to get config directory

---
 hosts/kirsty/system.scm | 10 ++++------
 util.scm                |  6 ------
 2 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 util.scm

diff --git a/hosts/kirsty/system.scm b/hosts/kirsty/system.scm
index 3b2500a..ad98632 100644
--- a/hosts/kirsty/system.scm
+++ b/hosts/kirsty/system.scm
@@ -15,14 +15,12 @@
   #:use-module (gnu system setuid)
   #:use-module (nongnu packages linux)
   #:use-module (nongnu system linux-initrd)
-  #:use-module (packages linux)
-  #:use-module (util))
+  #:use-module (packages linux))
 
-(define host "kirsty")
-(define config (host-dir host))
+(define host-dir (dirname (module-filename (current-module))))
 
 (operating-system
-  (host-name host)
+  (host-name "kirsty")
   (timezone "Europe/Ljubljana")
 
   (locale-definitions
@@ -31,7 +29,7 @@
     %default-locale-definitions))
   (locale "en_US.utf8")
 
-  (kernel (linux/config linux (string-append config "/kernel.config")))
+  (kernel (linux/config linux (string-append host-dir "/kernel.config")))
   (kernel-arguments '("mitigations=auto"))
 
   (firmware
diff --git a/util.scm b/util.scm
deleted file mode 100644
index 70ddf1f..0000000
--- a/util.scm
+++ /dev/null
@@ -1,6 +0,0 @@
-(define-module (util))
-
-(define-public config-dir (or (dirname (current-filename)) (car %load-path)))
-
-(define-public (host-dir host)
-  (string-append config-dir "/hosts/" host))