diff --git a/.gitignore b/.gitignore
index 549a6cf..8f0b582 100755
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ opensuse/
modules/opensuse/
/*.qcow2
Ran.ca
+OOYE-module/
diff --git a/flake.lock b/flake.lock
index ff0f569..6d1c506 100644
--- a/flake.lock
+++ b/flake.lock
@@ -176,11 +176,11 @@
"draupnirSrc": {
"flake": false,
"locked": {
- "lastModified": 1734481355,
- "narHash": "sha256-crjG+Kk2LeGvYj5mph4cI1BTV0ZcEWoD8enaWDkieCo=",
+ "lastModified": 1736638672,
+ "narHash": "sha256-Vj8DHSLc/T9z5hmdfaVOKqV3TWLE2ScQt/HfEn9ciZo=",
"owner": "the-draupnir-project",
"repo": "Draupnir",
- "rev": "e24bb80230406e606b61ce5237f3d369d048dc20",
+ "rev": "9d80b44871642f8c831a90cb35a055fd7bb16075",
"type": "github"
},
"original": {
@@ -426,24 +426,6 @@
"type": "github"
}
},
- "flake-utils_6": {
- "inputs": {
- "systems": "systems_5"
- },
- "locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
@@ -492,11 +474,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1735053786,
- "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
+ "lastModified": 1736508663,
+ "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
+ "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
"type": "github"
},
"original": {
@@ -561,11 +543,11 @@
"nhekoSrc": {
"flake": false,
"locked": {
- "lastModified": 1734481593,
- "narHash": "sha256-hGc+dWmoTodd4L84LtrYl2XwZ3eyc6ELubL8wZV2yNY=",
+ "lastModified": 1736468156,
+ "narHash": "sha256-Cf6l1399jQQpQPwwAji31DlO5fSVIuNXiMALPptrdf4=",
"owner": "Nheko-reborn",
"repo": "nheko",
- "rev": "51900a04f75ec20b43c5382443848f826577a291",
+ "rev": "5fe8ebf335add0c90f2db6c23f165d4edd63691c",
"type": "github"
},
"original": {
@@ -631,15 +613,14 @@
"nixos-wsl": {
"inputs": {
"flake-compat": "flake-compat_5",
- "flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_7"
},
"locked": {
- "lastModified": 1733854371,
- "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
+ "lastModified": 1736095716,
+ "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=",
"owner": "nix-community",
"repo": "NixOS-WSL",
- "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
+ "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0",
"type": "github"
},
"original": {
@@ -666,11 +647,11 @@
},
"nixpkgs-Draupnir": {
"locked": {
- "lastModified": 1734606618,
- "narHash": "sha256-/NImfna2GO4rRGCbDemqAvDXjmNOc25tlESDmtbE1Vg=",
+ "lastModified": 1736456248,
+ "narHash": "sha256-7ne2LL62xfwcKnvoWpbr902w8bCHjLvt3SsOFIeZX+A=",
"owner": "TheArcaneBrony",
"repo": "nixpkgs",
- "rev": "6146d47a81150217fd1a93951c6207f61336c7e0",
+ "rev": "945b6ee0970f8b8b52a17f5cd97d5c68f110cb07",
"type": "github"
},
"original": {
@@ -714,11 +695,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1735082236,
- "narHash": "sha256-izwYlEQKWPXpD8++Aw9MNbk3yUMQrcmMkGCj3iTD000=",
+ "lastModified": 1736772414,
+ "narHash": "sha256-anPYbIV+R8j6Nhgcb9ncTB8ndtuhXWZKg7zKR4BqM0k=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "94d0ac1428cce8673e375e1a1c5083cdf4a76f14",
+ "rev": "b8d482a8fb4676422833dfa3bcc59c9af4c55b3a",
"type": "github"
},
"original": {
@@ -762,11 +743,11 @@
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1734835170,
- "narHash": "sha256-JG6n9tQET7ZLjvwjH9BdYE6pES/Alcduxv2FDXliuBM=",
+ "lastModified": 1735563628,
+ "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6df924734e1b626efd70925545de844b1c25246f",
+ "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"type": "github"
},
"original": {
@@ -858,11 +839,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1734649271,
- "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+ "lastModified": 1736012469,
+ "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+ "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github"
},
"original": {
@@ -890,11 +871,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1734649271,
- "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+ "lastModified": 1736701207,
+ "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+ "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
"type": "github"
},
"original": {
@@ -925,11 +906,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
- "lastModified": 1734784540,
- "narHash": "sha256-Q71UhRrBn/Jk11Ht1AYM7a47aWfZACrRviv1KGz2DUM=",
+ "lastModified": 1736663670,
+ "narHash": "sha256-FjrCEdtpyj5sJwCkknHJuraYyyxpEsXeRLZpvt+cByo=",
"ref": "refs/heads/master",
- "rev": "0da75db7c8eef5903b2f00e0b9f6ee1039cfb52f",
- "revCount": 9,
+ "rev": "045d6763d042643c280708a40bf5874629334822",
+ "revCount": 10,
"type": "git",
"url": "https://cgit.rory.gay/nix/OOYE-module.git"
},
@@ -1028,11 +1009,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
- "lastModified": 1734546875,
- "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
+ "lastModified": 1736515725,
+ "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
+ "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",
"type": "github"
},
"original": {
@@ -1100,21 +1081,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_5": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 7dfe00a..f075b60 100755
--- a/flake.nix
+++ b/flake.nix
@@ -148,7 +148,7 @@
];
nixpkgs.overlays = [
(final: prev: {
- #matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped;
+ matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped;
draupnir = inputs.nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
keydb = inputs.nixpkgs-keydb.legacyPackages.${pkgs.stdenv.hostPlatform.system}.keydb;
})
diff --git a/modules/base.nix b/modules/base.nix
index 2f565e4..b56f33e 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -78,7 +78,7 @@
environment.etc."resolv.conf" = lib.mkDefault {
text = lib.concatStringsSep "\n" (
lib.optionals (config.networking ? nameservers) (map (nameserver: "nameserver ${nameserver}") (config.networking.nameservers))
- ++ lib.optionals (config.networking ? enableIPv6 && !config.networking.enableIPv6) [ "options no-aaaa" ]
+ #++ lib.optionals (config.networking ? enableIPv6 && !config.networking.enableIPv6) [ "options no-aaaa" ]
++ lib.optionals (config.networking ? enableIPv6 && config.networking.enableIPv6) [
"options single-request"
"options single-request-reopen"
diff --git a/modules/monitoring/system.nix b/modules/monitoring/system.nix
index 171a7af..34f35c4 100644
--- a/modules/monitoring/system.nix
+++ b/modules/monitoring/system.nix
@@ -49,7 +49,7 @@ in
services.prometheus.scrapeConfigs = [
{
job_name = "node";
- scrape_interval = "${toString cfg.prometheusScrapeInterval}s";
+ scrape_interval = "5s";
static_configs = [ { targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; } ];
}
];
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index a1007fc..dd8b2d1 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -14,7 +14,7 @@
git
lsd
duf
- (btop.override { rocmSupport = true; })
+ btop
htop
kitty.terminfo
tmux
|
