Commit for generation 198

flake.lock

@@ -93,6 +93,21 @@
       }
     },
     "flake-utils": {
+      "locked": {
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -110,6 +125,24 @@
         "type": "github"
       }
     },
+    "foundryvtt": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1726638033,
+        "narHash": "sha256-+hcgXKG5t/9wibv+8T9WASWItBAWb0tsmcZXH+VIYdw=",
+        "owner": "reckenrode",
+        "repo": "nix-foundryvtt",
+        "rev": "bf07f9dd916a97a091f8ab83358c2f295bea9ec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "reckenrode",
+        "repo": "nix-foundryvtt",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": [
@@ -195,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728026342,
+        "lastModified": 1728041527,
-        "narHash": "sha256-3mGqKM1jSkc2DrJvR/HCTav0Chd1n8/s1eJ9Y5GzNVM=",
+        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "30e04f3d477256de3eb6a7cff608e220087537d4",
+        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
         "type": "github"
       },
       "original": {
@@ -252,6 +285,22 @@
         "type": "github"
       }
     },
+    "nix-autobahn": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1728075541,
+        "narHash": "sha256-DHXAeBn6hMLjxaVavSNZQXR0C0l37fCzEzTtdMtNQUc=",
+        "path": "/home/pagedmov/sysflakes/glasshouse-desktop/derivations/nix-autobahn",
+        "type": "path"
+      },
+      "original": {
+        "path": "/home/pagedmov/sysflakes/glasshouse-desktop/derivations/nix-autobahn",
+        "type": "path"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -276,16 +325,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727802920,
+        "lastModified": 1726447378,
-        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
+        "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
+        "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -319,6 +368,37 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1649986882,
+        "narHash": "sha256-cNsInUFq1MbuvaEmv8x6jetWnmAU+osMpnwKumtjksI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5181d5945eda382ff6a9ca3e072ed6ea9b547fee",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1728018373,
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1727348695,
         "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
@@ -334,7 +414,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1710272261,
         "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
@@ -350,7 +430,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1726937504,
         "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
@@ -397,7 +477,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nvim",
           "nixvim",
@@ -421,7 +501,7 @@
     "nvim": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
         "pre-commit-hooks": "pre-commit-hooks"
       },
@@ -462,8 +542,10 @@
     },
     "root": {
       "inputs": {
+        "foundryvtt": "foundryvtt",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
+        "nix-autobahn": "nix-autobahn",
+        "nixpkgs": "nixpkgs_3",
         "nvim": "nvim",
         "rose-pine-hyprcursor": "rose-pine-hyprcursor",
         "toilet": "toilet"
@@ -472,7 +554,7 @@
     "rose-pine-hyprcursor": {
       "inputs": {
         "hyprlang": "hyprlang",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_5",
         "utils": "utils"
       },
       "locked": {
@@ -536,7 +618,7 @@
     },
     "toilet": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1727237241,

flake.nix

@@ -7,28 +7,46 @@
 		home-manager.inputs.nixpkgs.follows = "nixpkgs";
 		#glasshouse-desktop dots
 		nvim.url = "path:/home/pagedmov/sysflakes/glasshouse-desktop/dotfiles/packages/nixvim";
+		nix-autobahn.url = "path:/home/pagedmov/sysflakes/glasshouse-desktop/derivations/nix-autobahn";
 		toilet.url = "path:/home/pagedmov/sysflakes/glasshouse-desktop/dotfiles/packages/toilet";
+		foundryvtt.url = "github:reckenrode/nix-foundryvtt";
 		rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
 	};
 
-	outputs = { nixpkgs, rose-pine-hyprcursor, home-manager, nvim, toilet, ... }@inputs: {
+	outputs = { nixpkgs, rose-pine-hyprcursor, home-manager, foundryvtt, nvim, toilet, nix-autobahn, ... }@inputs: 
+	let
+		system = "x86_64-linux";
+        user = "pagedmov";
+		allowed-unfree-packages = [
+             "foundryvtt"
+           ];
+	in
+	{
 		nixosConfigurations = {
 			glasshouse = nixpkgs.lib.nixosSystem {
-				specialArgs = { inherit inputs; };
+				specialArgs = { 
-				system = "x86_64-linux";
+					inherit inputs;
+					inherit allowed-unfree-packages user; 
+				};
+				inherit system;
 				modules = [
 					./glasshouse-desktop/configuration.nix
 					home-manager.nixosModules.home-manager
+					foundryvtt.nixosModules.foundryvtt
 					{
 						home-manager.useGlobalPkgs = true;
 						home-manager.useUserPackages = true;
-						home-manager.users.pagedmov = import ./glasshouse-desktop/home.nix;
+						home-manager.users.${user} = import ./glasshouse-desktop/home.nix;
 						home-manager.extraSpecialArgs = {
-						  nvim = nvim.packages."x86_64-linux".default;
+							inherit allowed-unfree-packages user;
-						  toilet = toilet.packages."x86_64-linux".default;
+							nvim = nvim.packages."x86_64-linux".default;
+							toilet = toilet.packages."x86_64-linux".default;
+							nix-autobahn = nix-autobahn.packages."x86_64-linux".nix-autobahn;
 						};
 					}
 				];
+				specialArgs = {
+				};
 			};
 			environment.systemPackages = with nixpkgs; environment.systemPackages ++ [
 				rose-pine-hyprcursor.packages."x86_64-linux".default

glasshouse-desktop/configuration.nix

@@ -1,5 +1,5 @@
 
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 {
 	imports =
@@ -14,7 +14,7 @@
 		networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 		hostName = "glasshouse";
 			hosts = {
-				"192.168.1.163" = [ "glasshouse.info" ];
+				"192.168.1.163" = [ "glasshaus" ];
 			};
 		firewall = {
 			enable = true;
@@ -26,6 +26,7 @@
 		enable = true;
 		libraries = with pkgs; [
 			stdenv.cc.cc
+			ffmpeg-full
 		];
 	};
 
@@ -95,7 +96,9 @@ pagedmov ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild
 		pyright
 		protontricks
 		protonmail-bridge
+		nix-index
 		playerctl
+		tree
 		pavucontrol
 		pamixer
 		p7zip
@@ -127,6 +130,7 @@ pagedmov ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild
 		libclang
 		cava
 		quintom-cursor-theme
+		nixos-option
 	];
 
 
@@ -138,6 +142,15 @@ pagedmov ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild
 		enable = true;
 		enableSSHSupport = true;
 	};
+	services.foundryvtt = {
+		enable = true;
+		hostName = "wumbodnd";
+		package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_12;
+		minifyStaticFiles = true;
+		proxyPort = 443;
+		proxySSL = false;
+		upnp = false;
+	};
 
 	system.stateVersion = "24.05"; # Did you read the comment?
 

glasshouse-desktop/home.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, nvim, toilet, ... }:
+{ config, pkgs, nvim, toilet, nix-autobahn, ... }:
 
 {
 # Home Manager needs a bit of information about you and the paths it should
@@ -61,6 +61,7 @@
 			libreoffice
 			nvim
 			toilet
+			nix-autobahn
 		];
 
 		pointerCursor = {

glasshouse-desktop/modules/zshell.nix

@@ -12,7 +12,7 @@
 			STARSHIP_CONFIG = /home/pagedmov/.config/starship/starship.toml;
 			FZF_DEFAULT_COMMAND = "find $HOME \( -path \"$HOME/.steam\" -o -path \"$HOME/.mozilla\" -o -path \"$HOME/go\" \) -prune -o -type f -print";
 			GIT_TOKEN = "$(cat supersecret/git-token)";
-			PROMPT_COMMAND = "if [[ $? != 0 ]]; then sounds_enabled && (aplay ~/sound/sys/error.wav 2> /dev/null &); fi";
+			PROMPT_COMMAND = "if [[ $? != 0 ]]; then s_check && (aplay ~/sound/sys/error.wav 2> /dev/null &); fi";
 		};
 
 		shellAliases = {
@@ -50,7 +50,6 @@
 			nixconf = "nvim $HOME/sysflakes/glasshouse-desktop/configuration.nix";
 			viflake = "nvim flake.nix";
 			nvimcfg = "ranger $HOME/sysflakes/glasshouse-desktop/dotfiles/packages/nixvim/";
-			nix = "nix-beep";
 		};
 
 		initExtraFirst = ''
@@ -65,6 +64,7 @@ if [[ $- != *i* ]]; then
 	return
 fi
 
+
 typeset -g comppath="$HOME/.cache"
 typeset -g compfile="$comppath/.zcompdump"
 
@@ -74,7 +74,6 @@ else
 	mkdir -p "$comppath"
 fi
 
-sounds_enabled() {[ "$SOUNDS_ENABLED" -eq "1" ]}
 
 
 preexec() {
@@ -91,6 +90,8 @@ preexec() {
     echo "$cmd_count" > "$cmdcounter"
 }
 
+s_check() { [ $SOUNDS_ENABLED -eq 1 ] }
+
 snd_restart() {
 	echo -n "Restarting wireplumber service... "
 	systemctl --user restart wireplumber; code1=$? && echo "SUCCESS" || echo "FAILED"
@@ -127,7 +128,7 @@ wiki_update() {
 # Functions
 ls() {
   command ls --group-directories-first --color=always -F1 "$@" | sort -f -k1
-  sounds_enabled && (aplay ~/sound/sys/ls.wav > /dev/null 2>&1 &)
+  s_check && (aplay ~/sound/sys/ls.wav > /dev/null 2>&1 &)
 }
 
 # cd and ls after
@@ -136,7 +137,7 @@ cd() {
 	ls "$@"
 	builtin cd "$@" 
 	export SOUNDS_ENABLED=1
-	sounds_enabled && (aplay ~/sound/sys/cd.wav > /dev/null 2>&1 &)
+	s_check && (aplay ~/sound/sys/cd.wav > /dev/null 2>&1 &)
 }
 src() {
 	autoload -U zrecompile
@@ -204,34 +205,25 @@ safe_rm() {
     done
 }
 
-nix-beep() {
-	sounds_enabled && (aplay ~/sound/sys/nixswitch-start.wav > /dev/null 2>&1 &)
-	nix "$@" 
-	if [ "$?" -eq "0" ]; then 
-		sounds_enabled && (aplay ~/sound/sys/update.wav > /dev/null 2>&1 &)
-	else
-		sounds_enabled && (aplay ~/sound/sys/error.wav > /dev/null 2>&1 &)
-	fi
-}
-
 nixswitch() {
-	sounds_enabled && (aplay ~/sound/sys/nixswitch-start.wav > /dev/null 2>&1 &)
+	s_check && (aplay ~/sound/sys/nixswitch-start.wav > /dev/null 2>&1 &)
 	builtin cd "$HOME/sysflakes"
 	nix flake update
 	
 	gen=$(readlink /nix/var/nix/profiles/system | sed 's/.*system-\([0-9]*\)-link/\1/')
 	gen=$((gen + 1))
-	
+
-	if git diff --cached --quiet ; then
+	git diff --cached --quiet
+	if [ $? -eq 1 ]; then
 		git add .
 		git commit -m "Commit for generation $gen"
 		git push
 	fi
 	sudo nixos-rebuild switch --flake "$HOME/sysflakes#glasshouse"
 	if [ $? -eq 0 ]; then 
-		sounds_enabled && (aplay ~/sound/sys/update.wav > /dev/null 2>&1 &)
+		s_check && (aplay ~/sound/sys/update.wav > /dev/null 2>&1 &)
 	else
-		sounds_enabled && (aplay ~/sound/sys/error.wav > /dev/null 2>&1 &)
+		s_check && (aplay ~/sound/sys/error.wav > /dev/null 2>&1 &)
 	fi
 	builtin cd $OLDPWD
 }
@@ -294,7 +286,7 @@ fi
 source ~/.zkbd
 ~/coding/scripts/splash.sh
 eval "$(starship init zsh)"
-(aplay ~/sound/sys/sh-source.wav > /dev/null 2>&1 &)
+s_check && (aplay ~/sound/sys/sh-source.wav > /dev/null 2>&1 &)
 		'';
 
 		# Options