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/sys/default.nix
+++ b/glasshouse-laptop/sys/default.nix
@@ -10,8 +10,7 @@
 	 ++ [ (import ./programs.nix) ]
 	 ++ [ (import ./services.nix) ]
 	 ++ [ (import ./system.nix) ]
-	 ++ [ (import ./users.nix) ]
-	 ++ [ (import ./keyd.nix) ];
+	 ++ [ (import ./users.nix) ];

 	environment.systemPackages = with pkgs; [
 		acpi