fixed file conflicts

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

glasshouse-desktop/dotfiles/packages/theme/cursor/flake.nix

@@ -0,0 +1,39 @@
+{
+	description = "Flake Boilerplate";
+
+	inputs = {
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+	};
+
+	outputs = { self, nixpkgs, ... }@inputs:
+		let
+			system = "x86_64-linux";
+			pkgs = nixpkgs.legacyPackages.${system};
+		in {
+			packages.${system} = {
+				default = pkgs.stdenv.mkDerivation {
+					pname = "hackneyed-cursors";
+					version = "0.9.2";
+
+					src = pkgs.fetchFromGitHub {
+						owner = "Enthymeme";
+						repo = "hackneyed-x11-cursors";
+						rev = "master";
+						sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAA=";
+					};
+
+					buildInputs = with pkgs; [
+						imagemagick
+						inkscape
+						make
+						bash
+						xorg.xcursorgen
+					];
+
+					buildPhase = ''
+						./build-all-themes.sh --dark-theme-only -j dist.large
+					'';
+				};
+			};
+		};
+}

glasshouse-desktop/home.nix

@@ -18,7 +18,7 @@
 # release notes.
 	home.stateVersion = "24.05"; # Please read the comment before changing.
 
-
+# hi
 # The home.packages option allows you to install Nix packages into your
 # environment.
 	home.packages = with pkgs; [
@@ -28,8 +28,8 @@
 		rofi
 		starship
 		ranger
-		firefox
 		zathura
+		firefox
 		yt-dlp
 		vlc
 		spotify
@@ -68,5 +68,6 @@
 	};
 
 # Let Home Manager install and manage itself.
+	programs.zsh.enable = true;
 	programs.home-manager.enable = true;
 }

glasshouse-desktop/modules/zshell.nix

@@ -43,7 +43,6 @@
 			navhelp = "navhelp | less";
 			svc = "systemctl --user";
 			hmswitch = "home-manager switch";
-			nixswitch = "sudo nixos-rebuild switch --flake $HOME/sysflakes#glasshouse";
 			hmconf = "nvim $HOME/sysflakes/glasshouse-desktop/home.nix";
 			nixconf = "nvim $HOME/sysflakes/glasshouse-desktop/configuration.nix";
 		};
@@ -195,6 +194,19 @@ screengrab() {
 	fi
 	grimblast save area $name
 }
+
+nixswitch() {
+	cd $HOME/sysflakes
+	gen=$(readlink /nix/var/nix/profiles/system | sed 's/.*system-\([0-9]*\)-link/\1/')
+	gen=$((gen + 1))
+	git diff --cached --quiet
+	if [ $? = 0 ]; then
+		git add .
+		git commit -m "Commit for generation $gen"
+		git push
+	fi
+	sudo nixos-rebuild switch --flake $HOME/sysflakes#glasshouse
+}
 		'';
 
 		initExtraBeforeCompInit = ''