From 7f9855f939fdf6565b4afb6b52a58745f7fd45ae Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Fri, 30 Jan 2026 21:38:00 -0800
Subject: [PATCH 1/3] fix: move jjconfig also into home

---
 files/jjconfig.toml | 5 +++++
 home.scm            | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 files/jjconfig.toml

diff --git a/files/jjconfig.toml b/files/jjconfig.toml
new file mode 100644
index 0000000..9a1ad0f
--- /dev/null
+++ b/files/jjconfig.toml
@@ -0,0 +1,5 @@
+"$schema" = "https://jj-vcs.github.io/jj/latest/config-schema.json"
+
+[user]
+name = "Kat Inskip"
+email = "kat@inskip.me"
diff --git a/home.scm b/home.scm
index 1c05942..d6a882a 100644
--- a/home.scm
+++ b/home.scm
@@ -50,7 +50,9 @@
 
           (service home-xdg-configuration-files-service-type
            `(("gdb/gdbinit" ,%default-gdbinit)
-             ("nano/nanorc" ,%default-nanorc))))
+             ("nano/nanorc" ,%default-nanorc)
+	     ("jj/config.toml", (local-file "files/jjconfig.toml"))
+	     )))
 
         %base-home-services))))
 

From 1ff3056d42986c10d063c925d01b4580f2806a13 Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Fri, 30 Jan 2026 22:02:24 -0800
Subject: [PATCH 2/3] fix: sway autorun, zsh

---
 config.scm |  5 ++++-
 home.scm   | 13 ++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/config.scm b/config.scm
index 00285a9..ea634a2 100644
--- a/config.scm
+++ b/config.scm
@@ -18,7 +18,8 @@
 	       #:use-module (gnu services desktop)
 	       #:use-module (gnu services networking)
 	       #:use-module (gnu services ssh)
-	       #:use-module (gnu services xorg))
+	       #:use-module (gnu services xorg)
+	       #:use-module (gnu packages shells))
 
 (operating-system
   (locale "en_CA.utf8")
@@ -32,6 +33,7 @@
                   (comment "Kat Inskip")
                   (group "users")
                   (home-directory "/home/kat")
+		  (shell (file-append zsh "/bin/zsh"))
                   (supplementary-groups '("wheel" "netdev" "audio" "video")))
                 %base-user-accounts))
 
@@ -42,6 +44,7 @@
                           (specification->package "wmenu")
                           (specification->package "librewolf")
                           (specification->package "neovim")
+			  (specification->package "git")
                           (specification->package "foot")) %base-packages))
 
   ;; Below is the list of system services.  To search for available
diff --git a/home.scm b/home.scm
index 1c05942..a801a47 100644
--- a/home.scm
+++ b/home.scm
@@ -12,10 +12,17 @@
 		     xdisorg ; wl-clipboard
 		     rust-apps) ; jujutsu
 
+(define sway-bar-status #~(string-append "while "
+                 #$coreutils "/bin/date"
+                 " +'%Y-%m-%d %X'; do sleep 1; done"))
+
 (define sway-config
   (sway-configuration
     (inherit %empty-sway-configuration)
-    ;;(bar TODO)
+    (bar (sway-bar
+	   (identifier 'bar0)
+	   (position 'top)
+	   (status-command sway-bar-status)))
     ;;(startup+reload-programs TODO)
     ;;(extra-content TODO)
     (variables %sway-default-variables)
@@ -25,7 +32,7 @@
 			grimshot
 			wl-clipboard) %sway-default-packages))
     (modes %sway-default-modes)
-    (startup-programs %sway-default-startup-programs)
+    ;(startup-programs %sway-default-startup-programs)
     (inputs (list (sway-input (identifier "type:keyboard")
 			      (layout (keyboard-layout "us" #:options '("ctrl:nocaps"))))))))
 
@@ -38,7 +45,7 @@
           ;; Uncomment the shell you wish to use for your user:
           ;(service home-bash-service-type)
           ;(service home-fish-service-type)
-          ;(service home-zsh-service-type)
+          (service home-zsh-service-type)
 
 	  (service home-sway-service-type sway-config)
 

From c7fc40674fdb7795a7db463f32ec4707095d97ef Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Fri, 30 Jan 2026 23:24:50 -0800
Subject: [PATCH 3/3] fix: jj-config

---
 Makefile             | 5 +++++
 files/jj-config.toml | 5 +++++
 home.scm             | 5 +++--
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 Makefile
 create mode 100644 files/jj-config.toml

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..b6a765e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+home:
+guix home reconfigure ./home.scm
+
+guix:
+guix system reconfigure ./config.scm
diff --git a/files/jj-config.toml b/files/jj-config.toml
new file mode 100644
index 0000000..9a1ad0f
--- /dev/null
+++ b/files/jj-config.toml
@@ -0,0 +1,5 @@
+"$schema" = "https://jj-vcs.github.io/jj/latest/config-schema.json"
+
+[user]
+name = "Kat Inskip"
+email = "kat@inskip.me"
diff --git a/home.scm b/home.scm
index a801a47..73d704e 100644
--- a/home.scm
+++ b/home.scm
@@ -52,12 +52,13 @@
           (service home-files-service-type
            `((".guile" ,%default-dotguile)
              (".Xdefaults" ,%default-xdefaults)
-	     (".gitconfig", (local-file "files/gitconfig"))
+	     (".gitconfig" ,(local-file "files/gitconfig"))
 	     ))
 
           (service home-xdg-configuration-files-service-type
            `(("gdb/gdbinit" ,%default-gdbinit)
-             ("nano/nanorc" ,%default-nanorc))))
+             ("nano/nanorc" ,%default-nanorc)
+	     ("jj/config.toml" ,(local-file "files/jj-config.toml")))))
 
         %base-home-services))))