still trying to resolve merge conflict

2024-10-12 12:02:36 -04:00
parent df75f0bb24
commit 0dd840f25e
51 changed files with 969 additions and 77 deletions
--- a/glasshouse-laptop/home/default.nix
+++ b/glasshouse-laptop/home/default.nix
@@ -17,6 +17,5 @@
 	 ++ [ (import ./userpkgs.nix)     ]
 	 ++ [ (import ./waybar) 	      ]
 	 ++ [ (import ./eza.nix) 	      ]
-	 ++ [ (import ./zshell.nix)       ]
-	 ++ [ (import ./git.nix)          ];
+	 ++ [ (import ./zshell.nix)       ];
 }