diff --git a/build.sh b/build.sh
index 8c7410d..ac286c4 100755
--- a/build.sh
+++ b/build.sh
@@ -27,7 +27,7 @@ if [ "${ROOT}" = "/" ]; then
else
nixos-generate-config --show-hardware-config --root "${ROOT}" > hardware-configuration.nix
git add -f hardware-configuration.nix
- nom build $DERIVATION $EXTRA_NIX_FLAGS || exit 1
+ #nom build $DERIVATION $EXTRA_NIX_FLAGS --option store "${ROOT}" || exit 1
sudo nixos-install --root "${ROOT}" --flake ".#${CONFIG}" --no-channel-copy
git rm --cached hardware-configuration.nix
sudo cp . "${ROOT}/Rory-Open-Architecture" -r
diff --git a/flake.lock b/flake.lock
index 97c3680..0c16437 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,11 +77,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1738687046,
- "narHash": "sha256-6X7CYwykwyVU1kXMdl/CmARETQ77wXPHwqG+aAc5oak=",
+ "lastModified": 1740694128,
+ "narHash": "sha256-c1YNMDr9tHlvkXKbwRS5OJDwxxyw3VV7au+Qgv0n40Q=",
"owner": "famedly",
"repo": "conduit",
- "rev": "e20dd1469a0f84a428097242d280f5b8344b7e96",
+ "rev": "3bbf2cda3e456b28abadfd9dfa41eb72bef189f2",
"type": "gitlab"
},
"original": {
@@ -176,11 +176,11 @@
"draupnirSrc": {
"flake": false,
"locked": {
- "lastModified": 1739364704,
- "narHash": "sha256-tK/hvHgOiLQnGbKrExFgUHo6nvT2EqW+ruN2WrtKQmU=",
+ "lastModified": 1740760723,
+ "narHash": "sha256-2J1aGrc2TefqcLBTvVjIcGayobdzbZlTn2SuNG+Xelg=",
"owner": "the-draupnir-project",
"repo": "Draupnir",
- "rev": "9587d6fcbae0cfcc524abde08640848753577c2d",
+ "rev": "b5e3de5aa364a23ff580b087d43230716ae59dbc",
"type": "github"
},
"original": {
@@ -474,11 +474,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1739992710,
- "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=",
+ "lastModified": 1740699498,
+ "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1c189f011447810af939a886ba7bee33532bb1f9",
+ "rev": "b71edac7a3167026aabea82a54d08b1794088c21",
"type": "github"
},
"original": {
@@ -543,11 +543,11 @@
"nhekoSrc": {
"flake": false,
"locked": {
- "lastModified": 1738280329,
- "narHash": "sha256-jYh3yYd/lUadXLIiKW8rx6+3hLsVBuN31LB1E98suHg=",
+ "lastModified": 1740156344,
+ "narHash": "sha256-xEE9o6UBBymIxbVY1aud6lSd79GpbMISRirQqiDUk50=",
"owner": "Nheko-reborn",
"repo": "nheko",
- "rev": "8a5a00493682ee677d2a239717bde19cb30ec1a1",
+ "rev": "25e0d106078238d17b3580978d444484fa6a240c",
"type": "github"
},
"original": {
@@ -616,11 +616,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
- "lastModified": 1739782332,
- "narHash": "sha256-bPZKuual2WKfyHv7Wq+Owcj9R+i/qFzOWByqSS9rlxI=",
+ "lastModified": 1740567864,
+ "narHash": "sha256-eTS2wrC1jKR6PKXC9jZqQy5PwqbIOBLSLF3dwLiFJ8M=",
"owner": "nix-community",
"repo": "NixOS-WSL",
- "rev": "59bdbb1e75232bf1dd6d2a9313b9b6ddc5049ba2",
+ "rev": "1f40b43d01626ce994eb47150afa0d7215f396ca",
"type": "github"
},
"original": {
@@ -663,11 +663,11 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1739873227,
- "narHash": "sha256-ONWhtUuO9J3YlKbVNWMOUtNRjH1ESurAAH3m2tMTy7s=",
+ "lastModified": 1740770725,
+ "narHash": "sha256-/rTAkGJEOd/5BcNZ26o6M+MfW6UAppgPvgQKnAxZX3U=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c85bcd2e252a709ec00ca9668fb5828426688754",
+ "rev": "8113e2003d97888d43693e4631689dca515e6954",
"type": "github"
},
"original": {
@@ -681,13 +681,13 @@
"locked": {
"lastModified": 1727211877,
"narHash": "sha256-zy/ar3GpnzuGRCwrr6zV/QicoZcqd2kNNhkRDECfStU=",
- "owner": "nixos",
+ "owner": "NixOS",
"repo": "nixpkgs",
"rev": "e0464e47880a69896f0fb1810f00e0de469f770a",
"type": "github"
},
"original": {
- "owner": "nixos",
+ "owner": "NixOS",
"repo": "nixpkgs",
"rev": "e0464e47880a69896f0fb1810f00e0de469f770a",
"type": "github"
@@ -695,11 +695,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1739873227,
- "narHash": "sha256-ONWhtUuO9J3YlKbVNWMOUtNRjH1ESurAAH3m2tMTy7s=",
+ "lastModified": 1740770725,
+ "narHash": "sha256-/rTAkGJEOd/5BcNZ26o6M+MfW6UAppgPvgQKnAxZX3U=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c85bcd2e252a709ec00ca9668fb5828426688754",
+ "rev": "8113e2003d97888d43693e4631689dca515e6954",
"type": "github"
},
"original": {
@@ -839,11 +839,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1739020877,
- "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
+ "lastModified": 1739736696,
+ "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+ "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
"type": "github"
},
"original": {
@@ -855,11 +855,11 @@
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1739624908,
- "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
+ "lastModified": 1740463929,
+ "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
+ "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
"type": "github"
},
"original": {
@@ -871,11 +871,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1739736696,
- "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
+ "lastModified": 1740560979,
+ "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
+ "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index a7d2e1e..879df49 100755
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
# Draupnir module/package
nixpkgs-Draupnir.url = "github:TheArcaneBrony/nixpkgs/master";
- nixpkgs-keydb.url = "github:nixos/nixpkgs?rev=e0464e47880a69896f0fb1810f00e0de469f770a";
+ nixpkgs-keydb.url = "github:NixOS/nixpkgs?rev=e0464e47880a69896f0fb1810f00e0de469f770a";
#MatrixContentFilter.url = "git+file:/home/Rory/git/matrix/MatrixContentFilter?submodules=1";
# Base modules
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 744dfb2..c8f6ea5 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -177,6 +177,7 @@ args@{
#(callPackage ../../packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix { })
#vesktop
+ discord-development
virt-viewer
# (dwarf-fortress-packages.dwarf-fortress-full.override { enableStoneSense = true; enableFPS = true; theme = dwarf-fortress-packages.themes.spacefox; })
diff --git a/host/Rory-desktop/nginx.nix b/host/Rory-desktop/nginx.nix
index 297afcf..e69f15b 100644
--- a/host/Rory-desktop/nginx.nix
+++ b/host/Rory-desktop/nginx.nix
@@ -32,6 +32,7 @@
virtualHosts = {
"discord.localhost" = import ./nginx/discord.localhost.nix { inherit pkgs; };
"hse.localhost" = import ./nginx/hse.localhost.nix { inherit pkgs; };
+ "matrix.opensuse.localhost" = import ./nginx/matrix.opensuse.localhost.nix { inherit pkgs; };
};
};
};
diff --git a/host/Rory-desktop/nginx/matrix.opensuse.localhost.nix b/host/Rory-desktop/nginx/matrix.opensuse.localhost.nix
new file mode 100644
index 0000000..87287a4
--- /dev/null
+++ b/host/Rory-desktop/nginx/matrix.opensuse.localhost.nix
@@ -0,0 +1,75 @@
+{pkgs, ...}:
+{
+ enableACME = false;
+ addSSL = true;
+ # We don't care about certificates around here...
+ sslCertificate = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.cert.pem";
+ sslCertificateKey = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.key.pem";
+ locations."/" = {
+ #proxyPass = "http://127.0.0.1:9001";
+ proxyPass = "http://localhost:8008";
+ extraConfig = ''
+ if ($request_method = 'OPTIONS') {
+ more_set_headers 'Access-Control-Allow-Origin: *';
+ more_set_headers 'Access-Control-Allow-Methods: *';
+ #
+ # Custom headers and headers various browsers *should* be OK with but aren't
+ #
+ more_set_headers 'Access-Control-Allow-Headers: *, Authorization';
+ #
+ # Tell client that this pre-flight info is valid for 20 days
+ #
+ more_set_headers 'Access-Control-Max-Age: 1728000';
+ more_set_headers 'Content-Type: text/plain; charset=utf-8';
+ more_set_headers 'Content-Length: 0';
+ return 204;
+ }
+ '';
+ };
+
+# locations."= /.well-known/matrix/server".extraConfig = ''
+# more_set_headers 'Content-Type application/json';
+# more_set_headers 'Access-Control-Allow-Origin *';
+# return 200 '${builtins.toJSON { "m.server" = "hse.localhost:5298"; }}';
+# '';
+# locations."= /.well-known/matrix/client".extraConfig = ''
+# more_set_headers 'Content-Type application/json';
+# more_set_headers 'Access-Control-Allow-Origin *';
+# return 200 '${
+# builtins.toJSON {
+# "m.homeserver".base_url = "http://hse.localhost:5298";
+# "org.matrix.msc3575.proxy".url = "https://matrix.rory.gay";
+# }
+# }';
+# '';
+ locations."= /.well-known/matrix/support".extraConfig = ''
+ more_set_headers 'Content-Type application/json';
+ more_set_headers 'Access-Control-Allow-Origin *';
+ return 200 '${
+ builtins.toJSON {
+ admins = [
+ {
+ matrix_id = "@emma:rory.gay";
+ role = "admin";
+ }
+ {
+ matrix_id = "@alicia:rory.gay";
+ role = "admin";
+ }
+ {
+ matrix_id = "@root:rory.gay";
+ role = "admin";
+ }
+ {
+ matrix_id = "@rory:rory.gay";
+ role = "admin";
+ }
+ ];
+ }
+ }';
+ '';
+
+ locations."~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = {
+ proxyPass = "http://localhost:8100";
+ };
+}
diff --git a/modules/software-templates/profilers.nix b/modules/software-templates/profilers.nix
index 0df43f7..14e2867 100644
--- a/modules/software-templates/profilers.nix
+++ b/modules/software-templates/profilers.nix
@@ -2,7 +2,7 @@
{
environment.systemPackages = with pkgs; [
- kcachegrind
+ kdePackages.kcachegrind
linuxKernel.packages.linux_6_11.perf
hotspot
valgrind
|
