diff --git a/assets/mizukios-logo.png b/assets/mizukios-logo.png new file mode 100644 index 0000000..312e65f Binary files /dev/null and b/assets/mizukios-logo.png differ diff --git a/assets/wallpaper/wallpaper7.png b/assets/wallpaper/wallpaper7.png new file mode 100755 index 0000000..6ebb21f Binary files /dev/null and b/assets/wallpaper/wallpaper7.png differ diff --git a/flake.lock b/flake.lock index 3427029..f86cbc6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "amiaBot": { "flake": false, "locked": { - "lastModified": 1787968873, - "narHash": "sha256-4yj/DVb8coxS99S3DWODO6Z2ALwlPv+XCo+XYt0fwnk=", + "lastModified": 1790720710, + "narHash": "sha256-FDpKFzKSgIXksR87luW98hpDfhT0DI7YL2tjO69HAWE=", "ref": "refs/heads/main", - "rev": "1bb9e25c08a737923c8e27e07731f92ee6717a10", - "revCount": 43, + "rev": "e242cebc9ed5d168d1eca4686a1f99d82f5650b8", + "revCount": 57, "type": "git", "url": "ssh://forgejo@mizuki.guru/imnyang/amia" }, @@ -51,16 +51,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1788591592, - "narHash": "sha256-NbwVKwKLFl0oXub7oPjvmDaOygCtV2oboeKTu4xXFTk=", + "lastModified": 1789661079, + "narHash": "sha256-geVTQ51PGZ1mLULM5k7wO7qt/6xenOR/YG8X7Q3eCaI=", "owner": "Homebrew", "repo": "brew", - "rev": "08e85c4e42f5d8f1ea17c36cb59cf61c2ccb26c3", + "rev": "edb70f031e4170c780799633a1226ff73e1077f4", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "6.0.22", + "ref": "7.0.4", "repo": "brew", "type": "github" } @@ -70,11 +70,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1788792980, - "narHash": "sha256-TX/Z3PQZQVHgy4g9OZpflVpuazwturkGolsRDkFVHiU=", + "lastModified": 1791212692, + "narHash": "sha256-oPAfsTRNqAFsycAirLU05uTVKo3MaZf7fz88ekCeoO8=", "owner": "catppuccin", "repo": "nix", - "rev": "3142fdbeea0b181ad6600587dfe484ccb644dcc6", + "rev": "0c0335a1a6d326adb5a5e116aae0d51c7041b2e5", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1789285506, - "narHash": "sha256-f7R2NvLwKBAzhwg5hxu+NJhTAn4+i4VuZxe3VIa+aCA=", + "lastModified": 1791372183, + "narHash": "sha256-XPi47Kv3zro0gjRxuj1q+7Tdf6V2uSF+ALJq/eHbyAM=", "owner": "ilysenko", "repo": "codex-desktop-linux", - "rev": "f445a448d2f95766e5e0b9563618964a5250704f", + "rev": "20a27f51bf1618c4ba661b64512a9124117accd8", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1789226762, - "narHash": "sha256-Bk0Hoe3lVAo4ZO8AnDp0y6yJJ1NVsSXMb29VZSYpC+E=", + "lastModified": 1790950222, + "narHash": "sha256-5pIC7xGO441yD7ARxGSrEvydiBnOX4eTeuVuwhCfAyQ=", "owner": "chojs23", "repo": "concord", - "rev": "7a0456fa9b22fa8246b5cd55d23fdcf64ef9a9a2", + "rev": "5bac7a24165d975eb140192d4f62e08ddea282ce", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "dots-hyprland": { "flake": false, "locked": { - "lastModified": 1787806651, - "narHash": "sha256-G752F8ymZ2STu98RPh+M87hxFKDYpaofnjVcxj32eJo=", + "lastModified": 1791021215, + "narHash": "sha256-CMUdZDiHyWgp62qzFLIGBhjm7YPcRg/B6emSTM7572o=", "owner": "end-4", "repo": "dots-hyprland", - "rev": "97c5bc651f68092351b24aaa935af708b1e04514", + "rev": "33f31a08caddd41422a2d97670adeeb52b4f1e7c", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1789352311, - "narHash": "sha256-E9hlcRNSRQ1vb+UicOusX/ucroGlBAz/pYhCBorLOn4=", + "lastModified": 1791306979, + "narHash": "sha256-KuLePuhwJM9NLt/gTLHzXaOoSZKGoB3m7NfXjiQ98HY=", "owner": "nix-community", "repo": "home-manager", - "rev": "cfcda3f99334c8459fa4cd46cce87502e0b48f0a", + "rev": "fae6e9e42c3b762ab47635cddcfaf6f52374a61b", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1788642154, - "narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=", + "lastModified": 1790996401, + "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=", "owner": "nix-community", "repo": "home-manager", - "rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab", + "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35", "type": "github" }, "original": { @@ -343,11 +343,11 @@ ] }, "locked": { - "lastModified": 1787844471, - "narHash": "sha256-AKnBFjkZs4UGZqMT3yIkaCdpvM2fVccU1dVuK5AVZBk=", + "lastModified": 1791400091, + "narHash": "sha256-ciQ03pwbhGTGo/stNmNM8sEIKYKpUp1cXyIihp9zi1M=", "owner": "BlueManCZ", "repo": "hyprmod", - "rev": "ffd47d804d8996cf3852dbb7ca1c949c424a57fb", + "rev": "e148d221cc62edaa8d1b8ffac0f0a57edcb8e3c1", "type": "github" }, "original": { @@ -395,15 +395,16 @@ "millennium": { "inputs": { "millennium-src": "millennium-src", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_5", + "nixpkgs-bun": "nixpkgs-bun" }, "locked": { "dir": "packages/nix", - "lastModified": 1789326337, - "narHash": "sha256-FWRCpoKQ8TywKkcCFleTSZRQhbL12JmbFdisaeIRIJU=", + "lastModified": 1791044936, + "narHash": "sha256-+mNY2lHscvVa4KntAxuRMMFYMYxju06avIKyHooM8EE=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "41f7356df31043e8c1429382dda95445530da987", + "rev": "63c3928f0306edd83122c0f5b085a9b1a3d60f55", "type": "github" }, "original": { @@ -416,17 +417,17 @@ "millennium-src": { "flake": false, "locked": { - "lastModified": 1787082953, - "narHash": "sha256-zgr4cdJfye4qunpD3ClNnZ9D1WPGQAXV0CnYwEbB52s=", + "lastModified": 1790436335, + "narHash": "sha256-ghYUa4gPLV/VOflM2zkl/gtdwLWHQpRxG4boQoj4yKM=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "513b02e809b0eb120ecf0ae12e548798dd756323", + "rev": "765aa8802f8a4d942ad8ac8323a9e0f233a50fa8", "type": "github" }, "original": { "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "513b02e809b0eb120ecf0ae12e548798dd756323", + "rev": "765aa8802f8a4d942ad8ac8323a9e0f233a50fa8", "type": "github" } }, @@ -454,11 +455,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1787844484, - "narHash": "sha256-kskLu8I0fEuvItuHgTa4NvfcCAGc1xksgQrOs3frGuU=", + "lastModified": 1789527185, + "narHash": "sha256-2KmikuO59LLbJfHNcEMTmPrYep/ZGF0mph6tYEiHRP4=", "owner": "imnyang", "repo": "muvel-nix", - "rev": "142e832aa14d18c70d926f21ff7c7449a3143772", + "rev": "7a5e1b133e20c773422726aa2955c8c911dcc7be", "type": "github" }, "original": { @@ -491,11 +492,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1789296110, - "narHash": "sha256-8wVBx1J5hR1DzUyzlrm2DkMXx7RJbATh3+R+qBBILlI=", + "lastModified": 1790428548, + "narHash": "sha256-OsZ/I7v3ArCrk0XOUvkiU1dFtGtE1qZTHRGjvBXIKUU=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "0f392e302963bce69787c495aa95ef1d50dda889", + "rev": "f1f045fc8b35ff59f88982c1752d3f3a42ca6a61", "type": "github" }, "original": { @@ -509,11 +510,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1788981439, - "narHash": "sha256-fEaFq0XgpgWFPLfpq1UK4/8ylHd2T0+fo6O3hKz1LUM=", + "lastModified": 1789928041, + "narHash": "sha256-iV37ieTcE4ZLOYEe0VznW6dWMBe4lEL8AbK1vblyZGM=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "09a921d0181146cf6163ec2cc1db7b6fd539a885", + "rev": "c11cccfdd36dd69b5323d70d354b2853379c2426", "type": "github" }, "original": { @@ -527,15 +528,16 @@ "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_8", - "nixpkgs-nixcord": "nixpkgs-nixcord", + "nixpkgs-ci": "nixpkgs-ci", + "nixpkgs-packages": "nixpkgs-packages", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1789288898, - "narHash": "sha256-6bMO4bJzMqoyDM/vMx7ZECdjvj3V1DR1JlYYVUArT3k=", + "lastModified": 1791432440, + "narHash": "sha256-RHcvphkbVMk/tCHHJTW313f3s+uoV4o1fyvPKA2/SOw=", "owner": "4evy", "repo": "nixcord", - "rev": "ddf1cc35c235a2e7103c942eafacdcb96b65d2d0", + "rev": "4886fc3737858f4817a79f9afefea6158f317f9b", "type": "github" }, "original": { @@ -566,11 +568,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1786534138, - "narHash": "sha256-Cwffw7dPM56d8spt4/queFQ1cKg69D9qrsp+wfwKvfo=", - "rev": "044bfe75bfe4c7bbe043dc17b5e42ea823b84a09", + "lastModified": 1790652569, + "narHash": "sha256-k8Fu4c9Z+4Nh7mUr0cfw++ITQiyEhlWxoJBOkI3tOcQ=", + "rev": "b6c8664de9b6cc07fe5666a29f91884ba81197c4", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1052792.044bfe75bfe4/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1082290.b6c8664de9b6/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -593,6 +595,35 @@ "type": "github" } }, + "nixpkgs-bun": { + "locked": { + "lastModified": 1790822859, + "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", + "type": "github" + } + }, + "nixpkgs-ci": { + "locked": { + "lastModified": 1791130267, + "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=", + "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" + } + }, "nixpkgs-libxml2": { "locked": { "lastModified": 1751274312, @@ -609,29 +640,26 @@ "type": "github" } }, - "nixpkgs-nixcord": { + "nixpkgs-packages": { "locked": { - "lastModified": 1788921488, - "narHash": "sha256-8+xWRxEkD6l217cIUdRxfeUGS9lQX0hVtUuNVsBaDzk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6aefcda9401be8acc2b74244fb3b37520ea1f0a8", - "type": "github" + "lastModified": 1791130267, + "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=", + "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst" }, "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "nixpkgs_10": { "locked": { - "lastModified": 1789149629, - "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", + "lastModified": 1791260994, + "narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", + "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4", "type": "github" }, "original": { @@ -659,11 +687,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1789149629, - "narHash": "sha256-eQUZVehWLDBbpBR2rq6DnuRee1ULT6Y675RhsYDSjYI=", - "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", + "lastModified": 1790822859, + "narHash": "sha256-VBA0QerzzmL+4wxgtwiCdiLwLpJg2/9xOxhgO3BRJQA=", + "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1072397.eaad089433ca/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1083223.c59305bab206/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -672,11 +700,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1787900134, - "narHash": "sha256-VYXO0XZlgj06dxJZRhrD3WoSsvq/c7+/Akyoa22pefw=", + "lastModified": 1790578696, + "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c", + "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f", "type": "github" }, "original": { @@ -752,18 +780,15 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", - "type": "github" + "lastModified": 1790769526, + "narHash": "sha256-6j4yqqBUvIbBn29k0y/2jqlv/YJd8CRkTBYhfm5Z/8c=", + "rev": "c9fe7d12cd78d1adcd12dd15e24432dde5b155a0", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1082837.c9fe7d12cd78/nixexprs.tar.zst?lastModified=1790769526&rev=c9fe7d12cd78d1adcd12dd15e24432dde5b155a0" }, "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "nixpkgs_6": { @@ -800,18 +825,15 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1788921488, - "narHash": "sha256-8+xWRxEkD6l217cIUdRxfeUGS9lQX0hVtUuNVsBaDzk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6aefcda9401be8acc2b74244fb3b37520ea1f0a8", - "type": "github" + "lastModified": 1791143449, + "narHash": "sha256-XvTu5S/TUsH4Jn9WRXSJfSxD7kHN4OzM/y+sKEzN8rU=", + "rev": "0d9e9b832d03ac387417e16ce1febf73b2e631e1", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.11216.0d9e9b832d03/nixexprs.tar.zst" }, "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst" } }, "nixpkgs_9": { @@ -859,16 +881,16 @@ ] }, "locked": { - "lastModified": 1788096061, - "narHash": "sha256-kjnCgTn45XzFmoiHZYFZsToyc+TXHQ43Nk0UkEbhw68=", + "lastModified": 1790166579, + "narHash": "sha256-+mz4dMdNgEx/GfGophP2B1WCrWonBrFFM1cF+pEz2h8=", "owner": "vicinaehq", "repo": "numen", - "rev": "0ed1b2bfddd6adfa367acfa46148e2b9c5a5b818", + "rev": "7db7b2069412d3f6bed4b0cf83167c7ad413f231", "type": "github" }, "original": { "owner": "vicinaehq", - "ref": "v0.6.1", + "ref": "v0.7.0", "repo": "numen", "type": "github" } @@ -917,11 +939,11 @@ }, "quadlet-nix": { "locked": { - "lastModified": 1785695563, - "narHash": "sha256-kE3JCUeQA4CXlLl5TglmKceOJP+ZF/CwkHngiZ3yS00=", + "lastModified": 1790641475, + "narHash": "sha256-G/priWdc/7y1Fogok9rn6WS4KhbYpTr2B2PwSMt3ekA=", "owner": "SEIAROTg", "repo": "quadlet-nix", - "rev": "b6ff6c4d6b36b8e29bce417b668597fab3e03160", + "rev": "db3af9df6943692c78cf9a05e3bfeb7d82e94cf3", "type": "github" }, "original": { @@ -1010,11 +1032,11 @@ ] }, "locked": { - "lastModified": 1786633267, - "narHash": "sha256-2xMfAqVcFGUv5KSTPyPQo8lYFEhpRz79U1SeZDyDQ0g=", + "lastModified": 1791042015, + "narHash": "sha256-FqDKwfZF9HopiOwNI0aDk12HP4kn6ScY8QybAkvfHG0=", "owner": "rustfs", "repo": "rustfs-flake", - "rev": "0eeef21f2410ba0e47fbbf44b3ba70fc8f19d468", + "rev": "c3a5e7737c0e283a3b421681472aa8668c3cc813", "type": "github" }, "original": { @@ -1030,11 +1052,11 @@ ] }, "locked": { - "lastModified": 1788914643, - "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=", + "lastModified": 1791103873, + "narHash": "sha256-nFxM+pKoZ8LJAEnUXARyCaOAloWgaW9kZQOSjWzKcTE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "13616fff713a9f94055c66f15687ebdc17a335df", + "rev": "dcd241ba97088c22569d1573286e1b9daad340c0", "type": "github" }, "original": { @@ -1071,11 +1093,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1789291406, - "narHash": "sha256-lfZ7yAaTZMuAzOSLjJ7ivrKIFk0E11koWTVgkWSXwuE=", + "lastModified": 1791109926, + "narHash": "sha256-N4ZWEoceF9U+np24Pzi8OjJwqjoe36zHUR31pEhUKng=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "09eed5c95105aada9ffabd4c7eb6b345dc4ba66f", + "rev": "32d97b6b3c3401e5d0e474c82e764f8f9bf35b86", "type": "github" }, "original": { @@ -1197,11 +1219,11 @@ ] }, "locked": { - "lastModified": 1786901030, - "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", + "lastModified": 1791198660, + "narHash": "sha256-f8Pye933T60vreB9u9pqfAXDyBqO13U7H0LvPsOxCIA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", + "rev": "8b367b728be38d1bb7206f037c9df9989df3353a", "type": "github" }, "original": { @@ -1218,11 +1240,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1789264173, - "narHash": "sha256-0HJXRtDuLqbAF4ThAobZz1FhZjRlxitnVVJWbsSULFc=", + "lastModified": 1791309532, + "narHash": "sha256-pYorP5iwAlMTkyutP7P3i40B/VLFO9VUD0BjcmSGsvM=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "602f510c3404b57ad45148de55a046dc8f194e0f", + "rev": "b66cc7241a33bf1b1181cbac6de4f9e00042d9cb", "type": "github" }, "original": { @@ -1241,11 +1263,11 @@ "vicinae": "vicinae_2" }, "locked": { - "lastModified": 1788877077, - "narHash": "sha256-Os614eK4hYC8l9cECt2zBiQbrdv+9q2AyrliHfiEf5A=", + "lastModified": 1791201649, + "narHash": "sha256-/wl3XkJ/1kyE3X9IYwkSC2Eatlnez4z28eqnFgOaG+o=", "owner": "vicinaehq", "repo": "extensions", - "rev": "ee117bc64f341ed71b4a27e311f343b12a75f43d", + "rev": "413154812ffce610218c523b9c479febe46c5327", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7124904..40eb298 100644 --- a/flake.nix +++ b/flake.nix @@ -146,6 +146,8 @@ }) ]; }) + (import ./overlays/breakpad.nix) + (import ./overlays/obs-move-transition.nix) (import ./overlays/hoffice) ]; diff --git a/hosts/machine/ena/home/config/hyprland.nix b/hosts/machine/ena/home/config/hyprland.nix index 02149f3..7bfdac8 100644 --- a/hosts/machine/ena/home/config/hyprland.nix +++ b/hosts/machine/ena/home/config/hyprland.nix @@ -490,6 +490,18 @@ EOF local mainMod = "SUPER" -- Hyprland 0.55+ Lua configuration. + -- Enable VRR on the built-in 120 Hz panel only. External outputs use the + -- fallback rule below and keep their own/default VRR capability. + hl.monitor({ + output = "eDP-1", + mode = "preferred", + position = "auto", + scale = 1.33, + vrr = 1, + }) + + -- Newly detected outputs are enabled at their preferred mode and placed + -- automatically to the right of the existing layout. hl.monitor({ output = "", mode = "preferred", @@ -837,7 +849,12 @@ in }; xdg.configFile = { - "hypr/hyprland.lua".text = hyprlandLuaConfig; + "hypr/hyprland.lua" = { + text = hyprlandLuaConfig; + # A previous activation left a regular file and a .backup2 copy. Keep + # that existing backup and let Home Manager refresh the managed config. + force = true; + }; "hypr/colors.conf".text = colorsConfig; "hypr/hypridle.conf".source = "${upstream}/hypr/hypridle.conf"; "hypr/hyprlock.conf".text = hyprlockConfig; diff --git a/hosts/machine/ena/home/packages.nix b/hosts/machine/ena/home/packages.nix index b1167ce..e83e0f3 100644 --- a/hosts/machine/ena/home/packages.nix +++ b/hosts/machine/ena/home/packages.nix @@ -29,6 +29,7 @@ with pkgs; # inputs.waterfox.packages.${pkgs.system}.waterfox gnome-network-displays element-desktop + parsec-bin (tetrio-desktop.override { withTetrioPlus = true; tetrio-plus = tetrioPlus; diff --git a/hosts/machine/kanade/modules/homebrew/casks.nix b/hosts/machine/kanade/modules/homebrew/casks.nix index 837bfd6..f5bf2aa 100644 --- a/hosts/machine/kanade/modules/homebrew/casks.nix +++ b/hosts/machine/kanade/modules/homebrew/casks.nix @@ -21,7 +21,6 @@ # Development "android-studio" "burp-suite" - "docker-desktop" "unity-hub" "visual-studio-code@insiders" "zed" diff --git a/hosts/machine/kanade/modules/mac/wallpaper.nix b/hosts/machine/kanade/modules/mac/wallpaper.nix index 9cf7efb..02dccff 100644 --- a/hosts/machine/kanade/modules/mac/wallpaper.nix +++ b/hosts/machine/kanade/modules/mac/wallpaper.nix @@ -4,7 +4,7 @@ ... }: let - wallpaper = "${inputs.self}/assets/wallpaper/wallpaper6.png"; + wallpaper = "${inputs.self}/assets/wallpaper/wallpaper.png"; setWallpaperScript = pkgs.writeShellScriptBin "set-wallpaper-script" '' set -eu diff --git a/hosts/machine/mizuki/configuration.nix b/hosts/machine/mizuki/configuration.nix index bb26e02..008f6b1 100644 --- a/hosts/machine/mizuki/configuration.nix +++ b/hosts/machine/mizuki/configuration.nix @@ -17,6 +17,9 @@ "${inputs.self}/modules/mizukios/features/_1password.nix" ]; + # Avoid full-store scans, including missed timer runs after boot. + nix.optimise.automatic = lib.mkForce false; + networking = { hostName = "mizuki"; interfaces = { diff --git a/hosts/machine/mizuki/home/config/plasma.nix b/hosts/machine/mizuki/home/config/plasma.nix index 5f33dda..2fc0a3a 100644 --- a/hosts/machine/mizuki/home/config/plasma.nix +++ b/hosts/machine/mizuki/home/config/plasma.nix @@ -10,7 +10,7 @@ in theme = "pjsk-cursor-n25-mizuki-ani"; }; - programs.plasma.workspace.wallpaper = "${assets}/wallpaper/wallpaper5.png"; + programs.plasma.workspace.wallpaper = "${assets}/wallpaper/wallpaper7.png"; - programs.plasma.kscreenlocker.appearance.wallpaper = "${assets}/wallpaper/wallpaper5.png"; + programs.plasma.kscreenlocker.appearance.wallpaper = "${assets}/wallpaper/wallpaper7.png"; } diff --git a/hosts/machine/mizuki/home/default.nix b/hosts/machine/mizuki/home/default.nix index c1ca124..19d10b2 100644 --- a/hosts/machine/mizuki/home/default.nix +++ b/hosts/machine/mizuki/home/default.nix @@ -30,6 +30,7 @@ "${inputs.self}/modules/home/firefox-devedition.nix" "${inputs.self}/modules/home/vicinae.nix" "${inputs.self}/modules/home/fastfetch.nix" + "${inputs.self}/modules/home/alcom.nix" ./config/shell.nix ./config/plasma.nix "${inputs.self}/modules/home/discord/linux.nix" diff --git a/hosts/machine/mizuki/home/packages.nix b/hosts/machine/mizuki/home/packages.nix index 9955c0f..3a1a81e 100644 --- a/hosts/machine/mizuki/home/packages.nix +++ b/hosts/machine/mizuki/home/packages.nix @@ -16,12 +16,11 @@ with pkgs; android-tools android-cli - alcom vrc-get vrcvideocacher - inputs.imnyang.packages.${pkgs.system}.figma-linux + inputs.imnyang.packages.${pkgs.stdenv.hostPlatform.system}.figma-linux # waterfox-bin - # inputs.waterfox.packages.${pkgs.system}.waterfox + # inputs.waterfox.packages.${pkgs.stdenv.hostPlatform.system}.waterfox ] diff --git a/hosts/server/hikari/hako/home.nix b/hosts/server/hikari/hako/home.nix index d9c9f10..60c49a2 100644 --- a/hosts/server/hikari/hako/home.nix +++ b/hosts/server/hikari/hako/home.nix @@ -32,7 +32,7 @@ EOF XDG_CONFIG_HOME="$config_home" \ XDG_STATE_HOME="$state_home" \ - "${inputs.concord.packages.${pkgs.system}.default}/bin/concord" "$@" + "${inputs.concord.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/concord" "$@" ''; in { diff --git a/hosts/server/hikari/hako/services/nc.nix b/hosts/server/hikari/hako/services/nc.nix index f6b2d92..07bfe45 100644 --- a/hosts/server/hikari/hako/services/nc.nix +++ b/hosts/server/hikari/hako/services/nc.nix @@ -54,7 +54,7 @@ EOF StateDirectoryMode = "0750"; WorkingDirectory = "/var/lib/mizuki-nc"; - ExecStart = "${inputs.mizuki-nc.packages.${pkgs.system}.default}/bin/mizuki-nc"; + ExecStart = "${inputs.mizuki-nc.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/mizuki-nc"; Restart = "always"; RestartSec = 3; diff --git a/modules/home/alcom.nix b/modules/home/alcom.nix new file mode 100644 index 0000000..16dc046 --- /dev/null +++ b/modules/home/alcom.nix @@ -0,0 +1,29 @@ +{ pkgs, ... }: + +let + alcomFhs = pkgs.symlinkJoin { + name = "alcom-fhs"; + + paths = [ + pkgs.alcom + ]; + + postBuild = '' + rm -f "$out/bin/ALCOM" + + cat > "$out/bin/ALCOM" <<'EOF' + #!${pkgs.runtimeShell} + exec ${pkgs.unityhub.fhsEnv}/bin/unityhub-fhs-env \ + ${pkgs.alcom}/bin/ALCOM "$@" + EOF + + chmod +x "$out/bin/ALCOM" + ''; + }; +in +{ + home.packages = [ + pkgs.unityhub + alcomFhs + ]; +} diff --git a/modules/home/devtool/ghostty.nix b/modules/home/devtool/ghostty.nix index 2c95aa9..1f8377a 100644 --- a/modules/home/devtool/ghostty.nix +++ b/modules/home/devtool/ghostty.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { programs.ghostty = { enable = true; - package = if pkgs.stdenv.isDarwin then pkgs.ghostty-bin else pkgs.ghostty; + package = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.ghostty-bin else pkgs.ghostty; enableFishIntegration = true; diff --git a/modules/home/devtool/vscode.nix b/modules/home/devtool/vscode.nix index f5a4ad2..73cd1a9 100644 --- a/modules/home/devtool/vscode.nix +++ b/modules/home/devtool/vscode.nix @@ -31,7 +31,7 @@ in src = builtins.fetchTarball { url = "https://code.visualstudio.com/sha/download?build=insider&os=linux-x64"; - sha256 = "0lcx0bh0r4lsll47b45qd69871lrcwg43s903p6gddcdi9k48lav"; + sha256 = "0h09nxhlvjmc3p20khpwh4jy4618wg1pv0lz8x3ls7mkny99m25r"; }; buildInputs = oldAttrs.buildInputs ++ [ diff --git a/modules/home/devtool/zed.nix b/modules/home/devtool/zed.nix index c3e65c5..8c536b3 100644 --- a/modules/home/devtool/zed.nix +++ b/modules/home/devtool/zed.nix @@ -3,7 +3,7 @@ { programs.zed-editor = { enable = true; - package = if pkgs.stdenv.isDarwin then null else pkgs.zed-editor; + package = if pkgs.stdenv.hostPlatform.isDarwin then null else pkgs.zed-editor; extensions = [ "nix" "toml" diff --git a/modules/home/discord/linux.nix b/modules/home/discord/linux.nix index 2eb7696..8117dbd 100644 --- a/modules/home/discord/linux.nix +++ b/modules/home/discord/linux.nix @@ -3,12 +3,47 @@ inputs, ... }: +let + nixcordPackages = inputs.nixcord.packages.${pkgs.stdenv.hostPlatform.system}; + + patchGifenc = '' + substituteInPlace package.json \ + --replace-fail \ + 'github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3' \ + '1.0.3' + substituteInPlace pnpm-lock.yaml \ + --replace-fail \ + 'github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3' \ + '1.0.3' \ + --replace-fail \ + 'https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3' \ + '1.0.3' \ + --replace-fail \ + 'resolution: {gitHosted: true, tarball: 1.0.3}' \ + 'resolution: {integrity: sha512-xdr6AdrfGBcfzncONUOlXMBuc5wJDtOueE3c5rdG0oNgtINLD+f2iFZltrBRZYzACRbKr+mSVU/x98zv2u3jmw==}' + ''; + + refreshPnpmDeps = package: hash: + package.overrideAttrs (old: { + postPatch = (old.postPatch or "") + patchGifenc; + pnpmDeps = old.pnpmDeps.overrideAttrs (deps: { + outputHash = hash; + outputHashAlgo = "sha256"; + postPatch = (deps.postPatch or "") + patchGifenc; + }); + }); +in { imports = [ inputs.nixcord.homeModules.nixcord ]; programs.nixcord = { enable = true; + # Use Nixcord's pinned package set; the host package set's pnpm hook + # cannot consume the Equicord Git tarball snapshot offline. + useGlobalPkgs = false; discord = { + vencord.package = refreshPnpmDeps nixcordPackages.vencord "sha256-Me4M6ATfnTMifltjeCl/zn/qUrBUwOJuWkrCPw4VU5Q="; + equicord.package = refreshPnpmDeps nixcordPackages.equicord "sha256-wXQg11c6EUT0xFlP1pYwMNzdVKdg5Gv3gcdolDrnGCk="; branches = [ "stable" ]; # Electron's Vulkan backend crashes on the NVIDIA render node under # native Wayland. Keep Wayland and hardware acceleration, but use GL. diff --git a/modules/home/discord/mac.nix b/modules/home/discord/mac.nix index 34c6fd7..870d6a1 100644 --- a/modules/home/discord/mac.nix +++ b/modules/home/discord/mac.nix @@ -1,5 +1,8 @@ # darwin-configuration.nix { inputs, pkgs, ... }: +let + nixcordPackages = inputs.nixcord.packages.${pkgs.stdenv.hostPlatform.system}; +in { imports = [ inputs.nixcord.darwinModules.nixcord ]; @@ -8,7 +11,7 @@ user = "imnyang"; # Needed for system-level config discord = { - package = pkgs.discord-canary; + package = nixcordPackages.discord-canary; equicord.enable = true; branches = [ "canary" ]; }; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 17a0800..e207d8f 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -100,5 +100,7 @@ with pkgs; galaxy-buds-client + ffmpeg + # another ] diff --git a/modules/mizukios/base/i18n.nix b/modules/mizukios/base/i18n.nix index 451f66a..99009a8 100644 --- a/modules/mizukios/base/i18n.nix +++ b/modules/mizukios/base/i18n.nix @@ -24,6 +24,8 @@ settings.globalOptions = { "Hotkey/TriggerKeys" = { "0" = "Alt_R"; + # KDE's korean:ralt_hangul option maps right Alt to Hangul. + "1" = "Hangul"; }; "Hotkey/ActivateKeys" = { "0" = "Hangul_Hanja"; diff --git a/modules/mizukios/base/mizukios/assets/mizukios-logo.nix b/modules/mizukios/base/mizukios/assets/mizukios-logo.nix index 214b348..1ca467f 100644 --- a/modules/mizukios/base/mizukios/assets/mizukios-logo.nix +++ b/modules/mizukios/base/mizukios/assets/mizukios-logo.nix @@ -1,15 +1,11 @@ { stdenvNoCC, - fetchurl, imagemagick, }: stdenvNoCC.mkDerivation { pname = "mizukios-logo"; version = "1.0"; - src = fetchurl { - url = "https://miyo.moe/pub/img/%E1%84%86%E1%85%B5%E1%84%8C%E1%85%B3%E1%84%8F%E1%85%B5.png"; - hash = "sha256-ZHQkYO4HvBjccXtQGTRcNcl7f1noibOTP6Cq71OKFP4="; - }; + src = ../../../../../assets/mizukios-logo.png; nativeBuildInputs = [ imagemagick diff --git a/overlays/breakpad-module-factory.patch b/overlays/breakpad-module-factory.patch new file mode 100644 index 0000000..0bdbe96 --- /dev/null +++ b/overlays/breakpad-module-factory.patch @@ -0,0 +1,33 @@ +diff --git a/src/processor/basic_source_line_resolver.cc b/src/processor/basic_source_line_resolver.cc +--- a/src/processor/basic_source_line_resolver.cc ++++ b/src/processor/basic_source_line_resolver.cc +@@ -109,0 +110,5 @@ ++BasicSourceLineResolver::Module* BasicModuleFactory::CreateModule( ++ const string& name) const { ++ return new BasicSourceLineResolver::Module(name); ++} ++ +diff --git a/src/processor/fast_source_line_resolver.cc b/src/processor/fast_source_line_resolver.cc +--- a/src/processor/fast_source_line_resolver.cc ++++ b/src/processor/fast_source_line_resolver.cc +@@ -62,0 +63,5 @@ ++FastSourceLineResolver::Module* FastModuleFactory::CreateModule( ++ const string& name) const { ++ return new FastSourceLineResolver::Module(name); ++} ++ +diff --git a/src/processor/module_factory.h b/src/processor/module_factory.h +--- a/src/processor/module_factory.h ++++ b/src/processor/module_factory.h +@@ -54,4 +54,2 @@ + virtual BasicSourceLineResolver::Module* CreateModule( +- const string& name) const { +- return new BasicSourceLineResolver::Module(name); +- } ++ const string& name) const; +@@ -63,4 +61,2 @@ + virtual FastSourceLineResolver::Module* CreateModule( +- const string& name) const { +- return new FastSourceLineResolver::Module(name); +- } ++ const string& name) const; diff --git a/overlays/breakpad.nix b/overlays/breakpad.nix new file mode 100644 index 0000000..02f7161 --- /dev/null +++ b/overlays/breakpad.nix @@ -0,0 +1,5 @@ +final: prev: { + breakpad = prev.breakpad.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ ./breakpad-module-factory.patch ]; + }); +} diff --git a/overlays/obs-move-transition.nix b/overlays/obs-move-transition.nix new file mode 100644 index 0000000..2eef6c8 --- /dev/null +++ b/overlays/obs-move-transition.nix @@ -0,0 +1,14 @@ +final: prev: +let + oldPackage = prev.obs-studio-plugins.obs-move-transition; + oldEnv = oldPackage.env or { }; +in +{ + obs-studio-plugins = prev.obs-studio-plugins // { + obs-move-transition = oldPackage.overrideAttrs (_: { + env = oldEnv // { + NIX_CFLAGS_COMPILE = (oldEnv.NIX_CFLAGS_COMPILE or "") + " -Wno-error=deprecated-declarations"; + }; + }); + }; +}