diff --git a/flake.lock b/flake.lock index 2f8a50f6..ac6cbcf6 100644 --- a/flake.lock +++ b/flake.lock @@ -45,6 +45,50 @@ "type": "github" } }, + "ags_2": { + "inputs": { + "nixpkgs": [ + "andromeda", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715703984, + "narHash": "sha256-0BZkMui6aCqswMCouvp0G90tAxDOxVnxTvG6TDZsDaI=", + "owner": "Aylur", + "repo": "ags", + "rev": "11150225e62462bcd431d1e55185e810190a730a", + "type": "github" + }, + "original": { + "owner": "Aylur", + "repo": "ags", + "type": "github" + } + }, + "andromeda": { + "inputs": { + "ags": "ags_2", + "flake-parts": [ + "flake-parts" + ], + "niri": "niri", + "nixpkgs": [ + "nixpkgs" + ], + "wrapper-manager": "wrapper-manager" + }, + "locked": { + "lastModified": 1717851616, + "narHash": "sha256-PWewTZa+0FtmWpAy3us9v0upURq9Ij5CSGQkag0Nkq4=", + "path": "/home/sioodmy/dev/andromeda", + "type": "path" + }, + "original": { + "path": "/home/sioodmy/dev/andromeda", + "type": "path" + } + }, "bitcoinstatus": { "inputs": { "flake-parts": [ @@ -58,14 +102,17 @@ ] }, "locked": { - "lastModified": 1717001501, - "narHash": "sha256-A9z5hC2+aPZ4GFVyTJSheEXHv/+lATbJY6QNl+NAq2M=", - "path": "/home/sioodmy/dev/bitcoinstatus", - "type": "path" + "lastModified": 1717001496, + "narHash": "sha256-NdrcUSLrwes57BpAT/KJxym7/YjbsQIA1a9dckCo9+Q=", + "owner": "sioodmy", + "repo": "bitcoinstatus", + "rev": "739fb8cf416e4d3dff37af44874131125c2217f7", + "type": "github" }, "original": { - "path": "/home/sioodmy/dev/bitcoinstatus", - "type": "path" + "owner": "sioodmy", + "repo": "bitcoinstatus", + "type": "github" } }, "blobs": { @@ -87,14 +134,48 @@ "cachix": { "inputs": { "devenv": [ + "andromeda", "niri", "crate2nix" ], "flake-compat": [ + "andromeda", "niri", "crate2nix" ], - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": [ + "andromeda", + "niri", + "crate2nix" + ] + }, + "locked": { + "lastModified": 1709700175, + "narHash": "sha256-A0/6ZjLmT9qdYzKHmevnEIC7G+GiZ4UCr8v0poRPzds=", + "owner": "cachix", + "repo": "cachix", + "rev": "be97b37989f11b724197b5f4c7ffd78f12c8c4bf", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, + "cachix_2": { + "inputs": { + "devenv": [ + "niri", + "crate2nix" + ], + "flake-compat": [ + "niri", + "crate2nix" + ], + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": [ "niri", "crate2nix" @@ -118,7 +199,7 @@ "catppuccinifier": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -139,8 +220,8 @@ }, "crane": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_4", "nixpkgs": [ "catppuccinifier", "nixpkgs" @@ -204,38 +285,41 @@ "type": "github" } }, - "crane_4": { + "crate2nix": { "inputs": { - "nixpkgs": [ - "seashell", - "helix", - "nixpkgs" - ] + "cachix": "cachix", + "crate2nix_stable": "crate2nix_stable", + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nix-test-runner": "nix-test-runner", + "nixpkgs": "nixpkgs_2", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", + "lastModified": 1712821856, + "narHash": "sha256-rObTWSqfqt0qlOCokE2abesI11Ic8bCCkPNxlyk57Q0=", + "owner": "nix-community", + "repo": "crate2nix", + "rev": "cf034861fdc4e091fc7c5f01d6c022dc46686cf1", "type": "github" }, "original": { - "owner": "ipetkov", - "repo": "crane", + "owner": "nix-community", + "repo": "crate2nix", "type": "github" } }, - "crate2nix": { + "crate2nix_2": { "inputs": { - "cachix": "cachix", - "crate2nix_stable": "crate2nix_stable", - "devshell": "devshell_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_3", - "nix-test-runner": "nix-test-runner", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks" + "cachix": "cachix_2", + "crate2nix_stable": "crate2nix_stable_2", + "devshell": "devshell_3", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_4", + "nix-test-runner": "nix-test-runner_2", + "nixpkgs": "nixpkgs_5", + "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { "lastModified": 1712821856, @@ -253,7 +337,26 @@ }, "crate2nix_stable": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1702842982, + "narHash": "sha256-A9AowkHIjsy1a4LuiPiVP88FMxyCWK41flZEZOUuwQM=", + "owner": "nix-community", + "repo": "crate2nix", + "rev": "75ac2973affa6b9b4f661a7b592cba6e4f51d426", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "0.12.0", + "repo": "crate2nix", + "type": "github" + } + }, + "crate2nix_stable_2": { + "inputs": { + "flake-utils": "flake-utils_8" }, "locked": { "lastModified": 1702842982, @@ -294,17 +397,20 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ + "andromeda", + "niri", + "crate2nix", "nixpkgs" ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1711099426, + "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", "type": "github" }, "original": { @@ -316,6 +422,27 @@ "devshell_2": { "inputs": { "flake-utils": "flake-utils_6", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "owner": "numtide", + "repo": "devshell", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_3": { + "inputs": { + "flake-utils": "flake-utils_9", "nixpkgs": [ "niri", "crate2nix", @@ -337,6 +464,20 @@ } }, "flake-compat": { + "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-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -352,7 +493,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -366,7 +507,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -382,7 +523,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -398,7 +539,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -415,6 +556,29 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "andromeda", + "niri", + "crate2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -434,7 +598,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -452,7 +616,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "niri", @@ -474,7 +638,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -492,7 +656,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nixpak", @@ -513,7 +677,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -536,11 +700,29 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + } + }, + "flake-utils_10": { + "inputs": { + "systems": "systems_11" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -554,11 +736,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -572,11 +754,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -590,11 +772,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -608,11 +790,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -644,11 +826,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -658,15 +840,33 @@ } }, "flake-utils_8": { + "inputs": { + "systems": "systems_9" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { "inputs": { "systems": "systems_10" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -678,6 +878,7 @@ "gitignore": { "inputs": { "nixpkgs": [ + "andromeda", "niri", "crate2nix", "pre-commit-hooks", @@ -701,6 +902,8 @@ "gitignore_2": { "inputs": { "nixpkgs": [ + "niri", + "crate2nix", "pre-commit-hooks", "nixpkgs" ] @@ -719,39 +922,35 @@ "type": "github" } }, - "helix": { + "gitignore_3": { "inputs": { - "crane": "crane_2", - "flake-utils": "flake-utils_4", "nixpkgs": [ + "pre-commit-hooks", "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1712452625, - "narHash": "sha256-30VCYDyEk2onSvf8BaXyI9IlgDNaUB6nbrmUZwbYuP0=", - "owner": "SoraTenshi", - "repo": "helix", - "rev": "fca5a8c846ff225ecdd50d20ab5a5cd2739aa66c", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { - "owner": "SoraTenshi", - "ref": "new-daily-driver", - "repo": "helix", + "owner": "hercules-ci", + "repo": "gitignore.nix", "type": "github" } }, - "helix_2": { + "helix": { "inputs": { - "crane": "crane_4", - "flake-utils": "flake-utils_8", + "crane": "crane_2", + "flake-utils": "flake-utils_7", "nixpkgs": [ - "seashell", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1712452625, @@ -800,11 +999,11 @@ ] }, "locked": { - "lastModified": 1717316182, - "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", + "lastModified": 1717483170, + "narHash": "sha256-Xr/oYk3vmyv2a/nY8o/Wd0MdLsI5vaC38Kris7CWunM=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", + "rev": "2cacdd6a27477f1fa46b7026dd806de30f164d3b", "type": "github" }, "original": { @@ -851,7 +1050,7 @@ }, "lyricsapi": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ], @@ -874,20 +1073,24 @@ "niri": { "inputs": { "crate2nix": "crate2nix", - "flake-parts": "flake-parts_4", + "flake-parts": [ + "andromeda", + "flake-parts" + ], "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", "nixpkgs": [ + "andromeda", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717331199, - "narHash": "sha256-f0eDtnf8Ncf1EcR3FD0i6+egL+FG3xrYyWgEXV8HllY=", + "lastModified": 1717593628, + "narHash": "sha256-3ehicj9D86Kh7AjMu6uDzmxD0Hn6ALSGtYJ9ZRDjgsg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "de2e8e14b665901e7bdd52534a076e35d2150fbf", + "rev": "5364d6581a6ee2070c9f27f3f0f00a0a8e71fae8", "type": "github" }, "original": { @@ -913,7 +1116,40 @@ "type": "github" } }, + "niri-stable_2": { + "flake": false, + "locked": { + "lastModified": 1716030039, + "narHash": "sha256-MJh0CR2YHJE0GNnxaTcElNMuZUEI0pe9fvC0mfy4484=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "d96a66ddff1a6b88dbe3e23b049f7075533b216f", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v0.1.6", + "repo": "niri", + "type": "github" + } + }, "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1717519579, + "narHash": "sha256-V2CupUp1TJKho3rsw5vyvuupcrm0x8EpTQYutOti+RM=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "c6c17cccac979575b6402729af39f7c998e90874", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable_2": { "flake": false, "locked": { "lastModified": 1717305679, @@ -929,6 +1165,31 @@ "type": "github" } }, + "niri_2": { + "inputs": { + "crate2nix": "crate2nix_2", + "flake-parts": "flake-parts_5", + "niri-stable": "niri-stable_2", + "niri-unstable": "niri-unstable_2", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1717399036, + "narHash": "sha256-zwUdxag6yrM12m12y4wRldiAznjwuG9j6anwF7FwfaM=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "9309863398712939dc8f89deaa8b76749eb9e33c", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, "nix-index-db": { "inputs": { "nixpkgs": [ @@ -965,13 +1226,29 @@ "type": "github" } }, + "nix-test-runner_2": { + "flake": false, + "locked": { + "lastModified": 1588761593, + "narHash": "sha256-FKJykltAN/g3eIceJl4SfDnnyuH2jHImhMrXS2KvGIs=", + "owner": "stoeffel", + "repo": "nix-test-runner", + "rev": "c45d45b11ecef3eb9d834c3b6304c05c49b06ca2", + "type": "github" + }, + "original": { + "owner": "stoeffel", + "repo": "nix-test-runner", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1717248095, - "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", + "lastModified": 1717515267, + "narHash": "sha256-3d/rDckP583688YqVPc6SyXTy2gHpma0HzCv3idi1OE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", + "rev": "82b2e20fbffe6a5f0555701af136ad3e734a5faa", "type": "github" }, "original": { @@ -982,7 +1259,7 @@ }, "nixpak": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "nixpkgs" @@ -1004,15 +1281,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "nixos", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1062,11 +1339,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1717298511, - "narHash": "sha256-9sXuJn/nL+9ImeYtlspTvjt83z1wIgU+9AwfNbnq+tI=", + "lastModified": 1717503908, + "narHash": "sha256-hsxbTeO6Dhobc2kELDwCgRJT9J5TotL6fS8z5P+OskI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6634a0509e9e81e980b129435fbbec518ab246d0", + "rev": "50a127f8fccd0d24712c8ab146ca251f27cc4cb0", "type": "github" }, "original": { @@ -1077,6 +1354,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1717530100, + "narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a2e1d0414259a144ebdc048408a807e69e0565af", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1717159533, "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", @@ -1092,7 +1385,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1710695816, "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", @@ -1109,6 +1402,36 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1712026416, + "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "080a4a27f206d07724b88da096e27ef63401a504", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1700612854, "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", @@ -1124,7 +1447,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { "lastModified": 1712026416, "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", @@ -1138,13 +1461,13 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -1154,7 +1477,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1708475490, "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", @@ -1173,18 +1496,21 @@ "pre-commit-hooks": { "inputs": { "flake-compat": [ + "andromeda", "niri", "crate2nix", "flake-compat" ], - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ + "andromeda", "niri", "crate2nix", "nixpkgs" ], "nixpkgs-stable": [ + "andromeda", "niri", "crate2nix", "nixpkgs" @@ -1206,12 +1532,46 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": [ + "niri", + "crate2nix", + "flake-compat" + ], + "flake-utils": "flake-utils_10", "gitignore": "gitignore_2", "nixpkgs": [ + "niri", + "crate2nix", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": [ + "niri", + "crate2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712055707, + "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_3": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_3", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1716213921, @@ -1231,23 +1591,23 @@ "inputs": { "agenix": "agenix", "ags": "ags", + "andromeda": "andromeda", "bitcoinstatus": "bitcoinstatus", "catppuccinifier": "catppuccinifier", - "devshell": "devshell", - "flake-parts": "flake-parts", + "devshell": "devshell_2", + "flake-parts": "flake-parts_2", "helix": "helix", "home-manager": "home-manager", "impermanence": "impermanence", "lyricsapi": "lyricsapi", - "niri": "niri", + "niri": "niri_2", "nix-index-db": "nix-index-db", "nixos-hardware": "nixos-hardware", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "nixpkgs-small": "nixpkgs-small", - "pre-commit-hooks": "pre-commit-hooks_2", + "pre-commit-hooks": "pre-commit-hooks_3", "schizofox": "schizofox", - "seashell": "seashell", "simple-nixos-mailserver": "simple-nixos-mailserver", "treefmt-nix": "treefmt-nix_2", "website": "website" @@ -1305,36 +1665,9 @@ "type": "github" } }, - "rust-overlay_3": { - "inputs": { - "flake-utils": [ - "seashell", - "helix", - "flake-utils" - ], - "nixpkgs": [ - "seashell", - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "schizofox": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-parts": [ "flake-parts" ], @@ -1346,7 +1679,7 @@ "nixpkgs" ], "searx-randomizer": "searx-randomizer", - "systems": "systems_9" + "systems": "systems_12" }, "locked": { "lastModified": 1717289290, @@ -1365,7 +1698,7 @@ "searx-randomizer": { "inputs": { "crane": "crane_3", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "nixpkgs": [ "schizofox", "nixpkgs" @@ -1385,46 +1718,21 @@ "type": "github" } }, - "seashell": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "helix": "helix_2", - "nixpkgs": [ - "nixpkgs" - ], - "wrapper-manager": "wrapper-manager" - }, - "locked": { - "lastModified": 1717161051, - "narHash": "sha256-TtR/g+1s0GjWM53VZ9sS/iker09M79M364467rvwnrk=", - "owner": "sioodmy", - "repo": "seashell", - "rev": "b9e27999af193d0c544a2fe05e94152971222a61", - "type": "github" - }, - "original": { - "owner": "sioodmy", - "repo": "seashell", - "type": "github" - } - }, "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "nixpkgs": [ "nixpkgs-small" ], "utils": "utils" }, "locked": { - "lastModified": 1714720456, - "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", + "lastModified": 1717515088, + "narHash": "sha256-nWOLpPA7+k7V1OjXTuxdsVd5jeeI0b13Di57wvnqkic=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", + "rev": "0d51a32e4799d081f260eb4db37145f5f4ee7456", "type": "gitlab" }, "original": { @@ -1479,6 +1787,36 @@ "type": "github" } }, + "systems_12": { + "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_13": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1586,22 +1924,22 @@ }, "systems_9": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1715940852, @@ -1639,7 +1977,7 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1714058656, @@ -1657,7 +1995,7 @@ }, "utils": { "inputs": { - "systems": "systems_11" + "systems": "systems_13" }, "locked": { "lastModified": 1709126324, @@ -1700,7 +2038,7 @@ "wrapper-manager": { "inputs": { "nixpkgs": [ - "seashell", + "andromeda", "nixpkgs" ] }, diff --git a/flake.nix b/flake.nix index f5f85a12..f1be942e 100644 --- a/flake.nix +++ b/flake.nix @@ -124,6 +124,11 @@ }; }; + ags = { + url = "github:Aylur/ags"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # a tree-wide formatter treefmt-nix = { url = "github:numtide/treefmt-nix"; @@ -135,8 +140,9 @@ inputs.home-manager.follows = "home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - seashell = { - url = "github:sioodmy/seashell"; + andromeda = { + # url = "github:sioodmy/andromeda"; + url = "path:/home/sioodmy/dev/andromeda"; inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; @@ -179,8 +185,7 @@ }; }; bitcoinstatus = { - # url = "github:sioodmy/bitcoinstatus"; - url = "path:/home/sioodmy/dev/bitcoinstatus"; + url = "github:sioodmy/bitcoinstatus"; inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; diff --git a/home/impermanence.nix b/home/impermanence.nix index 922904f7..ce8264f9 100644 --- a/home/impermanence.nix +++ b/home/impermanence.nix @@ -13,7 +13,7 @@ in { "vids" "other" ] - ++ forEach ["syncthing" "Caprine" "VencordDesktop" "obs-studio" "Signal" "niri" "BraveSoftware" "nicotine"] ( + ++ forEach ["syncthing" "Caprine" "VencordDesktop" "obs-studio" "Signal" "niri" "BraveSoftware" "nicotine" "ags"] ( x: ".config/${x}" ) ++ forEach ["tealdeer" "keepassxc" "nix" "starship" "nix-index" "mozilla" "go-build" "BraveSoftware"] ( diff --git a/home/packages.nix b/home/packages.nix index 05ef5738..358b4f9d 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,6 +1,13 @@ -{pkgs, ...}: { +{pkgs, inputs, ...}: { nixpkgs.config.allowUnfree = false; home.packages = with pkgs; [ + inputs.ags.packages.${pkgs.system}.default + + #ags + overskride + dart-sass + + libreoffice-fresh thunderbird nicotine-plus diff --git a/home/rice/default.nix b/home/rice/default.nix index 4b5ab8d5..b96312c6 100644 --- a/home/rice/default.nix +++ b/home/rice/default.nix @@ -1,11 +1,11 @@ {...}: { imports = [ - ./foot.nix + # ./foot.nix ./zathura.nix - ./dunst.nix + # ./dunst.nix ./gtk.nix - ./waybar + # ./waybar ./fuzzel - ./niri + # ./niri ]; } diff --git a/home/rice/foot.nix b/home/rice/foot.nix index f0d9a8d8..87751d1b 100644 --- a/home/rice/foot.nix +++ b/home/rice/foot.nix @@ -4,12 +4,11 @@ inputs, ... }: let - seashell = inputs.seashell.packages.${pkgs.system}.default; + nucleus = inputs.andromeda.packages.${pkgs.system}.nucleus; in { - home.packages = with pkgs; [ - libsixel - seashell - # for displaying images + home.packages = [ + pkgs.libsixel + nucleus ]; programs.foot = { enable = true; @@ -21,7 +20,7 @@ in { locked-title = "no"; term = "xterm-256color"; font = "monospace:size=9"; - shell = "${seashell}/bin/seashell"; + shell = "${nucleus}/bin/nucleus"; vertical-letter-offset = "-0.75"; pad = "12x21 center"; resize-delay-ms = 100; diff --git a/home/rice/niri/config.nix b/home/rice/niri/config.nix index 182a1d7b..89c1490f 100644 --- a/home/rice/niri/config.nix +++ b/home/rice/niri/config.nix @@ -62,7 +62,7 @@ with theme.colors; { natural-scroll = true; click-method = "clickfinger"; }; - focus-follows-mouse = true; + focus-follows-mouse = false; warp-mouse-to-focus = true; trackpoint.accel-speed = 0.001; }; diff --git a/system/wayland/default.nix b/system/wayland/default.nix index 2062fe8e..bf89673b 100644 --- a/system/wayland/default.nix +++ b/system/wayland/default.nix @@ -34,10 +34,14 @@ eval $(gnome-keyring-daemon --start --components=ssh,secrets) eval $(ssh-agent) ''; - systemPackages = with pkgs; [ + systemPackages = with pkgs; + with inputs.andromeda.packages.${pkgs.system}; [ pamixer brightnessctl wl-clipboard + andromeda + andromeda-niri + nucleus ]; }; diff --git a/system/wayland/services.nix b/system/wayland/services.nix index 64597e84..edade071 100644 --- a/system/wayland/services.nix +++ b/system/wayland/services.nix @@ -28,7 +28,8 @@ enable = true; settings = rec { initial_session = { - command = "${config.programs.niri.package}/bin/niri-session"; + # command = "${config.programs.niri.package}/bin/niri-session"; + command = "${inputs.andromeda.packages.${pkgs.system}.andromeda-niri}/bin/niri"; user = "sioodmy"; }; default_session = initial_session;