From 3e96437bc60e5c7a18913afe5764f649ea259343 Mon Sep 17 00:00:00 2001 From: "Rory&::Emma" Date: Mon, 5 Feb 2024 12:14:17 +0000 Subject: Update from server --- flake.lock | 60 +++++++++---------- hardware-configuration.nix | 77 ------------------------- host/Rory-nginx/services/cgit.nix | 1 + host/Rory-nginx/services/nginx/rory.gay/mru.nix | 1 + 4 files changed, 32 insertions(+), 107 deletions(-) delete mode 100644 hardware-configuration.nix diff --git a/flake.lock b/flake.lock index 72bdd16..c8892a9 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1706392053, - "narHash": "sha256-WoNNQbouUcnTnACid1DPHLIW1NVascNE71SqDSWu10w=", + "lastModified": 1706834364, + "narHash": "sha256-X/xoXRX+fT4FirW+Br9T6NwRTTJSJgDq4Y3paiP/s4o=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "aa3fd6a47ee8d607ce4fd83f8a802a51fdf9012b", + "rev": "3ac42129ac0f72a9ba87ad6e93b22b4566214968", "type": "github" }, "original": { @@ -97,16 +97,16 @@ ] }, "locked": { - "lastModified": 1706070683, - "narHash": "sha256-iQoXIFviH5QbSKDkWyFJKKUtTcSiCvl1tW18ax+pKfI=", - "owner": "CobaltCause", + "lastModified": 1706473964, + "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", + "owner": "ipetkov", "repo": "crane", - "rev": "8060686afabc5b042e8982200cb2cc3fd22cf416", + "rev": "c798790eabec3e3da48190ae3698ac227aab770c", "type": "github" }, "original": { - "owner": "CobaltCause", - "ref": "crimes-for-cross", + "owner": "ipetkov", + "ref": "master", "repo": "crane", "type": "github" } @@ -120,11 +120,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1706336364, - "narHash": "sha256-mJ5i2YIVKv6jTN2+l3oOUUej2NUVjJX/H3bAq6019ks=", + "lastModified": 1706422804, + "narHash": "sha256-+ypK8QbE9RBe0sK4lAM4+8H4K85BB3BsDKMD7WbykBU=", "owner": "nix-community", "repo": "fenix", - "rev": "eb683549b7d76b12d1a009f888b91b70ed34485f", + "rev": "ce6fec88804dfd11e610cfd04333c23abeae80a8", "type": "github" }, "original": { @@ -221,11 +221,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1706435589, - "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", + "lastModified": 1706798041, + "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", + "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "nhekoSrc": { "flake": false, "locked": { - "lastModified": 1706401145, - "narHash": "sha256-2kXefTNtti2WKyCW275NO/PAHUJ2KNamULYXllqBWxY=", + "lastModified": 1706887748, + "narHash": "sha256-nxDmlx4pO1b9hnHgSSxNMDyc71lMtqNmWPRWgOzfjII=", "owner": "Nheko-reborn", "repo": "nheko", - "rev": "15a3a2731db52862fefe8cb8ac35d92538d1a3b6", + "rev": "961cb403f7b25d2b1c55158f3e9cc444a76d740c", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1706071294, - "narHash": "sha256-mpt86O5GQxKQoIg4nzKz810PeXjGSEFb4rW+shXbRco=", + "lastModified": 1706867893, + "narHash": "sha256-c5bADvtL35S3vsJaXR5YWTXe08W0gSwOrTOXfpJB4Ac=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "31346e340e828f79be23d9c83ec1674b152f17bc", + "rev": "bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1706718339, + "narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2", "type": "github" }, "original": { @@ -414,11 +414,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "type": "github" }, "original": { @@ -444,11 +444,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1706295183, - "narHash": "sha256-VSyMaUsXfjb31B8/uT5cM5qXC1VOHLVsCi/bQuo3O/g=", + "lastModified": 1706352756, + "narHash": "sha256-6K5rK1b2APQfXOrC+Hm+0QcyfPVt+TV81Q6Fd/QjMlQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "596e5c77cf5b2b660b3ac2ce732fa0596c246d9b", + "rev": "7219414e81810fd4d967136c4a0650523892c157", "type": "github" }, "original": { diff --git a/hardware-configuration.nix b/hardware-configuration.nix deleted file mode 100644 index d465d53..0000000 --- a/hardware-configuration.nix +++ /dev/null @@ -1,77 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/df27a146-a490-4d5e-aa4b-8f52de9cf955"; - fsType = "ext4"; - }; - - fileSystems."/nix/store" = - { device = "/nix/store"; - fsType = "none"; - options = [ "bind" ]; - }; - - fileSystems."/data" = - { device = "/dev/disk/by-uuid/ca6e141a-05af-48de-a97b-b75cda10f864"; - fsType = "ext4"; - }; - - fileSystems."/mnt/postgres" = - { device = "/dev/disk/by-uuid/c947f43c-5c80-4e29-ac8c-89763ecc02ad"; - fsType = "ext4"; - }; - - fileSystems."/mnt/sde" = - { device = "/dev/disk/by-uuid/1f31f2d7-043c-4bbf-8a3e-5e575a8c398a"; - fsType = "ext4"; - }; - - fileSystems."/mnt/sdf" = - { device = "/dev/disk/by-uuid/a09a20e9-7265-4976-ba8f-f4848c99e769"; - fsType = "ext4"; - }; - - fileSystems."/mnt/torrent" = - { device = "/dev/disk/by-uuid/c720dc91-0f69-4dca-88c5-ef36ec0d69e8"; - fsType = "ext4"; - }; - - fileSystems."/var/lib/matrix-synapse" = - { device = "/dev/disk/by-uuid/1089e10b-8951-411b-9103-110349d08d10"; - fsType = "ext4"; - }; - - fileSystems."/data/nginx/html_thearcanebrony/torrents" = - { device = "/mnt/torrent"; - fsType = "none"; - options = [ "bind" ]; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # 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.ens18.useDHCP = lib.mkDefault true; - # networking.interfaces.ens19.useDHCP = lib.mkDefault true; - # networking.interfaces.ve-matrixunlB21.useDHCP = lib.mkDefault true; - # networking.interfaces.ve-pluralcoZ833.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/host/Rory-nginx/services/cgit.nix b/host/Rory-nginx/services/cgit.nix index 6c8140c..686da78 100644 --- a/host/Rory-nginx/services/cgit.nix +++ b/host/Rory-nginx/services/cgit.nix @@ -9,6 +9,7 @@ let base_cgit_config = { css = "/cgit.css"; logo = "/cgit.png"; favicon = "/favicon.ico"; + readme = ":README.MD"; about-filter = "${pkgs.cgit-pink}/lib/cgit/filters/about-formatting.sh"; source-filter = "${pkgs.cgit-pink}/lib/cgit/filters/syntax-highlighting.py"; clone-url = (lib.concatStringsSep " " [ diff --git a/host/Rory-nginx/services/nginx/rory.gay/mru.nix b/host/Rory-nginx/services/nginx/rory.gay/mru.nix index b65bf51..76fb6d8 100755 --- a/host/Rory-nginx/services/nginx/rory.gay/mru.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/mru.nix @@ -9,6 +9,7 @@ reuseport = true; extraConfig = '' brotli off; + brotli_static off; ''; locations = { "/" = { -- cgit 1.4.1