diff --git a/flake.lock b/flake.lock index 4a5434c..ca52380 100644 --- a/flake.lock +++ b/flake.lock @@ -120,6 +120,21 @@ "type": "github" } }, + "cargo-doc-live": { + "locked": { + "lastModified": 1724704668, + "narHash": "sha256-kJFYXlWUodg5WhJ0NuvrP0mCvOT/2AOIo8oGeYLXocs=", + "owner": "srid", + "repo": "cargo-doc-live", + "rev": "b09d5d258d2498829e03014931fc19aed499b86f", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "cargo-doc-live", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -179,22 +194,6 @@ } }, "devour-flake": { - "flake": false, - "locked": { - "lastModified": 1733242247, - "narHash": "sha256-RrSH+9vlDDDh+yZao012bvV8Hoej/5poQQYfYlEr6Zw=", - "owner": "srid", - "repo": "devour-flake", - "rev": "017e3a0eb62e2a3d63fb20c5028af71f39a81181", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "devour-flake", - "type": "github" - } - }, - "devour-flake_2": { "flake": false, "locked": { "lastModified": 1726283167, @@ -239,11 +238,11 @@ ] }, "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", + "lastModified": 1729281548, + "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", "owner": "nix-community", "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", + "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", "type": "github" }, "original": { @@ -283,11 +282,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733976205, - "narHash": "sha256-GjNY1VcpItYjU8D4+Maumj9eY06ASF05Q8eZApnRvrY=", + "lastModified": 1729491205, + "narHash": "sha256-luvUK8ZTRTdsVao7VqnxvGEvA3rjEmfiwakDyHxQhx8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "46f83e2238a7028d4fd9cc266eea47a2dd8ff14b", + "rev": "9764579885c84ba5d4bcd9d3061409a527ff805c", "type": "gitlab" }, "original": { @@ -299,11 +298,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -331,11 +330,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -413,11 +412,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -452,11 +451,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -474,11 +473,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -497,11 +496,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -527,27 +526,6 @@ "type": "github" } }, - "flake-parts_7": { - "inputs": { - "nixpkgs-lib": [ - "omnix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-root": { "locked": { "lastModified": 1692742795, @@ -601,11 +579,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -667,11 +645,11 @@ ] }, "locked": { - "lastModified": 1733665616, - "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -700,11 +678,11 @@ ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -805,16 +783,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "46.1", "repo": "gnome-shell", "type": "github" } @@ -829,11 +807,11 @@ ] }, "locked": { - "lastModified": 1733333617, - "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", + "lastModified": 1724947644, + "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", + "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", "type": "github" }, "original": { @@ -870,16 +848,16 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -893,11 +871,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1729260213, + "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "type": "github" }, "original": { @@ -923,36 +901,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -987,15 +935,14 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_2", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733962285, - "narHash": "sha256-djpjqhPZkqfe1USsuu+eT4ZyGO+dVvAf3l4FUCZEb6Y=", + "lastModified": 1729147490, + "narHash": "sha256-F0/iQVbbIFctMPwK4JEd4fxVzNwaq7NnD5oen59S24s=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "2025aef04baf723bfa4cb8225fc11a319a5681f1", + "rev": "e2047498667aeb24e8493ff430a20cff713915f4", "type": "github" }, "original": { @@ -1007,11 +954,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1733924897, - "narHash": "sha256-Fxzl754uzyNebXW54LUliFliMbw30XG+bdb0AVtPSM0=", + "lastModified": 1729121305, + "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", "owner": "neovim", "repo": "neovim", - "rev": "442d338cb50e4cf08c58cb82b6d33b6d5df9fb1b", + "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", "type": "github" }, "original": { @@ -1064,11 +1011,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1728901530, + "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", "type": "github" }, "original": { @@ -1175,30 +1122,30 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1729307008, + "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-lib_2": { @@ -1237,11 +1184,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -1253,11 +1200,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733749988, - "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", + "lastModified": 1728863046, + "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", + "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", "type": "github" }, "original": { @@ -1283,22 +1230,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts_3", @@ -1309,11 +1240,11 @@ "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1734450520, - "narHash": "sha256-w+0iMuV8XSYqCLI7opcvvkKcm6XK7t9K4mA66p3PLEM=", + "lastModified": 1729522414, + "narHash": "sha256-E5yfkcaAlRq4URmlfsHJYMokF8zBa5zLT0q61AzF91s=", "owner": "callumio", "repo": "nixvim", - "rev": "14d4b36db328f4f8a77e5c1c0397d07bb1ff0164", + "rev": "ad094d9bc75a83e270c96d253cf70931f1dfda1b", "type": "github" }, "original": { @@ -1338,14 +1269,14 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733953545, - "narHash": "sha256-1UsUuIfq0ywIxmYBJdIi6tFFmpR/RtOBQVijARaaX68=", + "lastModified": 1729438888, + "narHash": "sha256-TGTDOX2/5OIoSzlcRReVn4BbbfL6Ami/eassiPPGqNA=", "owner": "nix-community", "repo": "nixvim", - "rev": "c7b109f5af93f8e59148a1a4838f3472f8ae403d", + "rev": "47b563d4e1410bff6a9481b3dd8b01b1e5ed70d2", "type": "github" }, "original": { @@ -1387,7 +1318,6 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_3", - "ixx": "ixx", "nixpkgs": [ "nixvim", "nixvim", @@ -1395,11 +1325,11 @@ ] }, "locked": { - "lastModified": 1733411491, - "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "lastModified": 1728905062, + "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", "owner": "NuschtOS", "repo": "search", - "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", "type": "github" }, "original": { @@ -1411,14 +1341,22 @@ "omnix": { "inputs": { "cachix-push": "cachix-push", - "devour-flake": "devour-flake_2", - "flake-parts": "flake-parts_7", + "cargo-doc-live": "cargo-doc-live", + "devour-flake": [ + "devour-flake" + ], + "flake-parts": [ + "flake-parts" + ], "inspect": "inspect", "nix-systems-aarch64-darwin": "nix-systems-aarch64-darwin", "nix-systems-aarch64-linux": "nix-systems-aarch64-linux", "nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin", "nix-systems-x86_64-linux": "nix-systems-x86_64-linux", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], + "process-compose-flake": "process-compose-flake", "rust-flake": "rust-flake", "systems": [ "systems" @@ -1428,11 +1366,11 @@ ] }, "locked": { - "lastModified": 1733936163, - "narHash": "sha256-IFSrHmmbo4rX7/UBjEYUYZHbHo9Amcc2+762Mgp+aVQ=", + "lastModified": 1729440249, + "narHash": "sha256-QAcIrU1F/pMhMEa/iifwtIRx5m20LWBV7G9ivvWjRrc=", "owner": "juspay", "repo": "omnix", - "rev": "9aa5d61ed6bc50a95db0ae633b184f91545588cf", + "rev": "f1ac2222215a2c4db15297bef601b1c8c0e39c2b", "type": "github" }, "original": { @@ -1453,11 +1391,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1733665616, - "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1493,6 +1431,21 @@ "type": "github" } }, + "process-compose-flake": { + "locked": { + "lastModified": 1718031437, + "narHash": "sha256-+RrlkAVZx0QhyeHAGFJnjST+/7Dc3zsDU3zAKXoDXaI=", + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "rev": "9344fac44edced4c686721686a6ad904d067c546", + "type": "github" + }, + "original": { + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -1512,7 +1465,7 @@ "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix", "systems": "systems_5", - "treefmt-nix": "treefmt-nix_4", + "treefmt-nix": "treefmt-nix_3", "unstable": "unstable" } }, @@ -1543,15 +1496,16 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1730771644, - "narHash": "sha256-VEF4j97cGWQSp/pSSWE6KtOvBf+4Ow2iNfhZ6DLgmSQ=", + "lastModified": 1725522236, + "narHash": "sha256-dP8ie2arXvvNzn5uqHGf3r0x5pfHm4d5rIg3j1fpwcA=", "owner": "juspay", "repo": "rust-flake", - "rev": "cdc17a1d009674a9a23c7e4749baf474d2419f04", + "rev": "ea2bdf67ec3924adb0361630365c34ba8bc11ad9", "type": "github" }, "original": { "owner": "juspay", + "ref": "granular-autoWire", "repo": "rust-flake", "type": "github" } @@ -1604,7 +1558,7 @@ "flake-root": "flake-root", "nix-visualize": "nix-visualize", "nixpkgs": "nixpkgs_3", - "treefmt-nix": "treefmt-nix_3", + "treefmt-nix": "treefmt-nix_2", "vulnix": "vulnix" }, "locked": { @@ -1642,17 +1596,17 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110444, - "narHash": "sha256-fp1iV2JldCSvz+7ODzXYUkQ+H7zyiWw5E0MQ4ILC4vw=", + "lastModified": 1727355527, + "narHash": "sha256-qFSPHeImI00fBzGTA94D66HMD+fJDkuz04WHp2Sg8eA=", "owner": "danth", "repo": "stylix", - "rev": "9015d5d0d5d100f849129c43d257b827d300b089", + "rev": "993fcabd83d1e0ee5ea038b87041593cc73c1ebe", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.11", "repo": "stylix", + "rev": "993fcabd83d1e0ee5ea038b87041593cc73c1ebe", "type": "github" } }, @@ -1734,34 +1688,32 @@ "tinted-foot": { "flake": false, "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", "owner": "tinted-theming", "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", "type": "github" } }, "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, @@ -1785,16 +1737,16 @@ "inputs": { "nixpkgs": [ "nixvim", - "neovim-nightly-overlay", + "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { @@ -1804,28 +1756,6 @@ } }, "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733440889, - "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nsbm", @@ -1847,18 +1777,18 @@ "type": "github" } }, - "treefmt-nix_4": { + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { @@ -1869,11 +1799,11 @@ }, "unstable": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c23a5b9..263b223 100644 --- a/flake.nix +++ b/flake.nix @@ -83,7 +83,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixinate = { @@ -110,13 +110,13 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix/release-24.11"; - #url = "github:danth/stylix/993fcabd83d1e0ee5ea038b87041593cc73c1ebe"; + #url = "github:danth/stylix5"; + url = "github:danth/stylix/993fcabd83d1e0ee5ea038b87041593cc73c1ebe"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; @@ -125,7 +125,10 @@ omnix = { url = "github:juspay/omnix"; inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; treefmt-nix.follows = "treefmt-nix"; + devour-flake.follows = "devour-flake"; systems.follows = "systems"; }; }; diff --git a/home/c/default.nix b/home/c/default.nix index 2ea03a3..3f8bd92 100644 --- a/home/c/default.nix +++ b/home/c/default.nix @@ -12,24 +12,19 @@ username = "c"; homeDirectory = "/home/c"; }; - home.pointerCursor = { - gtk.enable = true; - x11.enable = true; - }; gtk.enable = true; gtk.iconTheme = { - package = pkgs.adwaita-icon-theme; + package = pkgs.gnome.adwaita-icon-theme; name = "Adwaita"; }; home.packages = with pkgs; [ - apple-cursor # TODO: sort this out - adwaita-icon-theme + gnome.adwaita-icon-theme networkmanagerapplet libsecret bitwarden - #betterbird + betterbird wl-clipboard discord brightnessctl diff --git a/home/c/programs/hypr/default.nix b/home/c/programs/hypr/default.nix index 90560a0..5b31a78 100644 --- a/home/c/programs/hypr/default.nix +++ b/home/c/programs/hypr/default.nix @@ -1,14 +1,12 @@ { pkgs, cLib, - lib, ... }: let getProgFor' = cLib.getProgFor' pkgs; getProgFor = cLib.getProgFor pkgs; web = getProgFor "firefox"; - #mail = getProgFor "betterbird"; - mail = ""; + mail = getProgFor "betterbird"; chat = getProgFor "discord"; media = getProgFor "spotify"; terminal = getProgFor "alacritty"; @@ -36,7 +34,7 @@ in { }; programs.hyprlock = { enable = true; - settings = lib.mkForce { + settings = { background = [ { path = "screenshot"; @@ -102,11 +100,9 @@ in { }; decoration = { - shadow = { - enabled = true; - range = 4; - render_power = 3; - }; + drop_shadow = true; + shadow_range = 4; + shadow_render_power = 3; }; animations = { @@ -122,11 +118,11 @@ in { dwindle = { pseudotile = true; preserve_split = true; - #no_gaps_when_only = 1; + no_gaps_when_only = 1; }; master = { - #no_gaps_when_only = 1; + no_gaps_when_only = 1; }; gestures.workspace_swipe = false; diff --git a/hosts/artemis/configuration.nix b/hosts/artemis/configuration.nix index 0cc2c8d..ae4f4d1 100644 --- a/hosts/artemis/configuration.nix +++ b/hosts/artemis/configuration.nix @@ -29,8 +29,7 @@ environment.systemPackages = with pkgs; [ vim - adwaita-icon-theme - apple-cursor + gnome.adwaita-icon-theme wget pinentry fzf diff --git a/hosts/artemis/hardware-configuration.nix b/hosts/artemis/hardware-configuration.nix index ea77e71..3263411 100644 --- a/hosts/artemis/hardware-configuration.nix +++ b/hosts/artemis/hardware-configuration.nix @@ -27,7 +27,7 @@ settings = {General = {Enable = "Source,Sink,Media,Socket";};}; }; - graphics = { + opengl = { # hardware.graphics on unstable enable = true; extraPackages = with pkgs; [ diff --git a/hosts/artemis/home.nix b/hosts/artemis/home.nix index 752aff4..3bfde5c 100644 --- a/hosts/artemis/home.nix +++ b/hosts/artemis/home.nix @@ -10,10 +10,9 @@ { stylix.targets = { fish.enable = false; - tmux.enable = false; }; } - #inputs.self.homeManagerModules.trayscale + inputs.self.homeManagerModules.trayscale ]; users.c = import ../../home/c; extraSpecialArgs = {inherit inputs cLib;}; diff --git a/hosts/artemis/programs.nix b/hosts/artemis/programs.nix index 363fae1..6dde729 100644 --- a/hosts/artemis/programs.nix +++ b/hosts/artemis/programs.nix @@ -11,19 +11,19 @@ enable = true; settings = { background = { - # path = pkgs.fetchurl { - # url = "https://i.redd.it/jd1nuwsl0d121.jpg"; - # sha256 = "sha256-ff3ajGVsay2dtHiHmO2MYlqCvexUQjGifMs/ofzuyvI="; - # }; + path = pkgs.fetchurl { + url = "https://i.redd.it/jd1nuwsl0d121.jpg"; + sha256 = "sha256-ff3ajGVsay2dtHiHmO2MYlqCvexUQjGifMs/ofzuyvI="; + }; fit = "Contain"; }; - # GTK = { - # application_prefer_dark_theme = true; - # cursor_theme_name = "Adwaita"; - # font_name = "Cantarell 16"; - # icon_theme_name = "Adwaita"; - # theme_name = "Adwaita"; - # }; + GTK = { + application_prefer_dark_theme = true; + cursor_theme_name = "Adwaita"; + font_name = "Cantarell 16"; + icon_theme_name = "Adwaita"; + theme_name = "Adwaita"; + }; }; cageArgs = ["-s" "-m" "last"]; }; diff --git a/hosts/artemis/styling.nix b/hosts/artemis/styling.nix index bbf2941..77b7aeb 100644 --- a/hosts/artemis/styling.nix +++ b/hosts/artemis/styling.nix @@ -12,9 +12,11 @@ base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark.yaml"; cursor = { + # package = pkgs.bibata-cursors; + # name = "Bibata-Modern-Ice"; package = pkgs.apple-cursor; - name = "macOS"; - size = 16; + name = "macOS-Monterey"; + size = 8; }; fonts = { diff --git a/hosts/hermes/media.nix b/hosts/hermes/media.nix index c5c24b0..e1e5252 100644 --- a/hosts/hermes/media.nix +++ b/hosts/hermes/media.nix @@ -35,7 +35,7 @@ in { # vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; # }; - hardware.graphics = { + hardware.opengl = { enable = true; extraPackages = with pkgs; [ intel-media-driver diff --git a/modules/default.nix b/modules/default.nix index 4962e20..f31f2d2 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -25,9 +25,9 @@ let ./tailscale.nix ./secret.nix ]; - homeManagerModules = - exportModules [ - ]; + homeManagerModules = exportModules [ + ./trayscale.nix + ]; sharedModules = with nixosModules; [ pinentry-fix nix diff --git a/modules/trayscale.nix b/modules/trayscale.nix new file mode 100644 index 0000000..9a67ec5 --- /dev/null +++ b/modules/trayscale.nix @@ -0,0 +1,40 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.services.trayscale; +in { + options.services.trayscale = { + enable = + mkEnableOption + "An unofficial GUI wrapper around the Tailscale CLI client."; + package = mkPackageOption pkgs "trayscale" {}; + hideWindow = mkOption { + description = "Whether to hide the trayscale window on startup."; + type = types.bool; + default = true; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + (hm.assertions.assertPlatform "services.trayscale" pkgs platforms.linux) + ]; + + systemd.user.services.trayscale = { + Unit = { + Description = "An unofficial GUI wrapper around the Tailscale CLI client"; + Requires = ["tray.target"]; + After = ["graphical-session-pre.target" "tray.target" "tailscaled.service"]; + PartOf = ["graphical-session.target"]; + }; + Install = {WantedBy = ["graphical-session.target"];}; + Service.ExecStart = + toString (["${cfg.package}/bin/trayscale"] + ++ optional cfg.hideWindow "--hide-window"); + }; + }; +}