fixed file conflicts

2024-09-25 01:37:09 -04:00
parent e0f4d10742
commit 514a944f80
4 changed files with 59 additions and 3 deletions
--- a/glasshouse-desktop/configuration.nix
+++ b/glasshouse-desktop/configuration.nix
@@ -12,11 +12,13 @@

 	networking = {
 		networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+		hostName = "glasshouse";
 			hosts = {
 				"192.168.1.163" = [ "glasshouse.info" ];
 			};
 	};

+
 	time.timeZone = "America/New_York";
 	i18n.defaultLocale = "en_US.UTF-8";

@@ -47,6 +49,7 @@
 	environment.systemPackages = with pkgs; [
 		parted
 		vim 
+		gnumake
 		wget
 		alsa-utils
 		alsa-lib
@@ -84,6 +87,7 @@
 		hyprland-workspaces
 		hyprland
 		htop
+		mpd
 		inetutils
 		fzf
 		feh