From 2b6fc478ff56ebf4b88cbb5b5931a0191a2a1a54 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Fri, 6 Dec 2024 11:13:40 +0100 Subject: [PATCH] +2505 flake update --- flake.lock | 48 ++++++++++++++++----------------- home/features/desktop/media.nix | 4 ++- home/m3tam3re/m3-ares.nix | 4 +-- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index c07fc2b..ca61ad5 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1732645828, - "narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733389730, + "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1732389316, - "narHash": "sha256-zC1BbRzt1JGOuL7zEhhiEfDU0ShQTKjKOce/iBkkjKg=", + "lastModified": 1733062031, + "narHash": "sha256-cPm3IukRcKZqTgmjL9kh3ZYGoXBD8elaTQ3TFo+W67Q=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "f4834ec308545d1ac27815e210e998f61c3435c8", + "rev": "955eed6c60a3ea5d6b0b1b8b7086cffbae984277", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1732700907, - "narHash": "sha256-ZxkFup7yaK0Rqp7sCCGwP1HGOFew7OxFDNHft2GyTZg=", + "lastModified": 1733475586, + "narHash": "sha256-aGnfZmx5nByXIhTgrOUqARSSG1zuaD+rWPKW0gOczp0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6b88838224de5b86f449e9d01755eae4efe4a1e4", + "rev": "d8dfbe84b904687ca920644fd959d06cd738e31a", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733220138, + "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", "type": "github" }, "original": { @@ -278,11 +278,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1718180692, - "narHash": "sha256-J5IYvKcdGRL/sBuST5WaoESEIl7KPv8aJK8aLY6C91E=", + "lastModified": 1733265112, + "narHash": "sha256-FdO+2X7TeIAW73hiyFKZbCjlAskb4xMmYYPX97mo9RE=", "owner": "ndom91", "repo": "rose-pine-hyprcursor", - "rev": "40ce26cb29206722ff73839ead0d871d94751e90", + "rev": "89dc9e347ce8da26766ad421b0899536f9f87639", "type": "github" }, "original": { diff --git a/home/features/desktop/media.nix b/home/features/desktop/media.nix index 543594a..1287786 100644 --- a/home/features/desktop/media.nix +++ b/home/features/desktop/media.nix @@ -22,7 +22,9 @@ in { gst_all_1.gstreamer gst_all_1.gst-vaapi handbrake + inkscape kdePackages.kdenlive + krita makemkv mpv pamixer @@ -35,7 +37,7 @@ in { # vlc # webcord # yt-dlp - # unimatrix + unimatrix ]; programs.obs-studio = { diff --git a/home/m3tam3re/m3-ares.nix b/home/m3tam3re/m3-ares.nix index 954b285..13bd8b2 100644 --- a/home/m3tam3re/m3-ares.nix +++ b/home/m3tam3re/m3-ares.nix @@ -71,8 +71,8 @@ in { enable = true; settings = { monitor = [ - "DP-1,2560x1440@144,0x0,1" - "DP-2,2560x1440@144,2560x0,1" + "eDP-1,preferred,0x0,1.25" + "HDMI-A-1,2560x1440@144,2560x0,1" ]; workspace = [ "1, monitor:DP-1, default:true"