diff --git a/flake.lock b/flake.lock index aa4520c..dbcbd53 100644 --- a/flake.lock +++ b/flake.lock @@ -59,6 +59,21 @@ }, "parent": [] }, + "crane": { + "locked": { + "lastModified": 1765739568, + "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=", + "owner": "ipetkov", + "repo": "crane", + "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -178,6 +193,42 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -256,10 +307,31 @@ "type": "github" } }, + "monique": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1775640310, + "narHash": "sha256-AYo7jk6xE2NX9IihdV1ec65eUMGyZomXRDQIdsOccnc=", + "owner": "ToRvaLDz", + "repo": "monique", + "rev": "1c22dacf89966bedcb21fe01864158b401395f3f", + "type": "github" + }, + "original": { + "owner": "ToRvaLDz", + "repo": "monique", + "type": "github" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", + "niri-unstable": [ + "niri-blur" + ], "nixpkgs": [ "nixpkgs" ], @@ -281,6 +353,23 @@ "type": "github" } }, + "niri-blur": { + "flake": false, + "locked": { + "lastModified": 1775673716, + "narHash": "sha256-nFScVrzNWXSbovyZOT5r5dgeHxgSGyksfRXbFD/tbqM=", + "owner": "niri-wm", + "repo": "niri", + "rev": "8bb271153260acdb2f78f1ef874da9b8b13f607a", + "type": "github" + }, + "original": { + "owner": "niri-wm", + "ref": "wip/branch", + "repo": "niri", + "type": "github" + } + }, "niri-stable": { "flake": false, "locked": { @@ -298,22 +387,6 @@ "type": "github" } }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1774616418, - "narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-jmu-cs345": { "locked": { "lastModified": 1745564874, @@ -346,11 +419,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773389992, - "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -391,6 +464,38 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1773389992, + "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -418,7 +523,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_2", + "systems": "systems_3", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -499,14 +604,39 @@ "flake-parts": "flake-parts_2", "home-manager": "home-manager_2", "import-tree": "import-tree", + "monique": "monique", "niri": "niri", + "niri-blur": "niri-blur", "nix-jmu-cs345": "nix-jmu-cs345", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "noctalia": "noctalia", "nur": "nur", "packages": "packages", - "secrets": "secrets" + "secrets": "secrets", + "zen-browser": "zen-browser", + "zjstatus": "zjstatus" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "zjstatus", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765939271, + "narHash": "sha256-7F/d+ZrTYyOxnBZcleQZjOOEWc1IMXR/CLLRLLsVtHo=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8028944c1339469124639da276d403d8ab7929a8", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "secrets": { @@ -537,6 +667,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -551,6 +696,21 @@ "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -626,6 +786,50 @@ "repo": "xwayland-satellite", "type": "github" } + }, + "zen-browser": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775744672, + "narHash": "sha256-Qg3Wnn3WYiiii35CE9kE+XX4ooSFzupAnGC1/NjI5C8=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "14a238beb0621977e9bf04cba68919d5650deea9", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } + }, + "zjstatus": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1773119656, + "narHash": "sha256-AE6SthrvDyUU70myW7wAq4mzQbtmK5Spng7Y/OdCdhI=", + "owner": "dj95", + "repo": "zjstatus", + "rev": "e80d508ffbff6ab6b39a481ae9986109d3c313ac", + "type": "github" + }, + "original": { + "owner": "dj95", + "repo": "zjstatus", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cd1deb2..cd05dd2 100644 --- a/flake.nix +++ b/flake.nix @@ -39,19 +39,31 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + niri-blur = { + url = "github:niri-wm/niri/wip/branch"; + flake = false; + }; + niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.niri-unstable.follows = "niri-blur"; }; - # zen-browser = { - # url = "github:0xc000022070/zen-browser-flake"; - # inputs = { - # # IMPORTANT: To ensure compatibility with the latest Firefox version, use nixpkgs-unstable. - # nixpkgs.follows = "nixpkgs"; - # home-manager.follows = "home-manager"; - # }; - # }; + monique.url = "github:ToRvaLDz/monique"; + + zjstatus = { + url = "github:dj95/zjstatus"; + }; + + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs = { + # IMPORTANT: To ensure compatibility with the latest Firefox version, use nixpkgs-unstable. + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + }; + }; nix-jmu-cs345.url = "github:Eclypsed/nix-jmu-cs345";