diff --git a/Makefile b/Makefile
deleted file mode 100644
index b6a765e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-home:
-guix home reconfigure ./home.scm
-
-guix:
-guix system reconfigure ./config.scm
diff --git a/config.scm b/config.scm
index ea634a2..00285a9 100644
--- a/config.scm
+++ b/config.scm
@@ -18,8 +18,7 @@
 	       #:use-module (gnu services desktop)
 	       #:use-module (gnu services networking)
 	       #:use-module (gnu services ssh)
-	       #:use-module (gnu services xorg)
-	       #:use-module (gnu packages shells))
+	       #:use-module (gnu services xorg))
 
 (operating-system
   (locale "en_CA.utf8")
@@ -33,7 +32,6 @@
                   (comment "Kat Inskip")
                   (group "users")
                   (home-directory "/home/kat")
-		  (shell (file-append zsh "/bin/zsh"))
                   (supplementary-groups '("wheel" "netdev" "audio" "video")))
                 %base-user-accounts))
 
@@ -44,7 +42,6 @@
                           (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/files/jj-config.toml b/files/jjconfig.toml
similarity index 100%
rename from files/jj-config.toml
rename to files/jjconfig.toml
diff --git a/home.scm b/home.scm
index 73d704e..d6a882a 100644
--- a/home.scm
+++ b/home.scm
@@ -12,17 +12,10 @@
 		     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 (sway-bar
-	   (identifier 'bar0)
-	   (position 'top)
-	   (status-command sway-bar-status)))
+    ;;(bar TODO)
     ;;(startup+reload-programs TODO)
     ;;(extra-content TODO)
     (variables %sway-default-variables)
@@ -32,7 +25,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"))))))))
 
@@ -45,20 +38,21 @@
           ;; 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)
 
           (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)
-	     ("jj/config.toml" ,(local-file "files/jj-config.toml")))))
+	     ("jj/config.toml", (local-file "files/jjconfig.toml"))
+	     )))
 
         %base-home-services))))