diff --git a/flake.lock b/flake.lock index adb2a75..8cc3970 100644 --- a/flake.lock +++ b/flake.lock @@ -1,82 +1,5 @@ { "nodes": { - "anyrun": { - "inputs": { - "anyrun-provider": "anyrun-provider", - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1778513621, - "narHash": "sha256-zo+sQJQ1eqZdoEtIsdxRnchpxQMgK022UnWZdSq6NRw=", - "owner": "anyrun-org", - "repo": "anyrun", - "rev": "a338930f02ab4627cead5105b3d1fbce5a370aa8", - "type": "github" - }, - "original": { - "owner": "anyrun-org", - "repo": "anyrun", - "type": "github" - } - }, - "anyrun-provider": { - "inputs": { - "nixpkgs": [ - "anyrun", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764705714, - "narHash": "sha256-4rN2vWicM6Pn6eTo3Nu7IB5isbkc9u4arNMnY2+S8iM=", - "owner": "anyrun-org", - "repo": "anyrun-provider", - "rev": "88a786e6029733a4c02c2c6b1024f65029b0b9cf", - "type": "github" - }, - "original": { - "owner": "anyrun-org", - "repo": "anyrun-provider", - "type": "github" - } - }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1778857089, - "narHash": "sha256-TclWRW2SdFeETLaiTG4BA8C8C4m/LppQEldncqyTzAQ=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "ab2b0af63fbc9fb779d684f19149b790978be8a8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -112,23 +35,6 @@ "type": "github" } }, - "base16-fish_2": { - "flake": false, - "locked": { - "lastModified": 1765809053, - "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { @@ -145,22 +51,6 @@ "type": "github" } }, - "base16-helix_2": { - "flake": false, - "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { @@ -178,41 +68,6 @@ "type": "github" } }, - "base16-vim_2": { - "flake": false, - "locked": { - "lastModified": 1732806396, - "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - } - }, - "base16_2": { - "inputs": { - "fromYaml": "fromYaml_2" - }, - "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, "cachyos-kernel": { "flake": false, "locked": { @@ -261,22 +116,6 @@ "type": "github" } }, - "firefox-gnome-theme_2": { - "flake": false, - "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -293,44 +132,7 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "anyrun", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -348,7 +150,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -369,27 +171,6 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "stylix-stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -406,44 +187,6 @@ "type": "github" } }, - "fromYaml_2": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -461,25 +204,6 @@ "type": "github" } }, - "gnome-shell_2": { - "flake": false, - "locked": { - "host": "gitlab.gnome.org", - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" - }, - "original": { - "host": "gitlab.gnome.org", - "owner": "GNOME", - "ref": "gnome-49", - "repo": "gnome-shell", - "type": "gitlab" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -487,366 +211,27 @@ ] }, "locked": { - "lastModified": 1780099287, - "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", + "lastModified": 1779726825, + "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", + "rev": "b179bde238977f7d4454fc770b1a727eaf55111c", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } }, - "home-manager-stable": { - "inputs": { - "nixpkgs": [ - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.11", - "repo": "home-manager", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776511930, - "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "39435900785d0c560c6ae8777d29f28617d031ef", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776426399, - "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-guiutils": "hyprland-guiutils", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1780058324, - "narHash": "sha256-+t97F7PpZWjMcXFOH9oPGNsG424azqCDTcBRL1gMkoE=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "cbcddf2848fcdd9d2490df786c92003bcd763fac", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-guiutils": { - "inputs": { - "aquamarine": [ - "hyprland", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprtoolkit": "hyprtoolkit", - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776426575, - "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "rev": "a968d211048e3ed538e47b84cb3649299578f19d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1772460177, - "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1777320127, - "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprtoolkit": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland-guiutils", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland-guiutils", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland-guiutils", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-guiutils", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland-guiutils", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland-guiutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-guiutils", - "systems" - ] - }, - "locked": { - "lastModified": 1772462885, - "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1779475241, - "narHash": "sha256-Nw4DN0A5krWNcPBvuWe5Gz2yuxsUUPiDgtu6SVPJQeU=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "3cd3972b2ee658a14d2610d8494e09259e530124", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1777159683, - "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwire": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1778410714, - "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=", - "owner": "hyprwm", - "repo": "hyprwire", - "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwire", - "type": "github" - } - }, "nix-cachyos-kernel": { "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2" + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1780084541, @@ -865,16 +250,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779357205, - "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", + "lastModified": 1780011192, + "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", + "rev": "3242faf14b7611a62ce0f0071619438a08b65c12", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -894,34 +279,18 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1779796641, - "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "25f538306313eae3927264466c70d7001dcea1df", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1780011192, - "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=", + "lastModified": 1779971959, + "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3242faf14b7611a62ce0f0071619438a08b65c12", + "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -930,35 +299,19 @@ "locked": { "lastModified": 1779560665, "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { - "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1779560665, "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", @@ -999,57 +352,9 @@ "type": "github" } }, - "nur_2": { - "inputs": { - "flake-parts": [ - "stylix-stable", - "flake-parts" - ], - "nixpkgs": [ - "stylix-stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767886815, - "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", - "owner": "nix-community", - "repo": "NUR", - "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "proton-cachyos-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1779863612, @@ -1067,16 +372,11 @@ }, "root": { "inputs": { - "anyrun": "anyrun", "home-manager": "home-manager", - "home-manager-stable": "home-manager-stable", - "hyprland": "hyprland", "nix-cachyos-kernel": "nix-cachyos-kernel", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs": "nixpkgs_2", "proton-cachyos-nix": "proton-cachyos-nix", "stylix": "stylix", - "stylix-stable": "stylix-stable", "zen-browser": "zen-browser" } }, @@ -1087,11 +387,11 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_3", + "systems": "systems", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -1111,72 +411,7 @@ "type": "github" } }, - "stylix-stable": { - "inputs": { - "base16": "base16_2", - "base16-fish": "base16-fish_2", - "base16-helix": "base16-helix_2", - "base16-vim": "base16-vim_2", - "firefox-gnome-theme": "firefox-gnome-theme_2", - "flake-parts": "flake-parts_4", - "gnome-shell": "gnome-shell_2", - "nixpkgs": [ - "nixpkgs-stable" - ], - "nur": "nur_2", - "systems": "systems_4", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty_2", - "tinted-schemes": "tinted-schemes_2", - "tinted-tmux": "tinted-tmux_2", - "tinted-zed": "tinted-zed_2" - }, - "locked": { - "lastModified": 1778680496, - "narHash": "sha256-tUq1WASV0dHLv3j18log8V6Esq0NYkXuzNH2EHsstcg=", - "owner": "nix-community", - "repo": "stylix", - "rev": "fc5bec2e44678eeaa221d566d447a0257a884737", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.11", - "repo": "stylix", - "type": "github" - } - }, "systems": { - "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_2": { - "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_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1191,38 +426,6 @@ "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" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -1239,22 +442,6 @@ "type": "github" } }, - "tinted-kitty_2": { - "flake": false, - "locked": { - "lastModified": 1735730497, - "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "type": "github" - } - }, "tinted-schemes": { "flake": false, "locked": { @@ -1271,22 +458,6 @@ "type": "github" } }, - "tinted-schemes_2": { - "flake": false, - "locked": { - "lastModified": 1767817087, - "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", - "owner": "tinted-theming", - "repo": "schemes", - "rev": "bd99656235aab343e3d597bf196df9bc67429507", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "schemes", - "type": "github" - } - }, "tinted-tmux": { "flake": false, "locked": { @@ -1303,22 +474,6 @@ "type": "github" } }, - "tinted-tmux_2": { - "flake": false, - "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, "tinted-zed": { "flake": false, "locked": { @@ -1335,78 +490,21 @@ "type": "github" } }, - "tinted-zed_2": { - "flake": false, - "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1778265244, - "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": [ - "home-manager-stable" + "home-manager" ], "nixpkgs": [ - "nixpkgs-stable" + "nixpkgs" ] }, "locked": { - "lastModified": 1779955179, - "narHash": "sha256-cHrbJ8pZrsFWUTJVk7AxWiEg5eiZptPQxtT0YXMIENo=", + "lastModified": 1780123543, + "narHash": "sha256-vRHmt1N3rPgLJFcSQfHb2c3F7edzVPcyAk6/2QYmO1s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c341e3f6516fb1286d25b99d34b111f93028ae87", + "rev": "7e1dae7aa169ad02f18ca11da247008181b2dc7f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8758a2e..5ddc428 100644 --- a/flake.nix +++ b/flake.nix @@ -2,25 +2,17 @@ description = "FredOS NixOS configuration"; inputs = { - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager-stable = { - url = "github:nix-community/home-manager/release-25.11"; - inputs.nixpkgs.follows = "nixpkgs-stable"; - }; - - # Unstable HM for Hyprland Lua config support (configType = "lua", - # available since HM master / future 26.05). + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; zen-browser = { url = "github:0xc000022070/zen-browser-flake"; inputs = { - nixpkgs.follows = "nixpkgs-stable"; - home-manager.follows = "home-manager-stable"; + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; }; }; @@ -28,57 +20,39 @@ proton-cachyos-nix.url = "github:powerofthe69/proton-cachyos-nix"; - # Pin Hyprland to upstream so we get the 0.52.2+ fixes ahead of - # nixos-25.11's slower bump cadence. Doesn't follow our nixpkgs — - # upstream needs newer stdenv than 25.11 ships. - hyprland.url = "github:hyprwm/Hyprland"; - - anyrun = { - url = "github:anyrun-org/anyrun"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - + # No release-26.05 branch yet — use master until stylix cuts one. stylix.url = "github:nix-community/stylix"; - stylix-stable = { - url = "github:nix-community/stylix/release-25.11"; - inputs.nixpkgs.follows = "nixpkgs-stable"; - }; }; outputs = { self - , nixpkgs-stable , nixpkgs - , home-manager-stable , home-manager , zen-browser , nix-cachyos-kernel - , hyprland - , anyrun , stylix - , stylix-stable , proton-cachyos-nix , ... } @ inputs: let system = "x86_64-linux"; - mkHost = hostname: pkgsInput: hmInput: extraModules: pkgsInput.lib.nixosSystem { + mkHost = hostname: extraModules: nixpkgs.lib.nixosSystem { inherit system; - specialArgs = { inherit inputs; pkgs-unstable = nixpkgs.legacyPackages.${system}; }; + specialArgs = { inherit inputs; }; modules = [ ./hosts/${hostname}.nix ./hosts/hardware/${hostname}.nix ./common.nix - hmInput.nixosModules.home-manager + home-manager.nixosModules.home-manager + stylix.nixosModules.stylix + ./settings/stylix.nix ] ++ extraModules; }; in { nixosConfigurations = { - # Gaming and Macbook use nixpkgs unstable — required by home-manager - # unstable which needs lib/services/lib.nix added in nixpkgs after 25.11. - FredOS-Gaming = mkHost "FredOS-Gaming" nixpkgs home-manager [ stylix.nixosModules.stylix ./settings/stylix.nix ]; - FredOS-Mediaserver = mkHost "FredOS-Mediaserver" nixpkgs-stable home-manager-stable [ stylix-stable.nixosModules.stylix ./settings/stylix.nix ]; - FredOS-Macbook = mkHost "FredOS-Macbook" nixpkgs home-manager [ stylix.nixosModules.stylix ./settings/stylix.nix ]; + FredOS-Gaming = mkHost "FredOS-Gaming" []; + FredOS-Mediaserver = mkHost "FredOS-Mediaserver" []; + FredOS-Macbook = mkHost "FredOS-Macbook" []; }; }; } diff --git a/services/code-server.nix b/services/code-server.nix index 1b0da06..13f7dee 100644 --- a/services/code-server.nix +++ b/services/code-server.nix @@ -5,12 +5,11 @@ # password gate). After deploy, install the Claude extension from a terminal: # code-server --install-extension anthropic.claude-code # and set ANTHROPIC_API_KEY in ~/.config/code-server/env or via a shell profile. -{ config, pkgs, lib, pkgs-unstable, ... }: +{ config, pkgs, lib, ... }: { config = lib.mkIf (config.networking.hostName == "FredOS-Mediaserver") { services.code-server = { enable = true; - package = pkgs-unstable.code-server; host = "127.0.0.1"; port = 4444; auth = "none"; diff --git a/settings/hyprland.nix b/settings/hyprland.nix index d462c7c..14246bc 100644 --- a/settings/hyprland.nix +++ b/settings/hyprland.nix @@ -1,9 +1,6 @@ # settings/hyprland.nix { config, pkgs, lib, inputs, ... }: let - hyprland-pkgs = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}; - anyrun-pkgs = inputs.anyrun.packages.${pkgs.stdenv.hostPlatform.system}; - isMacbook = config.networking.hostName == "FredOS-Macbook"; isGaming = !isMacbook; @@ -13,8 +10,6 @@ in programs.hyprland = { enable = true; xwayland.enable = true; - package = hyprland-pkgs.hyprland; - portalPackage = hyprland-pkgs.xdg-desktop-portal-hyprland; }; xdg.portal = { @@ -61,20 +56,12 @@ in pavucontrol polkit_gnome quickshell + anyrun qt6.qt5compat zenity libcanberra-gtk3 ]; - # Use upstream anyrun flake's HM module instead of the built-in one - # for working daemon mode. - home-manager.sharedModules = [ - ({ modulesPath, ... }: { - disabledModules = [ "${modulesPath}/programs/anyrun.nix" ]; - }) - inputs.anyrun.homeManagerModules.default - ]; - home-manager.users.fred = { config, lib, pkgs, inputs, ... }: let c = config.lib.stylix.colors; @@ -96,7 +83,6 @@ in enable = true; configType = "lua"; systemd.variables = [ "--all" ]; - package = hyprland-pkgs.hyprland; settings = { # hl.config({...}) — all static named-section configuration. @@ -192,8 +178,8 @@ in $'\uf08b Logout' \ $'\uf01e Reboot' \ $'\uf011 Shutdown' \ - | ${anyrun-pkgs.anyrun}/bin/anyrun \ - --plugins "${anyrun-pkgs.stdin}/lib/libstdin.so" \ + | ${pkgs.anyrun}/bin/anyrun \ + --plugins "${pkgs.anyrun}/lib/libstdin.so" \ --show-results-immediately true \ --hide-plugin-info true \ --close-on-click true) @@ -343,64 +329,6 @@ in ''; }; - programs.anyrun = { - enable = true; - config = { - plugins = [ anyrun-pkgs.applications ]; - x.fraction = 0.5; - y.fraction = 0.25; - width.absolute = 350; - height.absolute = 0; - hideIcons = false; - ignoreExclusiveZones = false; - layer = "overlay"; - hidePluginInfo = true; - closeOnClick = true; - maxEntries = 8; - }; - extraCss = - let c = config.lib.stylix.colors; in - '' - * { all: unset; font-family: "FiraMono Nerd Font", monospace; font-size: 13px; } - window { background: transparent; } - box.main { - background: #${c.base00}; - border: 1px solid #${c.base03}; - border-radius: 10px; - padding: 8px; - margin: 16px; - } - text { - background: #${c.base01}; - color: #${c.base05}; - caret-color: #${c.base0D}; - padding: 8px 16px; - border-radius: 6px; - min-height: 0; - } - list.plugin { background: transparent; } - .matches { background: transparent; } - .match { - padding: 4px 16px; - border-radius: 6px; - color: #${c.base05}; - background: transparent; - } - .match:selected { - background: #${c.base02}; - border: none; - } - label.match.description { color: #${c.base04}; font-size: 11px; } - ''; - extraConfigFiles."applications.ron".text = '' - Config( - desktop_actions: false, - max_entries: 8, - terminal: Some("ghostty"), - ) - ''; - }; - programs.hyprlock = { enable = true; settings = { @@ -2445,6 +2373,64 @@ in } ''; }; + + # anyrun config — written manually since HM 26.05 has no anyrun module. + "anyrun/config.ron".text = '' + Config( + x: Fraction(0.5), + y: Fraction(0.25), + width: Absolute(350), + height: Absolute(0), + hide_icons: false, + ignore_exclusive_zones: false, + layer: Overlay, + hide_plugin_info: true, + close_on_click: true, + max_entries: 8, + plugins: [ + "${pkgs.anyrun}/lib/libapplications.so", + ], + ) + ''; + "anyrun/style.css".text = '' + * { all: unset; font-family: "FiraMono Nerd Font", monospace; font-size: 13px; } + window { background: transparent; } + box.main { + background: #${c.base00}; + border: 1px solid #${c.base03}; + border-radius: 10px; + padding: 8px; + margin: 16px; + } + text { + background: #${c.base01}; + color: #${c.base05}; + caret-color: #${c.base0D}; + padding: 8px 16px; + border-radius: 6px; + min-height: 0; + } + list.plugin { background: transparent; } + .matches { background: transparent; } + .match { + padding: 4px 16px; + border-radius: 6px; + color: #${c.base05}; + background: transparent; + } + .match:selected { + background: #${c.base02}; + border: none; + } + label.match.description { color: #${c.base04}; font-size: 11px; } + ''; + "anyrun/applications.ron".text = '' + Config( + desktop_actions: false, + max_entries: 8, + terminal: Some("ghostty"), + ) + ''; }; }; diff --git a/settings/stylix.nix b/settings/stylix.nix index 9dad1ad..d7d3a42 100644 --- a/settings/stylix.nix +++ b/settings/stylix.nix @@ -1,7 +1,6 @@ { config, pkgs, lib, inputs, ... }: { - # Imported for all hosts via flake.nix extraModules. - # Desktop hosts use stylix (unstable), Mediaserver uses stylix-stable (25.11). + # Imported for all hosts via flake.nix. config = { stylix = {