diff --git a/flake.lock b/flake.lock index 9b49ba5f..d1e5c221 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1775176642, - "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", + "lastModified": 1776136500, + "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "179704030c5286c729b5b0522037d1d51341022c", + "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1775228139, - "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", + "lastModified": 1777598946, + "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", "owner": "nix-community", "repo": "NUR", - "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", + "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", "type": "github" }, "original": { @@ -228,11 +228,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1772661346, - "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", + "lastModified": 1777041405, + "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "13b5b0c299982bb361039601e2d72587d6846294", + "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1772934010, - "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", + "lastModified": 1777169200, + "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", + "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1772909925, - "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", + "lastModified": 1777463218, + "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", + "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", "type": "github" }, "original": { diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock index 48409bbc..2eda8a07 100644 --- a/flake/dev/flake.lock +++ b/flake/dev/flake.lock @@ -2,17 +2,18 @@ "nodes": { "dankMaterialShell": { "inputs": { + "flake-compat": "flake-compat", "nixpkgs": [ "dev-nixpkgs" ], "quickshell": "quickshell" }, "locked": { - "lastModified": 1775232240, - "narHash": "sha256-xyLsPIUphY4SAlX2GkuM3ELMx23Z9j9xM0mHbFMLdic=", + "lastModified": 1777582766, + "narHash": "sha256-Vpsmq3KcUGYsKF3yjbIUfPahvgiWDZyn1wIPztctFSE=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "1021a210cf94d6c65fe636efbaa725bac27ea19a", + "rev": "c81645bacbdc790051a3ea1202eafe911eb36dae", "type": "github" }, "original": { @@ -43,11 +44,11 @@ }, "dev-nixpkgs": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -73,6 +74,22 @@ } }, "flake-compat": { + "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-compat_2": { "locked": { "lastModified": 1767039857, "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", @@ -98,11 +115,11 @@ ] }, "locked": { - "lastModified": 1775036584, - "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -118,11 +135,11 @@ ] }, "locked": { - "lastModified": 1775781825, - "narHash": "sha256-L5yKTpR+alrZU2XYYvIxCeCP4LBHU5jhwSj7H1VAavg=", + "lastModified": 1777594677, + "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e35c39fca04fee829cecdf839a50eb9b54d8a701", + "rev": "899c08a15beae5da51a5cecd6b2b994777a948da", "type": "github" }, "original": { @@ -154,11 +171,11 @@ ] }, "locked": { - "lastModified": 1768214250, - "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", + "lastModified": 1776882296, + "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=", "owner": "feel-co", "repo": "ndg", - "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", + "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e", "type": "github" }, "original": { @@ -181,11 +198,11 @@ ] }, "locked": { - "lastModified": 1774802402, - "narHash": "sha256-L1UJ/zxKTyyaGGmytH6OYlgQ0HGSMhvPkvU+iz4Mkb8=", + "lastModified": 1777236345, + "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=", "owner": "nix-community", "repo": "nixvim", - "rev": "cbd8536a05d1aae2593cb5c9ace1010c8c5845cb", + "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4", "type": "github" }, "original": { @@ -208,11 +225,11 @@ ] }, "locked": { - "lastModified": 1775135550, - "narHash": "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0=", + "lastModified": 1777380063, + "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "e7224b756dcd10eec040df818a4c7a0fda5d6eff", + "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d", "type": "github" }, "original": { @@ -229,11 +246,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775210433, - "narHash": "sha256-tkue0Ed0CufUXjEBb51ojtyWY1ibK9h3ed+mVDHFGZA=", + "lastModified": 1777427472, + "narHash": "sha256-kqcfLdxb+CqTroMErCScvx6YQcZYJcf6X+z5I8kBJK8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "759454d2d5bce9be7dea982818700140335ed047", + "rev": "9f8dd48c8df5ab1f7f87ddf9842627e1e5682186", "type": "github" }, "original": { @@ -258,11 +275,11 @@ ] }, "locked": { - "lastModified": 1775122065, - "narHash": "sha256-ZlowJNkQOhpsXDuWbHgB1xY6W8kyzYn9coK9nJsqqNg=", + "lastModified": 1777478067, + "narHash": "sha256-2vZnUuv8fg2sIE6pXgGxZQQ3ZhQW1XE7Sxieg8gK2p4=", "owner": "NotAShelf", "repo": "nvf", - "rev": "d3304af3d5771e8d5bac6ee9bbdbce56086d54f7", + "rev": "13c4ad4b4bb926c22945e2fb8862769fe51f27f1", "type": "github" }, "original": { @@ -279,16 +296,16 @@ ] }, "locked": { - "lastModified": 1766725085, - "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", + "lastModified": 1776854048, + "narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=", "ref": "refs/heads/master", - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", - "revCount": 715, + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", + "revCount": 806, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" }, "original": { - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" } @@ -299,7 +316,7 @@ "dev-flake-parts": "dev-flake-parts", "dev-nixpkgs": "dev-nixpkgs", "dev-systems": "dev-systems", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "git-hooks": "git-hooks", "home-manager": "home-manager", "nixvim": "nixvim", @@ -321,11 +338,11 @@ ] }, "locked": { - "lastModified": 1774790928, - "narHash": "sha256-/JO77td8AOH45kg9IJl2DXDwbhn+cyQxYbCMu4Ae1CA=", + "lastModified": 1777183994, + "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "2bfdf55faf76fed12950b17d4af501e5a463607f", + "rev": "501256c3e670ca1679501ce3839ea805df00d8ba", "type": "github" }, "original": { @@ -341,11 +358,11 @@ ] }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -364,11 +381,11 @@ ] }, "locked": { - "lastModified": 1774900456, - "narHash": "sha256-Rv2E2YKKCe37HZVreQ13qrzEKmovcPPCF5uKkg8fv8E=", + "lastModified": 1777574102, + "narHash": "sha256-CAkaDE7YO/DWYrD1DRzhpmMC64cqfKHrNXNfnrboCIs=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "9c7d53c095a26e853e74f11575d4901e58883a28", + "rev": "bf26e038a3ad4b40cd8bbe11e387714f07c19e49", "type": "github" }, "original": { @@ -387,11 +404,11 @@ ] }, "locked": { - "lastModified": 1775162238, - "narHash": "sha256-0qt2cfUqfTbesQlvO3NeJLCqa7NoVxUK9vxs79prNHk=", + "lastModified": 1777564084, + "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9bf98d57ca82698483ec2d9211ce01669ba37820", + "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", "type": "github" }, "original": { diff --git a/flake/dev/flake.nix b/flake/dev/flake.nix index 26c99ec1..a5f107c0 100644 --- a/flake/dev/flake.nix +++ b/flake/dev/flake.nix @@ -132,7 +132,10 @@ # keep-sorted start block=yes newline_separated=yes dankMaterialShell = { url = "github:AvengeMedia/DankMaterialShell"; - inputs.nixpkgs.follows = "dev-nixpkgs"; + inputs = { + nixpkgs.follows = "dev-nixpkgs"; + flake-compat.follows = "flake-compat"; + }; }; flake-compat.url = "github:NixOS/flake-compat"; diff --git a/modules/helix/hm.nix b/modules/helix/hm.nix index d7e37529..645169ce 100644 --- a/modules/helix/hm.nix +++ b/modules/helix/hm.nix @@ -29,7 +29,10 @@ mkTarget { themes.stylix = let - theme = colors { templateRepo = inputs.base16-helix; }; + theme = colors { + templateRepo = inputs.base16-helix; + target = "base16"; + }; # Removing the background exposes transparency from the terminal. The # background might be helpful if the terminal isn't themed, so we only diff --git a/modules/zed/hm.nix b/modules/zed/hm.nix index b7300c1a..f8aba49c 100644 --- a/modules/zed/hm.nix +++ b/modules/zed/hm.nix @@ -19,7 +19,10 @@ mkTarget { { programs.zed-editor = { userSettings.theme = "Base16 ${colors.scheme-name}"; - themes.stylix = colors { templateRepo = inputs.tinted-zed; }; + themes.stylix = colors { + templateRepo = inputs.tinted-zed; + target = "base16"; + }; }; } )