mirror of
				https://github.com/Jokiller230/puzzlevision.git
				synced 2025-11-03 23:28:48 +00:00 
			
		
		
		
	Compare commits
	
		
			2 commits
		
	
	
		
			75d45bca10
			...
			4359eb889e
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
							 | 
						4359eb889e | ||
| e06d8be50a | 
					 5 changed files with 27 additions and 43 deletions
				
			
		
							
								
								
									
										42
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										42
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
					@ -131,11 +131,11 @@
 | 
				
			||||||
        "zon2nix": "zon2nix"
 | 
					        "zon2nix": "zon2nix"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1745440371,
 | 
					        "lastModified": 1745349595,
 | 
				
			||||||
        "narHash": "sha256-Nb6h64rKi2p6GEAnz8mxIKVDvzozndC3SB9T+vXWfL8=",
 | 
					        "narHash": "sha256-MhAetnTRGYqMlyB58yCKKGNzOPf6Nzy6CbJHbHmZBng=",
 | 
				
			||||||
        "owner": "ghostty-org",
 | 
					        "owner": "ghostty-org",
 | 
				
			||||||
        "repo": "ghostty",
 | 
					        "repo": "ghostty",
 | 
				
			||||||
        "rev": "4e91d11a60bf3f52a15936cef65eae7135906b28",
 | 
					        "rev": "f5b5a36835583a89a48713c419235e1c693b794c",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
| 
						 | 
					@ -146,11 +146,11 @@
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "hardware": {
 | 
					    "hardware": {
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1745503349,
 | 
					        "lastModified": 1744633460,
 | 
				
			||||||
        "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
 | 
					        "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
 | 
				
			||||||
        "owner": "NixOS",
 | 
					        "owner": "NixOS",
 | 
				
			||||||
        "repo": "nixos-hardware",
 | 
					        "repo": "nixos-hardware",
 | 
				
			||||||
        "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
 | 
					        "rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
| 
						 | 
					@ -167,11 +167,11 @@
 | 
				
			||||||
        ]
 | 
					        ]
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1745494811,
 | 
					        "lastModified": 1745350245,
 | 
				
			||||||
        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
 | 
					        "narHash": "sha256-KK0LZX8O73DVIcI5qnxuDeSh3b4RrkDfC6lvIjzEyzc=",
 | 
				
			||||||
        "owner": "nix-community",
 | 
					        "owner": "nix-community",
 | 
				
			||||||
        "repo": "home-manager",
 | 
					        "repo": "home-manager",
 | 
				
			||||||
        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
 | 
					        "rev": "6899001a762b0e089ad7b8ec7637d0a678640b8e",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
| 
						 | 
					@ -204,11 +204,11 @@
 | 
				
			||||||
        "treefmt-nix": "treefmt-nix"
 | 
					        "treefmt-nix": "treefmt-nix"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1745526248,
 | 
					        "lastModified": 1745066849,
 | 
				
			||||||
        "narHash": "sha256-J5JT079hfkkKTzTaLnpKAQarZD81FKRYDoej+aQD8+g=",
 | 
					        "narHash": "sha256-euud5ZDWH5U5sam+ZFoJY3UtxPluVUpk3fRSDmIZclk=",
 | 
				
			||||||
        "owner": "kaylorben",
 | 
					        "owner": "kaylorben",
 | 
				
			||||||
        "repo": "nixcord",
 | 
					        "repo": "nixcord",
 | 
				
			||||||
        "rev": "f5720c0e0ea8ce733892af38d251b4d1bd06e78e",
 | 
					        "rev": "f4456331e4c89989a7dae4f23a0fd87d81b3e7ad",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
| 
						 | 
					@ -219,11 +219,11 @@
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "nixpkgs": {
 | 
					    "nixpkgs": {
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1744868846,
 | 
					        "lastModified": 1742800061,
 | 
				
			||||||
        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
 | 
					        "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
 | 
				
			||||||
        "owner": "NixOS",
 | 
					        "owner": "NixOS",
 | 
				
			||||||
        "repo": "nixpkgs",
 | 
					        "repo": "nixpkgs",
 | 
				
			||||||
        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
 | 
					        "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
| 
						 | 
					@ -267,11 +267,11 @@
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "nixpkgs_2": {
 | 
					    "nixpkgs_2": {
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1745377448,
 | 
					        "lastModified": 1744868846,
 | 
				
			||||||
        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
 | 
					        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
 | 
				
			||||||
        "owner": "nixos",
 | 
					        "owner": "nixos",
 | 
				
			||||||
        "repo": "nixpkgs",
 | 
					        "repo": "nixpkgs",
 | 
				
			||||||
        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
 | 
					        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
| 
						 | 
					@ -388,11 +388,11 @@
 | 
				
			||||||
        ]
 | 
					        ]
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1744961264,
 | 
					        "lastModified": 1742370146,
 | 
				
			||||||
        "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
 | 
					        "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
 | 
				
			||||||
        "owner": "numtide",
 | 
					        "owner": "numtide",
 | 
				
			||||||
        "repo": "treefmt-nix",
 | 
					        "repo": "treefmt-nix",
 | 
				
			||||||
        "rev": "8d404a69efe76146368885110f29a2ca3700bee6",
 | 
					        "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -40,9 +40,6 @@ in {
 | 
				
			||||||
        "/var/lib/containers/homepage/images:/app/public/images:rw"
 | 
					        "/var/lib/containers/homepage/images:/app/public/images:rw"
 | 
				
			||||||
        "/var/run/docker.sock:/var/run/docker.sock:ro" # Optional, used for docker integration.
 | 
					        "/var/run/docker.sock:/var/run/docker.sock:ro" # Optional, used for docker integration.
 | 
				
			||||||
      ];
 | 
					      ];
 | 
				
			||||||
      environment = {
 | 
					 | 
				
			||||||
        "HOMEPAGE_ALLOWED_HOSTS" = "home.thevoid.cafe";
 | 
					 | 
				
			||||||
      };
 | 
					 | 
				
			||||||
      extraOptions = ["--network=proxy"];
 | 
					      extraOptions = ["--network=proxy"];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
title: Jo's Home
 | 
					title: Jo's Home
 | 
				
			||||||
background:
 | 
					background:
 | 
				
			||||||
  image: https://cloud.thevoid.cafe/public.php/dav/files/efDwYjNyAcwJM5A/web/cozy_kitchen_rain_compressed.webp
 | 
					  image: /images/blossoms.png
 | 
				
			||||||
  blur: md
 | 
					  blur: md
 | 
				
			||||||
  opacity: 45
 | 
					  opacity: 45
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,7 +47,7 @@
 | 
				
			||||||
      vaultwarden.enable = true;
 | 
					      vaultwarden.enable = true;
 | 
				
			||||||
      homepage.enable = true;
 | 
					      homepage.enable = true;
 | 
				
			||||||
      duckdns.enable = true;
 | 
					      duckdns.enable = true;
 | 
				
			||||||
      bluesky.pds.enable = false;
 | 
					      bluesky.pds.enable = true;
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -56,7 +56,6 @@
 | 
				
			||||||
    systemCronJobs = [
 | 
					    systemCronJobs = [
 | 
				
			||||||
      "*/5 * * * * cyn docker exec -u www-data nextcloud-nextcloud-1 php /var/www/html/cron.php"
 | 
					      "*/5 * * * * cyn docker exec -u www-data nextcloud-nextcloud-1 php /var/www/html/cron.php"
 | 
				
			||||||
      "*/15 * * * * cyn docker exec -u www-data nextcloud-nextcloud-1 php /var/www/nextcloud/occ preview:pre-generate"
 | 
					      "*/15 * * * * cyn docker exec -u www-data nextcloud-nextcloud-1 php /var/www/nextcloud/occ preview:pre-generate"
 | 
				
			||||||
      "* 3 * * * cyn cd /home/cyn/docker/compose/satisfactory && docker compose up -d --force-recreate"
 | 
					 | 
				
			||||||
      #"*/30 * * * * cyn /home/jo/tools/FediFetcher/FediFetcher.sh"
 | 
					      #"*/30 * * * * cyn /home/jo/tools/FediFetcher/FediFetcher.sh"
 | 
				
			||||||
    ];
 | 
					    ];
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
| 
						 | 
					@ -66,7 +65,6 @@
 | 
				
			||||||
  users.users.cyn.isNormalUser = true;
 | 
					  users.users.cyn.isNormalUser = true;
 | 
				
			||||||
  users.users.cyn.extraGroups = [ "dialout" "docker" ];
 | 
					  users.users.cyn.extraGroups = [ "dialout" "docker" ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
  # Configure home-manager
 | 
					  # Configure home-manager
 | 
				
			||||||
  home-manager = {
 | 
					  home-manager = {
 | 
				
			||||||
    backupFileExtension = "homeManagerBackup";
 | 
					    backupFileExtension = "homeManagerBackup";
 | 
				
			||||||
| 
						 | 
					@ -77,7 +75,6 @@
 | 
				
			||||||
    ### General
 | 
					    ### General
 | 
				
			||||||
    nano
 | 
					    nano
 | 
				
			||||||
    vim
 | 
					    vim
 | 
				
			||||||
    git
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ## Runtimes
 | 
					    ## Runtimes
 | 
				
			||||||
    nodejs_22
 | 
					    nodejs_22
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,30 +8,25 @@
 | 
				
			||||||
    [ (modulesPath + "/installer/scan/not-detected.nix")
 | 
					    [ (modulesPath + "/installer/scan/not-detected.nix")
 | 
				
			||||||
    ];
 | 
					    ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "uas" "sd_mod" ];
 | 
					  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
 | 
				
			||||||
  boot.initrd.kernelModules = [ ];
 | 
					  boot.initrd.kernelModules = [ ];
 | 
				
			||||||
  boot.kernelModules = [ "kvm-intel" ];
 | 
					  boot.kernelModules = [ "kvm-intel" ];
 | 
				
			||||||
  boot.extraModulePackages = [ ];
 | 
					  boot.extraModulePackages = [ ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  fileSystems."/" =
 | 
					  fileSystems."/" =
 | 
				
			||||||
    { device = "/dev/disk/by-uuid/5d4f9f57-085f-44a0-b987-bad24ff58769";
 | 
					    { device = "/dev/disk/by-uuid/3e3d6676-2bd6-44df-a8a7-c5e7647c4e95";
 | 
				
			||||||
      fsType = "btrfs";
 | 
					      fsType = "btrfs";
 | 
				
			||||||
      options = [ "subvol=@" ];
 | 
					      options = [ "subvol=@" ];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  fileSystems."/boot" =
 | 
					  fileSystems."/boot" =
 | 
				
			||||||
    { device = "/dev/disk/by-uuid/8D0F-2821";
 | 
					    { device = "/dev/disk/by-uuid/1C8C-F906";
 | 
				
			||||||
      fsType = "vfat";
 | 
					      fsType = "vfat";
 | 
				
			||||||
      options = [ "fmask=0077" "dmask=0077" ];
 | 
					      options = [ "fmask=0077" "dmask=0077" ];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  fileSystems."/mnt/storage" =
 | 
					 | 
				
			||||||
    { device = "/dev/disk/by-uuid/237eb43e-1e4e-4cb1-873e-6b07f1368f4f";
 | 
					 | 
				
			||||||
      fsType = "ext4";
 | 
					 | 
				
			||||||
    };
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  swapDevices =
 | 
					  swapDevices =
 | 
				
			||||||
    [ { device = "/dev/disk/by-uuid/42fc926f-f066-48e8-8c07-3627b2ba3cd4"; }
 | 
					    [ { device = "/dev/disk/by-uuid/b99e9370-10f7-4589-b7a2-59a256d75926"; }
 | 
				
			||||||
    ];
 | 
					    ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
 | 
					  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
 | 
				
			||||||
| 
						 | 
					@ -39,12 +34,7 @@
 | 
				
			||||||
  # still possible to use this option, but it's recommended to use it in conjunction
 | 
					  # still possible to use this option, but it's recommended to use it in conjunction
 | 
				
			||||||
  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
 | 
					  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
 | 
				
			||||||
  networking.useDHCP = lib.mkDefault true;
 | 
					  networking.useDHCP = lib.mkDefault true;
 | 
				
			||||||
  # networking.interfaces.br-32acd0b5b342.useDHCP = lib.mkDefault true;
 | 
					 | 
				
			||||||
  # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
 | 
					 | 
				
			||||||
  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
 | 
					  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
 | 
				
			||||||
  # networking.interfaces.veth0b3552e.useDHCP = lib.mkDefault true;
 | 
					 | 
				
			||||||
  # networking.interfaces.veth3873910.useDHCP = lib.mkDefault true;
 | 
					 | 
				
			||||||
  # networking.interfaces.veth9323c9b.useDHCP = lib.mkDefault true;
 | 
					 | 
				
			||||||
  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 | 
					  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 | 
					  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue