diff --git a/flake.lock b/flake.lock index 51e7227..d485de4 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1646105662, - "narHash": "sha256-jdXCZbGZL0SWWi29GnAOFHUh/QvvP0IyaVLv1ZTDkBI=", + "lastModified": 1646800063, + "narHash": "sha256-4UDjnX0DAy9nniGKCX7JlVXi2YrdvCfflwEKfaZAOWU=", "owner": "ryantm", "repo": "agenix", - "rev": "297cd58b418249240b9f1f155d52b1b17f292884", + "rev": "25b5bcfce91f99bd9cad8680b3671da181e6ab85", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "emacs": { "locked": { - "lastModified": 1646414475, - "narHash": "sha256-Linz0Q0FaNYkHniXnlUdCYUI9qeHvcS/dbn13Q3w4Bg=", + "lastModified": 1646791602, + "narHash": "sha256-w5joBHiZ+HATfSFaC9vhs4RKCDvM2t4az3r78zVHgzQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2fc6f185dbbc0dbf35289648aab0a8dfd1bba320", + "rev": "259a176c5a2e73ecfdaf1c31885a72b2a1fcdc1f", "type": "github" }, "original": { @@ -82,11 +82,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1646364779, - "narHash": "sha256-481vkO9b3h++bHzLbGDDhgpBoXQ0Wlo4lm4h5/EJMO4=", + "lastModified": 1646559628, + "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d119cea3763977801ad66330668c1ab4346cb7f7", + "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "master": { "locked": { - "lastModified": 1646432949, - "narHash": "sha256-KOo9y7Nfx2uK5+73WRYEAd7DqUJyPDhiE8RMBHiwTwg=", + "lastModified": 1646804252, + "narHash": "sha256-oP1+exMOoXtWp4PmkfUmZ3qZjnmO2Hr0SobAhhpPOKo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3effa9c7dbe14c8d8d359dbbcf9ff3dc8603fc53", + "rev": "aee2b97688757216b64462b4470fb8992c067573", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1646337600, - "narHash": "sha256-BjVKXtt6zcnPzoVnHHNoQFJHjAPoRvN5nD8oz+zZNsw=", + "lastModified": 1646712943, + "narHash": "sha256-FuYXH7g8OW8P+mAMLP/zx3zJOENtGIv5tLaOzKPP+is=", "owner": "neovim", "repo": "neovim", - "rev": "e23af71d35a3d31d476168d3a0a822048aa2c54f", + "rev": "2783f4cc4a410cd3b73e8cdfbdf8c859c426c6c6", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1646010816, - "narHash": "sha256-V37UBT+qobt7MlrO9TLPV9EKH/tTz8AMjtcjqSokbcg=", + "lastModified": 1646694838, + "narHash": "sha256-CtxpyUuMRnNn+wsD3Oxi0YPnxESWj6C2l1rgED23LSQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "e604df32b512d04635d4082dc6c5652b9cc88a3f", + "rev": "fd45bde30b59f0ac22eabbfff9dba1ccd7c8c76d", "type": "github" }, "original": { @@ -248,24 +248,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1618628710, - "narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=", - "path": "/nix/store/z1rf17q0fxj935cmplzys4gg6nxj1as0-source", - "rev": "7919518f0235106d050c77837df5e338fb94de5d", - "type": "path" + "lastModified": 1638587357, + "narHash": "sha256-2ySMW3QARG8BsRPmwe7clTbdCuaObromOKewykP+UJc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e34c5379866833f41e2a36f309912fa675d687c7", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1646331602, - "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", + "lastModified": 1646506091, + "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", + "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", "type": "github" }, "original": { @@ -275,11 +278,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1646331602, - "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", + "lastModified": 1646506091, + "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", + "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", "type": "github" }, "original": { @@ -335,11 +338,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1646331602, - "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", + "lastModified": 1646506091, + "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", + "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", "type": "github" }, "original": { @@ -351,11 +354,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1646254136, - "narHash": "sha256-8nQx02tTzgYO21BP/dy5BCRopE8OwE8Drsw98j+Qoaw=", + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e072546ea98db00c2364b81491b893673267827", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", "type": "github" }, "original": { @@ -383,11 +386,11 @@ }, "nur": { "locked": { - "lastModified": 1646418326, - "narHash": "sha256-4oj38RKfFdZhzd+0GUEU3RgmOuO334gAarkDCNFn9E0=", + "lastModified": 1646798858, + "narHash": "sha256-16HNEkAzf4F/DgPeIUHxql1WKuz33ut5avZ6OG9WOIA=", "owner": "nix-community", "repo": "NUR", - "rev": "a08648cb31807b28ec116b3e04f848cf9546be80", + "rev": "94da5e72a447a3131cef722a027841905e82cf96", "type": "github" }, "original": { @@ -403,11 +406,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1646381662, - "narHash": "sha256-cyzicCplzqS0g3gLefwicHRn0FQw95o+98fHQfLpQjw=", + "lastModified": 1646727299, + "narHash": "sha256-i18vMn+iXvPRAxPb96lEuEVkrQ75qKEZZomfo67JRJI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "9eb52a08308ed8e3641125e112c191eb53efefee", + "rev": "c26d33c2fbcf5f689a2592b2353f4f8765eea1da", "type": "github" }, "original": { @@ -418,11 +421,11 @@ }, "old": { "locked": { - "lastModified": 1642244250, - "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=", + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", "type": "github" }, "original": { @@ -457,11 +460,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1646360880, - "narHash": "sha256-Xu/gQO2eqRBOOarjl7XuPdrtKagAGAZDn6AlIRzGUns=", + "lastModified": 1646792695, + "narHash": "sha256-2drCXIKIQnJMlTZbcCfuHZAh+iPcdlRkCqtZnA6MHLY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "194016e6b086bfa5965aeb8979c58b93e03e2485", + "rev": "7f599870402c8d2a5806086c8ee0f2d92b175c54", "type": "github" }, "original": { @@ -472,11 +475,11 @@ }, "stable": { "locked": { - "lastModified": 1646258393, - "narHash": "sha256-mKDoCi5Baqainjf0Nx6oTPhaxKQdj4P17XTdhTtXGRA=", + "lastModified": 1646588256, + "narHash": "sha256-ZHljmNlt19nSm0Mz8fx6QEhddKUkU4hhwFmfNmGn+EY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed02c2ba0384b2800db41333045a6fb781f12aac", + "rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04", "type": "github" }, "original": { diff --git a/hosts/remilia/boot.nix b/hosts/remilia/boot.nix index 32d1859..dd4eed5 100755 --- a/hosts/remilia/boot.nix +++ b/hosts/remilia/boot.nix @@ -2,7 +2,7 @@ { boot = { kernel.sysctl."net.ipv4.ip_forward" = 1; - initrd.kernelModules = [ "bochs_drm" ]; + initrd.kernelModules = [ "bochs" ]; initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" ]; kernelModules = [ "kvm-amd" ]; kernelParams = [ "console=ttyS0" "console=tty1" "nvme.shutdown_timeout=10" "libiscsi.debug_libiscsi_eh=1" ]; diff --git a/hosts/remilia/services.nix b/hosts/remilia/services.nix index ce86caa..b004575 100755 --- a/hosts/remilia/services.nix +++ b/hosts/remilia/services.nix @@ -36,27 +36,27 @@ } { name = "consul.weirdnatto.in"; - value = genericHttpRProxy { addr = "https://10.55.0.2:8500"; }; + value = genericHttpRProxy { addr = "http://10.55.0.2:8500"; }; } { name = "ci.weirdnatto.in"; - value = genericHttpRProxy { addr = "https://10.55.0.2:6666"; }; + value = genericHttpRProxy { addr = "http://10.55.0.2:6666"; }; } { name = "radio.weirdnatto.in"; - value = genericHttpRProxy { addr = "https://10.55.0.3:8000"; }; + value = genericHttpRProxy { addr = "http://10.55.0.3:8000"; }; } { name = "git.weirdnatto.in"; value = genericHttpRProxy { - addr = "https://10.55.0.3:5000"; + addr = "http://10.55.0.2:5000"; conf = "client_max_body_size 64M;"; }; } { name = "nomad.weirdnatto.in"; value = genericHttpRProxy { - addr = "https://10.55.0.3:4646"; + addr = "http://10.55.0.2:4646"; conf = '' proxy_buffering off; proxy_read_timeout 310s;