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

darwin/default.nix

@@ -23,8 +23,9 @@ let
 					extraSpecialArgs = {
 						inherit inputs;
 						gnome = false;
-						gui = true;
+						gui = false;
 						home = "/Users/gregory.hellings";
+						host = name;
 					};
 				};
 				users.users."gregory.hellings".home = "/Users/gregory.hellings";

darwin/ivr/default.nix

@@ -25,11 +25,16 @@ in {
 		brews = [
 			"qemu"
 			"gcc"
+			"libaacs"
 			{
 				name = "libvirt";
 				restart_service = true;
 			}
 			"virt-manager"
 		];
+		casks = [
+			"synology-drive"
+			"handbrake"
+		];
 	};
 }

darwin/work/default.nix

@@ -1,13 +1,16 @@
 { pkgs, ... }:
 
 {
-	#greg.pypackages = with pkgs; [
+	homebrew = {
-	#	dateutil
+		enable = true;
-	#	ipython
+		brews = [
-	#	pyyaml
+			"packer"
-	#	responses
+		];
-	#	ruamel-yaml
+		casks = [
-	#	typing-extensions
+			"gnucash"
-	#	virtualenv
+			"onlyoffice"
-	#];
+			"postman"
+			"vagrant"
+		];
+	};
 }

flake.lock

@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689516967,
+        "lastModified": 1692248770,
-        "narHash": "sha256-sFAa33wkQHanmij/uhfGduIDK8z4dJAita/rK6u9pvE=",
+        "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "61662a63bfe1726588c1da6b412df86d8ca94d63",
+        "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
         "type": "github"
       },
       "original": {

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";

hosts/default.nix

@@ -26,6 +26,7 @@ let
 				home-manager.extraSpecialArgs = {
 					inherit gnome gui inputs overlays;
 					home = "/home/greg";
+					host = name;
 				};
 			}
 			inputs.agenix.nixosModules.default

hosts/jude/default.nix

@@ -17,6 +17,18 @@
 	greg.kde.enable = false;
 
 	environment.systemPackages = with pkgs; [
+		# Video/Audio data composition framework tools like "gst-inspect", "gst-launch" ...
+		gst_all_1.gstreamer
+		# Common plugins like "filesrc" to combine within e.g. gst-launch
+		gst_all_1.gst-plugins-base
+		# Specialized plugins separated by quality
+		gst_all_1.gst-plugins-good
+		gst_all_1.gst-plugins-bad
+		gst_all_1.gst-plugins-ugly
+		# Plugins to reuse ffmpeg to play almost every video format
+		gst_all_1.gst-libav
+		# Support the Video Audio (Hardware) Acceleration API
+		gst_all_1.gst-vaapi
 		oathToolkit
 	];
 	fileSystems =  {

hosts/jude/virt.nix

@@ -2,6 +2,7 @@
 
 {
 	environment.systemPackages = with pkgs; [
+		dmidecode
 		guestfs-tools
 		libguestfs
 		ovftool

modules-all/default.nix

@@ -16,6 +16,12 @@
 			}
 		];
 
+		gc = {
+			automatic = true;
+			dates = "weekly";
+			options = "--delete-older-than 30d";
+		};
+
 		settings = {
 			auto-optimise-store = true;
 			experimental-features = "nix-command flakes";

overlays/aacs.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+pkgs.writeShellScriptBin "aacs" ''
+set -ex
+[ ! -d "''${HOME}/.config/aacs" ] && mkdir -p "''${HOME}/.config/aacs"
+cd "''${HOME}/.config/aacs"
+[ -f KEYDB.cfg.zip ] && rm -f KEYDB.cfg.zip
+curl -L -o KEYDB.cfg.zip "http://fvonline-db.bplaced.net/fv_download.php?lang=eng"
+${pkgs.unzip}/bin/unzip KEYDB.cfg.zip
+mv keydb.cfg KEYDB.cfg''

overlays/default.nix

@@ -44,19 +44,22 @@ in rec {
 		})
 	];
 
+	aacs = prev.callPackage ./aacs.nix {};
 	brew = prev.callPackage ./homebrew.nix {};
-	setup-ssh = prev.callPackage ./setup-ssh.nix {
+	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
-		pkgs = final.pkgs;
-	};
 	hms = prev.callPackage ./hms.nix {
 		pkgs = final.pkgs;
 	};
-	jinja2-cli = prev.python3.pkgs.callPackage ./jinja2-cli.nix {};
-	template = prev.callPackage ./template.nix { };
-
-	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
 	inject = prev.callPackage ./inject.nix { inherit (final) pkgs; };
-
+	jinja2-cli = prev.python3.pkgs.callPackage ./jinja2-cli.nix {};
+	libbluray = prev.libbluray.override {
+		withAACS = true;
+		withBDplus = true;
+	};
+	setup-ssh = prev.callPackage ./setup-ssh.nix {
+		pkgs = final.pkgs;
+	};
+	template = prev.callPackage ./template.nix { };
 	xonsh = prev.xonsh.overridePythonAttrs (old: rec{
 		python3 = final.gregpy;
 		propagatedBuildInputs = with final.gregpy.pkgs; old.propagatedBuildInputs ++ [
@@ -66,9 +69,9 @@ in rec {
 		];
 	});
 
-	bitwarden = macOver ./mac/bitwarden.nix "bitwarden";
+	#bitwarden = macOver ./mac/bitwarden.nix "bitwarden";
-	gnucash = macOver ./mac/gnucash.nix "gnucash";
+	#gnucash = macOver ./mac/gnucash.nix "gnucash";
-	handbrake = macOver ./mac/handbrake.nix "handbrake";
+	#handbrake = macOver ./mac/handbrake.nix "handbrake";
-	onlyoffice-bin = macOver ./mac/onlyoffice-bin.nix "onlyoffice-bin";
+	#onlyoffice-bin = macOver ./mac/onlyoffice-bin.nix "onlyoffice-bin";
-	vlc = macOver ./mac/vlc.nix "vlc";
+	#vlc = macOver ./mac/vlc.nix "vlc";
 }