Merge branch 'main' of gh:greg-hellings/nixos-config

home/gui/default.nix

@@ -15,11 +15,6 @@ in
 	home.packages = with pkgs; [
 		cdrtools
 		dconf2nix
-		ffmpeg
-		gnucash
-		handbrake
-		libtheora
-		makemkv
 		vlc
 		x265
 	] ++
@@ -34,12 +29,6 @@ in
 		nextcloud-client
 	]) ++
 
-	# Items that just cannot be outside of x86_64 at all
-	( excludes ["aarch64-darwin" "aarch64-linux"]
-	[
-		synology-drive-client
-	]) ++
-
 	# Items that are not supported on ARM/Linux
 	( excludes ["aarch64-linux"]
 	[

home/home.nix

@@ -1,5 +1,6 @@
 { pkgs, lib, gui, gnome,
   inputs,
+  host ? "most",
   ...}:
 
 {
@@ -14,6 +15,7 @@
 		./templates.nix
 		./vim.nix
 		./xonsh.nix
+		./hosts/${host}
 	] ++ ( if gui then [ ./gui ] else []);
 
 
@@ -31,22 +33,11 @@
 		]);
 	};
 
-	home.file.".pip/pip.conf".text = (lib.strings.concatStringsSep "\n" [
-		"[global]"
-		"retries = 1"
-		"index-url = https://pypi.python.org/simple"
-		"extra-index-url ="
-		"    https://pypi.ivrtechnology.com/simple/"
-		"    https://pypidev.ivrtechnology.com/simple/"
-	]);
-
 	home.stateVersion = "23.05";
 	home.packages = with pkgs; [
 		bitwarden-cli
-		brew
 		copier
 		diffutils
-		dmidecode
 		findutils
 		git
 		gnupatch
@@ -56,6 +47,7 @@
 		inetutils
 		jq
 		nano
+		nix-prefetch
 		nmap
 		openssl
 		setup-ssh
@@ -63,7 +55,6 @@
 		transcrypt
 		tree
 		unzip
-		vagrant
 		wget
 	];
 }

home/hosts/2maccabees/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+
+}

home/hosts/icdm-root/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+
+}

home/hosts/iso/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+
+}

home/hosts/ivr/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, lib, ...}:
+
+{
+	home.packages = with pkgs; [
+		aacs
+		brew
+	];
+	home.file.".pip/pip.conf".text = (lib.strings.concatStringsSep "\n" [
+		"[global]"
+		"retries = 1"
+		"index-url = https://pypi.python.org/simple"
+		"extra-index-url ="
+		"    https://pypi.ivrtechnology.com/simple/"
+		"    https://pypidev.ivrtechnology.com/simple/"
+	]);
+}

home/hosts/jude/default.nix

@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+	home.packages = with pkgs; [
+		gimp
+		gnucash
+		ffmpeg
+		handbrake
+		libtheora
+		makemkv
+		synology-drive-client
+		vagrant
+	];
+}

home/hosts/lappy/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+
+}

home/hosts/linode/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+
+}

home/hosts/linodeeu/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+
+}

home/hosts/mm/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+
+}

home/hosts/work/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+	home.packages = with pkgs; [
+		brew
+	];
+}

home/hosts/wsl/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+
+}

home/most/default.nix

@@ -0,0 +1,6 @@
+# Put home configuration here that will affect most boxes
+{ pkgs, ... }:
+
+{
+
+}

home/xonsh.nix

@@ -39,6 +39,7 @@
 			crun = "compass workspace run";
 			ctest = "compass workspace test";
 			cylint = "./scripts/run_yaml_lint.py";
+			cpip = "compass workspace run src/python3/uc/tools:run_pip_compile";
 
 			cleanup = "nix-collect-garbage --delete-older-than 30d && nix store optimise";
 			d = "vox deactivate";