diff --git a/flake.lock b/flake.lock index 7303395..64cf97a 100644 --- a/flake.lock +++ b/flake.lock @@ -131,11 +131,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1745349595, - "narHash": "sha256-MhAetnTRGYqMlyB58yCKKGNzOPf6Nzy6CbJHbHmZBng=", + "lastModified": 1745440371, + "narHash": "sha256-Nb6h64rKi2p6GEAnz8mxIKVDvzozndC3SB9T+vXWfL8=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "f5b5a36835583a89a48713c419235e1c693b794c", + "rev": "4e91d11a60bf3f52a15936cef65eae7135906b28", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1745350245, - "narHash": "sha256-KK0LZX8O73DVIcI5qnxuDeSh3b4RrkDfC6lvIjzEyzc=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "6899001a762b0e089ad7b8ec7637d0a678640b8e", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745066849, - "narHash": "sha256-euud5ZDWH5U5sam+ZFoJY3UtxPluVUpk3fRSDmIZclk=", + "lastModified": 1745526248, + "narHash": "sha256-J5JT079hfkkKTzTaLnpKAQarZD81FKRYDoej+aQD8+g=", "owner": "kaylorben", "repo": "nixcord", - "rev": "f4456331e4c89989a7dae4f23a0fd87d81b3e7ad", + "rev": "f5720c0e0ea8ce733892af38d251b4d1bd06e78e", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -267,11 +267,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1745377448, + "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { diff --git a/modules/nixos/services/homepage/default.nix b/modules/nixos/services/homepage/default.nix index fe20073..04f91df 100644 --- a/modules/nixos/services/homepage/default.nix +++ b/modules/nixos/services/homepage/default.nix @@ -40,6 +40,9 @@ in { "/var/lib/containers/homepage/images:/app/public/images:rw" "/var/run/docker.sock:/var/run/docker.sock:ro" # Optional, used for docker integration. ]; + environment = { + "HOMEPAGE_ALLOWED_HOSTS" = "home.thevoid.cafe"; + }; extraOptions = ["--network=proxy"]; }; }; diff --git a/resources/services/homepage/config/settings.yaml b/resources/services/homepage/config/settings.yaml index 2e4943f..aa70820 100644 --- a/resources/services/homepage/config/settings.yaml +++ b/resources/services/homepage/config/settings.yaml @@ -4,7 +4,7 @@ title: Jo's Home background: - image: /images/blossoms.png + image: https://cloud.thevoid.cafe/public.php/dav/files/efDwYjNyAcwJM5A/web/cozy_kitchen_rain_compressed.webp blur: md opacity: 45 diff --git a/systems/x86_64-linux/absolutesolver/default.nix b/systems/x86_64-linux/absolutesolver/default.nix index a3071f8..09625ec 100644 --- a/systems/x86_64-linux/absolutesolver/default.nix +++ b/systems/x86_64-linux/absolutesolver/default.nix @@ -47,7 +47,7 @@ vaultwarden.enable = true; homepage.enable = true; duckdns.enable = true; - bluesky.pds.enable = true; + bluesky.pds.enable = false; }; }; @@ -56,6 +56,7 @@ systemCronJobs = [ "*/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" + "* 3 * * * cyn cd /home/cyn/docker/compose/satisfactory && docker compose up -d --force-recreate" #"*/30 * * * * cyn /home/jo/tools/FediFetcher/FediFetcher.sh" ]; }; @@ -64,6 +65,7 @@ snowfallorg.users.cyn.admin = true; users.users.cyn.isNormalUser = true; users.users.cyn.extraGroups = [ "dialout" "docker" ]; + # Configure home-manager home-manager = { @@ -75,6 +77,7 @@ ### General nano vim + git ## Runtimes nodejs_22 diff --git a/systems/x86_64-linux/absolutesolver/hardware-configuration.nix b/systems/x86_64-linux/absolutesolver/hardware-configuration.nix index 1683da3..026cd20 100644 --- a/systems/x86_64-linux/absolutesolver/hardware-configuration.nix +++ b/systems/x86_64-linux/absolutesolver/hardware-configuration.nix @@ -8,25 +8,30 @@ [ (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.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/3e3d6676-2bd6-44df-a8a7-c5e7647c4e95"; + { device = "/dev/disk/by-uuid/5d4f9f57-085f-44a0-b987-bad24ff58769"; fsType = "btrfs"; options = [ "subvol=@" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/1C8C-F906"; + { device = "/dev/disk/by-uuid/8D0F-2821"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; + fileSystems."/mnt/storage" = + { device = "/dev/disk/by-uuid/237eb43e-1e4e-4cb1-873e-6b07f1368f4f"; + fsType = "ext4"; + }; + 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 @@ -34,7 +39,12 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. 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.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; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";