diff --git a/build.sh b/build.sh
index 961cbc3..eba8e72 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p git nixos-install-tools nix-output-monitor
+#!nix-shell -i bash -p git nixos-install-tools
if [ $# -ne 2 ]; then
echo "Usage: $0 <root> <config>"
echo "NOTE: hardware config will be generated from root!"
diff --git a/flake.lock b/flake.lock
index f7288f0..46d9282 100644
--- a/flake.lock
+++ b/flake.lock
@@ -378,6 +378,22 @@
"type": "github"
}
},
+ "flake-compat_6": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1747046372,
+ "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -513,6 +529,23 @@
"type": "github"
}
},
+ "flake-utils_6": {
+ "inputs": {
+ "systems": "systems_7"
+ },
+ "locked": {
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+ "type": "github"
+ },
+ "original": {
+ "id": "flake-utils",
+ "type": "indirect"
+ }
+ },
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
@@ -528,6 +561,30 @@
"type": "github"
}
},
+ "git-hooks": {
+ "inputs": {
+ "flake-compat": "flake-compat_6",
+ "gitignore": "gitignore_2",
+ "nixpkgs": [
+ "nom",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1763069267,
+ "narHash": "sha256-UPjIZIfh0DCVeGwjGgdRF803ELzYQr02qpWmO3wi0Ds=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "31792452cf92d204ea0df8e3fddc018235c4cf1b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "31792452cf92d204ea0df8e3fddc018235c4cf1b",
+ "type": "github"
+ }
+ },
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -550,6 +607,28 @@
"type": "github"
}
},
+ "gitignore_2": {
+ "inputs": {
+ "nixpkgs": [
+ "nom",
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
"grapevine": {
"inputs": {
"attic": "attic_2",
@@ -1298,6 +1377,28 @@
"type": "github"
}
},
+ "nom": {
+ "inputs": {
+ "flake-utils": "flake-utils_6",
+ "git-hooks": "git-hooks",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1764680671,
+ "narHash": "sha256-Llmi7oE0ayOupM7Cc1lnYv7O0mPKvRtFPI4M+eYaMew=",
+ "owner": "maralorn",
+ "repo": "nix-output-monitor",
+ "rev": "20ad9727e49bf686bea1c5e6769241234a56804b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "maralorn",
+ "repo": "nix-output-monitor",
+ "type": "github"
+ }
+ },
"ooye": {
"inputs": {
"nixpkgs": "nixpkgs_9"
@@ -1378,6 +1479,7 @@
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-override-draupnir": "nixpkgs-override-draupnir",
"nixpkgs-stable": "nixpkgs-stable_3",
+ "nom": "nom",
"ooye": "ooye",
"sops-nix": "sops-nix",
"synapseHttpAntispamSrc": "synapseHttpAntispamSrc"
@@ -1541,6 +1643,21 @@
"type": "github"
}
},
+ "systems_7": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"xdph": {
"inputs": {
"hyprland-protocols": [
diff --git a/flake.nix b/flake.nix
index dec5b12..5d4a217 100755
--- a/flake.nix
+++ b/flake.nix
@@ -64,6 +64,11 @@
inputs.lix.follows = "lix";
};
+ nom = {
+ url = "github:maralorn/nix-output-monitor";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
# Own projects/custom modules
botcore-v4 = {
url = "gitlab:BotCore-Devs/BotCore-v4/staging";
@@ -255,6 +260,7 @@
inherit (inputs) nhekoSrc;
inherit hyprland;
inherit hy3;
+ inherit (inputs) nom;
};
};
Rory-laptop = nixpkgs.lib.nixosSystem {
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index c9f9e1b..588f80c 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -35,6 +35,7 @@ args@{
#./services/printing.nix
#./services/ollama.nix
#./services/waydroid.nix
+ ./services/steam.nix
];
#services.flatpak.enable = true;
@@ -180,6 +181,9 @@ args@{
#nixd
gittyup
blueman
+ ffmpeg
+ intiface-central
+ wine64Packages.waylandFull
];
hardware = {
diff --git a/host/Rory-desktop/services/steam.nix b/host/Rory-desktop/services/steam.nix
index 2141244..0b5c80d 100644
--- a/host/Rory-desktop/services/steam.nix
+++ b/host/Rory-desktop/services/steam.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
{
programs.steam = {
enable = true;
diff --git a/modules/base.nix b/modules/base.nix
index 386ba73..d2f3cc9 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -2,6 +2,7 @@
pkgs,
lib,
config,
+ nom,
...
}:
@@ -129,7 +130,8 @@
pv
dig
cloud-utils
- nix-output-monitor
+ #nix-output-monitor
+ nom.packages.${system}.default
#expect
unrar-wrapper
#arch-install-scripts
diff --git a/packages/nheko-1.patch b/packages/nheko-1.patch
new file mode 100644
index 0000000..63f52bd
--- /dev/null
+++ b/packages/nheko-1.patch
@@ -0,0 +1,34 @@
+diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml
+index 77cad0f0..b80086af 100644
+--- a/resources/qml/delegates/Reply.qml
++++ b/resources/qml/delegates/Reply.qml
+@@ -62,23 +62,20 @@ AbstractButton {
+
+ clip: r.limitHeight
+
+- height: r.limitHeight ? Math.min( timelineEvent.main?.height, timelineView.height / 10) + Nheko.paddingSmall + usernameBtn.height : undefined
++ height: r.limitHeight ? (Math.min( timelineEvent.main?.height, timelineView.height / 10) + Nheko.paddingSmall + usernameBtn.height) : undefined
+
+ // FIXME: I have no idea, why this name doesn't render in the reply popup on Qt 6.9.2
+ AbstractButton {
+ id: usernameBtn
+
+- visible: r.eventId
+-
+ contentItem: Label {
+- visible: r.eventId
+ id: userName_
+- text: r.userName
+- color: r.userColor
+- textFormat: Text.RichText
+- width: timelineEvent.main?.width
++ text: r.userName ?? 'missing name'
++ //color: r.userColor
++ //textFormat: Text.RichText
++ width: timelineEvent.main?.width ?? 1000
+ }
+- onClicked: room.openUserProfile(r.userId)
++ // onClicked: room.openUserProfile(r.userId)
+ }
+
+ data: [
diff --git a/packages/nheko-git.nix b/packages/nheko-git.nix
index c392d2f..af7d035 100644
--- a/packages/nheko-git.nix
+++ b/packages/nheko-git.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation {
version = "git+master";
src = nhekoSrc;
+ #patches = [ ./nheko-1.patch ];
+
nativeBuildInputs = [
lmdbxx
cmake
|
