Jo/puzzlevision
1
0
Fork 0
mirror of https://github.com/Jokiller230/puzzlevision.git synced 2025-09-11 13:20:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: Jo:8ca1dc020f20b0ff3ea60084dcd763a80dafcc5a
Branches Tags
Jo:v2
Jo:update_flake_lock_action
Jo:main
Jo:refactor/system-and-home-loading
..
compare: Jo:76bdc568cd4a7108a8a9a92a0a8c282879c5e538
Branches Tags
Jo:v2
Jo:update_flake_lock_action
Jo:main
Jo:refactor/system-and-home-loading

3 commits
8ca1dc020f ... 76bdc568cd

Author SHA1 Message Date
github-actions[bot]
76bdc568cd
Merge 75d45bca10 into 632d473951 2025-04-24 23:55:54 +00:00
github-actions[bot]
75d45bca10 flake.lock: Update 
Flake lock file updates:

• Updated input 'catppuccin':
    'github:catppuccin/nix/75c26f52a685291fedfd3a9c93f5cbe80a5d3321?narHash=sha256-s2FmOufSMIz6H0UrGOHJ7RrQfqvhCjUIvk54J8LlZFA%3D' (2025-04-11)
  → 'github:catppuccin/nix/6268e50dbb0ac9375e110560395b5dc199e4dfb8?narHash=sha256-u3vJEzi6zxgG59KXjMR5koERsdKT5nd1OEKCpr6zgn8%3D' (2025-04-22)
• Updated input 'ghostty':
    'github:ghostty-org/ghostty/b16324ef0be8c5eeef4c0eb23b9972fdb2fa50d5?narHash=sha256-VFOTTlWGZ9GWGGrz6F6ihXrsmm5IiGEKCmgfpM9%2BY4E%3D' (2025-04-10)
  → 'github:ghostty-org/ghostty/4e91d11a60bf3f52a15936cef65eae7135906b28?narHash=sha256-Nb6h64rKi2p6GEAnz8mxIKVDvzozndC3SB9T%2BvXWfL8%3D' (2025-04-23)
• Updated input 'hardware':
    'github:NixOS/nixos-hardware/1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1?narHash=sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg%3D' (2025-04-11)
  → 'github:NixOS/nixos-hardware/f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1?narHash=sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw%3D' (2025-04-24)
• Updated input 'home-manager':
    'github:nix-community/home-manager/6bccb54a4f98408f22d2e45921bb401f393f2174?narHash=sha256-zT3zbkZjeKsjMktV7MAdruXQWpzpM7iVWHuhknYOuwY%3D' (2025-04-11)
  → 'github:nix-community/home-manager/abfad3d2958c9e6300a883bd443512c55dfeb1be?narHash=sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs%3D' (2025-04-24)
• Updated input 'nixcord':
    'github:kaylorben/nixcord/76c3b99646d12437ec7183939eca911549e4d18f?narHash=sha256-gUOclfwgw/bSo3VMNmHrNXzIpaOgh1Yq9a3D3Dj/wgM%3D' (2025-04-10)
  → 'github:kaylorben/nixcord/f5720c0e0ea8ce733892af38d251b4d1bd06e78e?narHash=sha256-J5JT079hfkkKTzTaLnpKAQarZD81FKRYDoej%2BaQD8%2Bg%3D' (2025-04-24)
• Updated input 'nixcord/nixpkgs':
    'github:NixOS/nixpkgs/1750f3c1c89488e2ffdd47cab9d05454dddfb734?narHash=sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs%3D' (2025-03-24)
  → 'github:NixOS/nixpkgs/ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c?narHash=sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs%3D' (2025-04-17)
• Updated input 'nixcord/treefmt-nix':
    'github:numtide/treefmt-nix/adc195eef5da3606891cedf80c0d9ce2d3190808?narHash=sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU%3D' (2025-03-19)
  → 'github:numtide/treefmt-nix/8d404a69efe76146368885110f29a2ca3700bee6?narHash=sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI%3D' (2025-04-18)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c?narHash=sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs%3D' (2025-04-17)
  → 'github:nixos/nixpkgs/507b63021ada5fee621b6ca371c4fca9ca46f52c?narHash=sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA%3D' (2025-04-23)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/69d5a5a4635c27dae5a742f36108beccc506c1ba?narHash=sha256-SR6%2BqjkPjGQG%2B8eM4dCcVtss8r9bre/LAxFMPJpaZeU%3D' (2025-04-08)
  → 'github:Mic92/sops-nix/5e3e92b16d6fdf9923425a8d4df7496b2434f39c?narHash=sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA%3D' (2025-04-22)
 2025-04-24 23:55:51 +00:00
Jo
632d473951 💄♻️ Update homepage background & re-enable somecronjobs
Some checks failed
update-dependencies / update-dependencies (push) Has been cancelled
Details
2025-04-25 01:54:02 +02:00
5 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
flake.lock generated
View file

@ -131,11 +131,11 @@
"zon2nix": "zon2nix" "zon2nix": "zon2nix"
}, },
"locked": { "locked": {
"lastModified": 1745349595, "lastModified": 1745440371,
"narHash": "sha256-MhAetnTRGYqMlyB58yCKKGNzOPf6Nzy6CbJHbHmZBng=", "narHash": "sha256-Nb6h64rKi2p6GEAnz8mxIKVDvzozndC3SB9T+vXWfL8=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "f5b5a36835583a89a48713c419235e1c693b794c", "rev": "4e91d11a60bf3f52a15936cef65eae7135906b28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +146,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1744633460, "lastModified": 1745503349,
"narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +167,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745350245, "lastModified": 1745494811,
"narHash": "sha256-KK0LZX8O73DVIcI5qnxuDeSh3b4RrkDfC6lvIjzEyzc=", "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6899001a762b0e089ad7b8ec7637d0a678640b8e", "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +204,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1745066849, "lastModified": 1745526248,
"narHash": "sha256-euud5ZDWH5U5sam+ZFoJY3UtxPluVUpk3fRSDmIZclk=", "narHash": "sha256-J5JT079hfkkKTzTaLnpKAQarZD81FKRYDoej+aQD8+g=",
"owner": "kaylorben", "owner": "kaylorben",
"repo": "nixcord", "repo": "nixcord",
"rev": "f4456331e4c89989a7dae4f23a0fd87d81b3e7ad", "rev": "f5720c0e0ea8ce733892af38d251b4d1bd06e78e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742800061, "lastModified": 1744868846,
"narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +267,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1744868846, "lastModified": 1745377448,
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -388,11 +388,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742370146, "lastModified": 1744961264,
"narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "rev": "8d404a69efe76146368885110f29a2ca3700bee6",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
modules/nixos/services/homepage/default.nix
View file

@ -40,6 +40,9 @@ 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"];
}; };
}; };

2
resources/services/homepage/config/settings.yaml
View file

@ -4,7 +4,7 @@
title: Jo's Home title: Jo's Home
background: background:
image: /images/blossoms.png image: https://cloud.thevoid.cafe/public.php/dav/files/efDwYjNyAcwJM5A/web/cozy_kitchen_rain_compressed.webp
blur: md blur: md
opacity: 45 opacity: 45

5
systems/x86_64-linux/absolutesolver/default.nix
View file

@ -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 = true; bluesky.pds.enable = false;
}; };
}; };
@ -56,6 +56,7 @@
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"
]; ];
}; };
@ -65,6 +66,7 @@
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";
@ -75,6 +77,7 @@
### General ### General
nano nano
vim vim
git
## Runtimes ## Runtimes
nodejs_22 nodejs_22

18
systems/x86_64-linux/absolutesolver/hardware-configuration.nix
View file

@ -8,25 +8,30 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "uas" "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/3e3d6676-2bd6-44df-a8a7-c5e7647c4e95"; { device = "/dev/disk/by-uuid/5d4f9f57-085f-44a0-b987-bad24ff58769";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@" ]; options = [ "subvol=@" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/1C8C-F906"; { device = "/dev/disk/by-uuid/8D0F-2821";
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/b99e9370-10f7-4589-b7a2-59a256d75926"; } [ { device = "/dev/disk/by-uuid/42fc926f-f066-48e8-8c07-3627b2ba3cd4"; }
]; ];
# 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
@ -34,7 +39,12 @@
# 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";