diff --git a/flake.lock b/flake.lock index a4e746c..97bea80 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1762356719, - "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", + "lastModified": 1755946532, + "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", + "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1764276621, - "narHash": "sha256-gYuj1iU2p02RQKFfSIsau9aIcUj82SuhFAGwdSwNr+s=", + "lastModified": 1762541446, + "narHash": "sha256-9L4jyN+ByqdjpsymZW+W56IV3D1mi63D9hm4bcltlfI=", "owner": "StevenBlack", "repo": "hosts", - "rev": "f0c008d73a95659429228d704339e0e80a20a262", + "rev": "99bdb28ee250dd2ad83eeefda0bf64e6262a46ca", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764153295, - "narHash": "sha256-Y+Cp19zLo5JZVLSbzpyCTSK1bVYfE3Leuut6nQVkdR4=", + "lastModified": 1762542222, + "narHash": "sha256-d46HIbWOP7NXcKPYnO+E1ihn2O5cscsvGr8oQSrVQKg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "29c49282c9b2e8216004a87086494defe401fee8", + "rev": "38976b6f30bf13c208066a2f9271b4f5367e4b78", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1764264160, - "narHash": "sha256-1tgVrTyMD9dFZ9XyFgiFz9B5gDk20FviqWHuW59RdDY=", + "lastModified": 1762593927, + "narHash": "sha256-5MYTB/RUF197w6KwTqnZB0sgOiPp+tqaDdEOJrZ6cuA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f2272c1235937f3043a6d9cde826d2df729d8d95", + "rev": "4aaea6591714bb81186d13dcdbf9cecbcb20de72", "type": "github" }, "original": { @@ -192,6 +192,20 @@ "type": "github" } }, + "flake-compat_2": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -227,6 +241,24 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, + "flake-utils": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -268,20 +300,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", - "type": "gitlab" + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", + "ref": "48.2", "repo": "gnome-shell", - "type": "gitlab" + "type": "github" } }, "home-manager": { @@ -292,11 +322,11 @@ ] }, "locked": { - "lastModified": 1764075860, - "narHash": "sha256-KYEIHCBBw+/lwKsJNRNoUxBB4ZY2LK0G0T8f+0i65q0=", + "lastModified": 1762463325, + "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "295d90e22d557ccc3049dc92460b82f372cd3892", + "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "type": "github" }, "original": { @@ -312,11 +342,11 @@ ] }, "locked": { - "lastModified": 1764194569, - "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=", + "lastModified": 1762463325, + "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0", + "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "type": "github" }, "original": { @@ -371,11 +401,11 @@ ] }, "locked": { - "lastModified": 1762462052, - "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", + "lastModified": 1756891319, + "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", + "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d", "type": "github" }, "original": { @@ -418,11 +448,13 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", - "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": [ + "hyprland-qtutils" + ], "hyprlang": "hyprlang", "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], @@ -431,62 +463,20 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1762731096, - "narHash": "sha256-Kma5MxOipSBamO6DnwBeqJNjJ+VwEO73zh9h1hs/2Aw=", + "lastModified": 1757508065, + "narHash": "sha256-JkUkn8p/sHqjmykejd9ZMUlYyaXA+Ve9IPA71ybqloY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "967c3c7404d4fa00234e29c70df3e263386d2597", + "rev": "46174f78b374b6cea669c48880877a8bdcf7802f", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.52.1", + "ref": "v0.51.0", "repo": "Hyprland", "type": "github" } }, - "hyprland-guiutils": { - "inputs": { - "aquamarine": [ - "hyprland", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprtoolkit": "hyprtoolkit", - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1762465111, - "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=", - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "rev": "a415eba866a953f3096d661318f771aa0082eb98", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "type": "github" - } - }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -499,11 +489,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1749046714, + "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", "type": "github" }, "original": { @@ -512,6 +502,64 @@ "type": "github" } }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1749154592, + "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": "hyprlang_2", + "hyprutils": [ + "hyprland-qtutils", + "hyprlang", + "hyprutils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1759080228, + "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -528,11 +576,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -542,6 +590,32 @@ } }, "hyprlang_2": { + "inputs": { + "hyprutils": "hyprutils_2", + "nixpkgs": [ + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1749145882, + "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_3": { "inputs": { "hyprutils": [ "hyprlock", @@ -573,13 +647,13 @@ "hyprlock": { "inputs": { "hyprgraphics": "hyprgraphics_2", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_3", + "hyprlang": "hyprlang_3", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1759399385, @@ -596,54 +670,6 @@ "type": "github" } }, - "hyprtoolkit": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland-guiutils", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland-guiutils", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland-guiutils", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-guiutils", - "hyprutils" - ], - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "hyprland", - "hyprland-guiutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-guiutils", - "systems" - ] - }, - "locked": { - "lastModified": 1762463729, - "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -656,11 +682,11 @@ ] }, "locked": { - "lastModified": 1762387740, - "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", + "lastModified": 1756117388, + "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", + "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", "type": "github" }, "original": { @@ -670,6 +696,33 @@ } }, "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprland-qtutils", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "hyprland-qtutils", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1749135356, + "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprlock", @@ -698,14 +751,10 @@ "inputs": { "nixpkgs": [ "hyprland", - "hyprland-guiutils", - "hyprtoolkit", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-guiutils", - "hyprtoolkit", "systems" ] }, @@ -724,31 +773,6 @@ } }, "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ "hyprlock", @@ -782,11 +806,11 @@ ] }, "locked": { - "lastModified": 1763714684, - "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", + "lastModified": 1762452596, + "narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", + "rev": "99919fd35e70c1b18ce948d5329928d751031312", "type": "github" }, "original": { @@ -795,6 +819,21 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -820,11 +859,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -836,11 +875,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", + "lastModified": 1762498405, + "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", + "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "type": "github" }, "original": { @@ -852,26 +891,26 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1764494334, - "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", + "lastModified": 1762498405, + "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d542db745310b6929708d9abea513f3ff19b1341", + "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.11", + "ref": "nixos-25.05", "type": "indirect" } }, "nixpkgs_2": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -898,11 +937,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -947,11 +986,11 @@ ] }, "locked": { - "lastModified": 1763909441, - "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", + "lastModified": 1762274591, + "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", + "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", "type": "github" }, "original": { @@ -970,11 +1009,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1757239681, + "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", "type": "github" }, "original": { @@ -990,13 +1029,15 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager_2", "hyprland": "hyprland", + "hyprland-qtutils": "hyprland-qtutils", "hyprlock": "hyprlock", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", "plasma-manager": "plasma-manager", "rust-overlay": "rust-overlay_2", "secrets": "secrets", - "stylix": "stylix" + "stylix": "stylix", + "winapps": "winapps" } }, "rust-overlay": { @@ -1007,11 +1048,11 @@ ] }, "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "lastModified": 1762483116, + "narHash": "sha256-Z8EVsTH10BjCdFyPxbUu5jBV+HGL39rh9+beQcnNRm0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "rev": "9de55b59b6aaadbd9dbf223765a835239b767ee5", "type": "github" }, "original": { @@ -1025,11 +1066,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1764211126, - "narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=", + "lastModified": 1762569282, + "narHash": "sha256-vINZAJpXQTZd5cfh06Rcw7hesH7sGSvi+Tn+HUieJn8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed", + "rev": "a35a6144b976f70827c2fe2f5c89d16d8f9179d8", "type": "github" }, "original": { @@ -1069,7 +1110,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_3", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1077,11 +1118,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764254063, - "narHash": "sha256-V22JzkaTLF/GAL2LgqvOsJhAr8JbJsKaD8hnHjGwXfE=", + "lastModified": 1762264356, + "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", "owner": "nix-community", "repo": "stylix", - "rev": "a1451bc40413870f0c7b576b751c1ca92055e323", + "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", "type": "github" }, "original": { @@ -1121,6 +1162,36 @@ } }, "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1216,6 +1287,29 @@ "type": "github" } }, + "winapps": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762415361, + "narHash": "sha256-po1Ao4hmrC4+o0fvLLT4LN2z1hJ7XPRxpEpzF3cSarQ=", + "owner": "winapps-org", + "repo": "winapps", + "rev": "c088928440fdf80946de9131e81e081528a5e47a", + "type": "github" + }, + "original": { + "owner": "winapps-org", + "repo": "winapps", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1244,11 +1338,11 @@ ] }, "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", + "lastModified": 1755354946, + "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", + "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9ff3dd5..9b8cb7d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,22 +1,22 @@ { description = "Flake of LibrePhoenix"; - outputs = - inputs@{ self, ... }: + outputs = inputs@{ self, ... }: let system = "x86_64-linux"; # create patched nixpkgs - nixpkgs-patched = (import inputs.nixpkgs { inherit system; }).applyPatches { - name = "nixpkgs-patched"; - src = inputs.nixpkgs; - patches = [ - #(builtins.fetchurl { - # url = "https://asdf1234.patch"; - # sha256 = "sha256:qwerty123456..."; - #}) - ]; - }; + nixpkgs-patched = + (import inputs.nixpkgs { inherit system; }).applyPatches { + name = "nixpkgs-patched"; + src = inputs.nixpkgs; + patches = [ + #(builtins.fetchurl { + # url = "https://asdf1234.patch"; + # sha256 = "sha256:qwerty123456..."; + #}) + ]; + }; # configure pkgs # use nixpkgs if running a server (homelab or worklab profile) @@ -27,11 +27,7 @@ allowUnfree = true; allowUnfreePredicate = (_: true); }; - overlays = [ - inputs.rust-overlay.overlays.default - inputs.emacs-overlay.overlays.default - inputs.chaotic.overlays.default - ]; + overlays = [ inputs.rust-overlay.overlays.default inputs.emacs-overlay.overlays.default inputs.chaotic.overlays.default ]; }; pkgs-stable = import inputs.nixpkgs-stable { @@ -47,17 +43,12 @@ # create a list of all directories inside of ./hosts # every directory in ./hosts has config for that machine - hosts = builtins.filter (x: x != null) ( - lib.mapAttrsToList (name: value: if (value == "directory") then name else null) ( - builtins.readDir ./hosts - ) - ); + hosts = builtins.filter (x: x != null) (lib.mapAttrsToList (name: value: if (value == "directory") then name else null) (builtins.readDir ./hosts)); - in - { + in { # generate a nixos configuration for every host in ./hosts - nixosConfigurations = builtins.listToAttrs ( - map (host: { + nixosConfigurations = builtins.listToAttrs + (map (host: { name = host; value = lib.nixosSystem { system = "x86_64-linux"; @@ -88,20 +79,26 @@ inherit inputs; }; }; - }) hosts - ); + }) hosts); }; inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-25.11"; + nixpkgs-stable.url = "nixpkgs/nixos-25.05"; chaotic.url = "github:chaotic-cx/nyx"; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland = { - url = "github:hyprwm/Hyprland/v0.52.1?submodules=true"; + url = "github:hyprwm/Hyprland/v0.51.0?submodules=true"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.hyprland-qtutils.follows = "hyprland-qtutils"; + }; + + # FIXME tmp fix + hyprland-qtutils = { + url = "github:hyprwm/hyprland-qtutils/629b15c19fa4082e4ce6be09fdb89e8c3312aed7"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -116,6 +113,11 @@ inputs.home-manager.follows = "home-manager"; }; + winapps = { + url = "github:winapps-org/winapps"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + stylix.url = "github:nix-community/stylix"; emacs-overlay = { diff --git a/hosts/snowfire/configuration.nix b/hosts/snowfire/configuration.nix index 673e3d9..bf7ddca 100644 --- a/hosts/snowfire/configuration.nix +++ b/hosts/snowfire/configuration.nix @@ -21,6 +21,7 @@ virtualization = { docker.enable = true; virtualMachines.enable = true; + winapps.enable = true; }; brave.enable = true; diff --git a/hosts/snowfire/home.nix b/hosts/snowfire/home.nix index 7303779..33e7cbf 100644 --- a/hosts/snowfire/home.nix +++ b/hosts/snowfire/home.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, ... }: { config = { @@ -35,7 +30,7 @@ virtualization = { virtualMachines.enable = true; }; - ai.enable = false; # local-ai broken in nixpkgs + ai.enable = true; # wm hyprland.enable = true; @@ -47,10 +42,6 @@ bluetooth.enable = true; }; - home.packages = with pkgs; [ - freerdp - ]; - home.sessionVariables = lib.mkIf config.userSettings.hyprland.enable { AQ_DRM_DEVICES = lib.mkForce "/dev/dri/card2:/dev/dri/card1"; }; diff --git a/modules/system/hyprland/default.nix b/modules/system/hyprland/default.nix index 00568cc..001d6a0 100644 --- a/modules/system/hyprland/default.nix +++ b/modules/system/hyprland/default.nix @@ -1,10 +1,4 @@ -{ - inputs, - pkgs, - config, - lib, - ... -}: +{ inputs, pkgs, config, lib, ... }: let cfg = config.systemSettings.hyprland; @@ -61,9 +55,7 @@ in ScreenWidth = 1920; ScreenHeight = 1080; blur = false; - }; - }) - ]; + };})]; }; services.upower.enable = true; @@ -98,9 +90,7 @@ in }; # # Ensures SDDM starts after the service. - systemd.services.sddm = { - after = [ "sddm-avatar.service" ]; - }; + systemd.services.sddm = { after = [ "sddm-avatar.service" ]; }; # xwayland services.xserver = { @@ -132,6 +122,7 @@ in alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + jack.enable = true; }; # Auto rotate screen diff --git a/modules/system/virtualization/winapps/default.nix b/modules/system/virtualization/winapps/default.nix new file mode 100644 index 0000000..1c715a7 --- /dev/null +++ b/modules/system/virtualization/winapps/default.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, inputs, ... }: + +let + cfg = config.systemSettings.virtualization.winapps; +in { + options = { + systemSettings.virtualization.winapps = { + enable = lib.mkEnableOption "Enable winapps"; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = with inputs.winapps.packages."${pkgs.system}"; [ + winapps + winapps-launcher + ] ++ [ pkgs.freerdp ]; + }; +} diff --git a/modules/themes/orichalcum/default.nix b/modules/themes/orichalcum/default.nix index c272791..f438ce9 100644 --- a/modules/themes/orichalcum/default.nix +++ b/modules/themes/orichalcum/default.nix @@ -5,8 +5,8 @@ credits = "Forked from Fernando Marques (https://github.com/RakkiUwU) and Gabriel Fontes (https://github.com/Misterio77))"; description = "Flagship theme of the LibrePhoenix Channel, named after a mythical metal"; polarity = "dark"; - backgroundUrl = "https://w.wallhaven.cc/full/m3/wallhaven-m3m1yk.png"; - backgroundSha256 = "sha256-KbLZPbXCIHUNvL6qKb3iD17Gkk/l08+UKavs0JxgezU="; + backgroundUrl = "https://wallpapers.com/images/hd/alluring-sunset-anime-scenery-r2gmgtcp8h9iwo9u.webp"; + backgroundSha256 = "sha256-jOd9SznQTa8AoO6cZGy0LhN8lBadrRf60FvyCEs2tLo="; base00 = "#1a181a"; base01 = "#262326"; base02 = "#302c30"; diff --git a/modules/user/art/default.nix b/modules/user/art/default.nix index 562d15a..a667e6d 100644 --- a/modules/user/art/default.nix +++ b/modules/user/art/default.nix @@ -1,14 +1,8 @@ -{ - config, - lib, - pkgs-stable, - ... -}: +{ config, lib, pkgs, ... }: let cfg = config.userSettings.art; -in -{ +in { options = { userSettings.art = { enable = lib.mkEnableOption "Enable art apps"; @@ -16,7 +10,7 @@ in }; config = lib.mkIf cfg.enable { - home.packages = with pkgs-stable; [ + home.packages = with pkgs; [ krita pinta inkscape @@ -28,7 +22,7 @@ in ]; userSettings.blender.enable = true; xdg.mimeApps.defaultApplications = lib.mkForce { - "image/svg+xml" = [ "org.inkscape.Inkscape.desktop" ]; + "image/svg+xml" = ["org.inkscape.Inkscape.desktop"]; }; }; } diff --git a/modules/user/engineering/default.nix b/modules/user/engineering/default.nix index 0728c58..9b692bb 100644 --- a/modules/user/engineering/default.nix +++ b/modules/user/engineering/default.nix @@ -1,15 +1,8 @@ -{ - config, - lib, - pkgs, - pkgs-stable, - ... -}: +{ config, lib, pkgs, ... }: let cfg = config.userSettings.engineering; -in -{ +in { options = { userSettings.engineering = { enable = lib.mkEnableOption "Enable engineering programs"; @@ -17,7 +10,7 @@ in }; config = lib.mkIf cfg.enable { - home.packages = with pkgs-stable; [ + home.packages = with pkgs; [ freecad openscad kicad @@ -31,23 +24,7 @@ in genericName = "3D Printing Software"; icon = "cura-icon"; exec = "cura -platformtheme gtk3 %u"; - mimeType = [ - "model/stl" - "application/vnd.ms-3mfdocument" - "application/prs.wavefront-obj" - "image/bmp" - "image/gif" - "image/jpeg" - "image/png" - "text/x-gcode" - "application/x-amf" - "application/x-ply" - "application/x-ctm" - "model/vnd.collada+xml" - "model/gltf-binary" - "model/gltf+json" - "model/vnd.collada+xml+zip" - ]; + mimeType = [ "model/stl" "application/vnd.ms-3mfdocument" "application/prs.wavefront-obj" "image/bmp" "image/gif" "image/jpeg" "image/png" "text/x-gcode" "application/x-amf" "application/x-ply" "application/x-ctm" "model/vnd.collada+xml" "model/gltf-binary" "model/gltf+json" "model/vnd.collada+xml+zip" ]; terminal = false; type = "Application"; prefersNonDefaultGPU = true; diff --git a/modules/user/godot/declarative-godot-settings/apply_settings.gd b/modules/user/godot/declarative-godot-settings/apply_settings.gd index d861dec..ac35778 100644 --- a/modules/user/godot/declarative-godot-settings/apply_settings.gd +++ b/modules/user/godot/declarative-godot-settings/apply_settings.gd @@ -89,8 +89,5 @@ func _run(): apply_setting("filesystem/directories/default_project_path", "/home/emmet/Projects") apply_setting("filesystem/import/blender/blender_path", "/home/emmet/.nix-profile/bin/blender") apply_setting("text_editor/behavior/indent/size", 2) - apply_setting("text_editor/external/exec_path", "zeditor") - apply_setting("text_editor/external/exec_flags", "{project} {file}:{line}:{col}") - apply_setting("text_editor/external/use_external_editor", true) apply_setting("editors/3d/navigation/emulate_numpad", false) apply_setting("project_manager/directory_naming_convention", 2) diff --git a/modules/user/hyprland/ashell.patch b/modules/user/hyprland/ashell.patch index 17cda7d..374f1f5 100644 --- a/modules/user/hyprland/ashell.patch +++ b/modules/user/hyprland/ashell.patch @@ -80,16 +80,3 @@ index c0c647d..9f7df19 100644 radius: self.radius.xl.into(), color: Color::TRANSPARENT, }, -diff --git a/src/outputs.rs b/src/outputs.rs -index 40ba453..915479f 100644 ---- a/src/outputs.rs -+++ b/src/outputs.rs -@@ -80,7 +80,7 @@ impl Outputs { - id, - namespace: "ashell-main-layer".to_string(), - size: Some((None, Some(height as u32))), -- layer: Layer::Bottom, -+ layer: Layer::Top, - pointer_interactivity: true, - keyboard_interactivity: KeyboardInteractivity::None, - exclusive_zone: height as i32, \ No newline at end of file diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix index 26afcdf..35fc567 100644 --- a/modules/user/hyprland/default.nix +++ b/modules/user/hyprland/default.nix @@ -115,7 +115,6 @@ in "sleep 5 && libinput-gestures" "obs-notification-mute-daemon" "alacritty --class scratch_term" - "blueman-applet" "kitty --class scratch_yazi -e yazi" "alacritty --class scratch_numbat -e numbat" "alacritty --class scratch_btm -e btm" @@ -392,6 +391,7 @@ in "size 70% 70%,title:(Resource)" "center,title:(Resource)" "tile,title:(Godot)" + "suppressevent maximize,class:^(steam)$" "float,title:^(Unlock Database - KeePassXC)$" "size 80% 85%,title:^(Unlock Database - KeePassXC)$" "center,title:^(Unlock Database - KeepassXC)$" @@ -429,8 +429,6 @@ in "ignorezero, ashell-main-layer" "animation fade,~nwggrid" "animation popin 80%, ashell-main-layer" - "order 66,ashell-main-layer" - "abovelock 2,ashell-main-layer" ]; blurls = lib.optionals (!performance) [ @@ -460,7 +458,6 @@ in home.packages = ( with pkgs; [ - qpwgraph networkmanagerapplet hyprland-monitor-attached alacritty diff --git a/modules/user/music/default.nix b/modules/user/music/default.nix index 2989dc9..97cba87 100644 --- a/modules/user/music/default.nix +++ b/modules/user/music/default.nix @@ -1,14 +1,8 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: let cfg = config.userSettings.music; -in -{ +in { options = { userSettings.music = { enable = lib.mkEnableOption "Enable apps for making music"; @@ -17,24 +11,26 @@ in config = lib.mkIf cfg.enable { home.packages = with pkgs; [ + ardour rosegarden + tenacity mediainfo easytag bottles # The following requires 64-bit FL Studio (FL64) to be installed to a bottle # With a bottle name of "FL Studio" (pkgs.writeShellScriptBin "flstudio" '' - #!/bin/sh - if [ -z "$1" ] - then - bottles-cli run -b "FL Studio" -p FL64 - #flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 - else - filepath=$(winepath --windows "$1") - echo \'"$filepath"\' - bottles-cli run -b "FL Studio" -p "FL64" --args \'"$filepath"\' - #flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 -args "$filepath" - fi + #!/bin/sh + if [ -z "$1" ] + then + bottles-cli run -b "FL Studio" -p FL64 + #flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 + else + filepath=$(winepath --windows "$1") + echo \'"$filepath"\' + bottles-cli run -b "FL Studio" -p "FL64" --args \'"$filepath"\' + #flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 -args "$filepath" + fi '') (pkgs.makeDesktopItem { name = "flstudio"; @@ -43,7 +39,7 @@ in terminal = false; type = "Application"; icon = "flstudio"; - mimeTypes = [ "application/octet-stream" ]; + mimeTypes = ["application/octet-stream"]; }) (stdenv.mkDerivation { name = "flstudio-icon"; diff --git a/modules/user/recording/default.nix b/modules/user/recording/default.nix index 85c151a..065a278 100644 --- a/modules/user/recording/default.nix +++ b/modules/user/recording/default.nix @@ -1,15 +1,8 @@ -{ - config, - lib, - pkgs, - pkgs-stable, - ... -}: +{ config, lib, pkgs, ... }: let cfg = config.userSettings.recording; -in -{ +in { options = { userSettings.recording = { enable = lib.mkEnableOption "Enable studio recording and editing programs"; @@ -23,9 +16,10 @@ in obs-vaapi obs-scale-to-sound ]; - home.packages = with pkgs-stable; [ + home.packages = with pkgs; [ kdePackages.kdenlive - #tenacity + tenacity + ardour ]; }; } diff --git a/modules/user/zed/default.nix b/modules/user/zed/default.nix index ec154ae..41b37ca 100644 --- a/modules/user/zed/default.nix +++ b/modules/user/zed/default.nix @@ -71,7 +71,6 @@ in }; project_panel = { starts_open = false; - auto_fold_dirs = false; }; active_pane_modifiers = { border_size = 0.0;