diff options
Diffstat (limited to 'pkgs/data/themes')
25 files changed, 718 insertions, 268 deletions
diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/default.nix b/pkgs/data/themes/adi1090x-plymouth-themes/default.nix index 10356feed62..d5ff1d0018a 100644 --- a/pkgs/data/themes/adi1090x-plymouth-themes/default.nix +++ b/pkgs/data/themes/adi1090x-plymouth-themes/default.nix @@ -7,7 +7,7 @@ # reference ./shas.nix for available themes selected_themes ? [], }: let - version = "2020-12-28"; + version = "1.0"; # this file is generated via ./update.sh # borrowed from pkgs/data/fonts/nerdfonts themeShas = import ./shas.nix; diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix b/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix index cb128478cdf..51a7178f094 100644 --- a/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix +++ b/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix @@ -1,322 +1,322 @@ { "abstract_ring" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring.tar.gz"; - sha = "133gifr4571b14ci44jmm49j91yhq785yx4b3h6yvx0188liibr2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring.tar.gz"; + sha = "0hfrzm974nm8f237vzlyjjh4pikva3n7fqr1p7jmx04g857g4rjq"; }; "abstract_ring_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring_alt.tar.gz"; - sha = "157yg2y4vfwjfly2paq2xn1p6h2wrbvvzwy4lbpbhlmhyhrymjvj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring_alt.tar.gz"; + sha = "0gx6l6w9d9z6am3x99igp6v1kykpwd39sjhalfsl21x1ah2cfmbh"; }; "alienware" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/alienware.tar.gz"; - sha = "1i3i0gj927drbgivcx3fqj6fqdwm2gqy0wrwfkdqdjyqzq1286a5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/alienware.tar.gz"; + sha = "0pq9zdhdz5vg97zfzsj9kh63szsm9qww2j7bgp2w4z6pg42xcswh"; }; "angular" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular.tar.gz"; - sha = "06n3ix7k8zpraqc75wy4fnk1bzcyhfajjxjq9kyy470wgsjrw6p4"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular.tar.gz"; + sha = "15rsljiv1nhgcsgjiwsb2jiwah1ghxa95dbj3hlddx8d337nxljc"; }; "angular_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular_alt.tar.gz"; - sha = "1l1iy9p0k4a8mcdps30avscjp6wfv20m9zy376r18y7xwcz19qbj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular_alt.tar.gz"; + sha = "12v4d7yjd81vch6cm2jphkb24gnc5d2kncfi4lsan6vhamija49f"; }; "black_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/black_hud.tar.gz"; - sha = "13y32zxcshnfyjxs0r7f1sz010sr6brsaap90im2cb4rlvp0ajsz"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/black_hud.tar.gz"; + sha = "07iy216xij19m6jy76z2rafmjm8mv4k7mwpp145xayz52zhs66s8"; }; "blockchain" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/blockchain.tar.gz"; - sha = "1f60nvrk506bqw47g90wzbvn3bp5h1gbi0ll5f3bd6wj77qfk05i"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/blockchain.tar.gz"; + sha = "1w0hz1fyj4p9qxwdhib9c7gxx582wb9fz2dyd77l9xqjkps78fjx"; }; "circle" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle.tar.gz"; - sha = "04085lkh4i5diszpr1w5xnhnngp8ba1ckalcjj5s8hm8lk6wd4nc"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle.tar.gz"; + sha = "16xrz3v85kpxc4palm8flc7lhscfl6psm1dz999r802yivxl5ikg"; }; "circle_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_alt.tar.gz"; - sha = "0awbjrd31fv2cb0q7n58h5iji29di8n550bmpz5qdg6xn55baqqx"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_alt.tar.gz"; + sha = "0hsia8rq059kyxrnikr6brwmg7pa5kbm3j9gj4ky1a83dwpx18lg"; }; "circle_flow" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_flow.tar.gz"; - sha = "0ffxgjmx5la55dn3nyqgxi8fyd1ci4wckmvfaa6s1kyd7xsk8785"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_flow.tar.gz"; + sha = "109m9hdirrr9a6gxgqpq80yz0lx4s7bv7nihdfjzg7rhl0icgw93"; }; "circle_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_hud.tar.gz"; - sha = "0sd28d0ac7wvkwmbrnvg42bccz6y4iyl2wp1pg7awwjxvag0azlf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_hud.tar.gz"; + sha = "1xmc30z5k583zrknx2g7rmq41vw9chyxhdacpxvxzyvnp0828z0j"; }; "circuit" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circuit.tar.gz"; - sha = "1jzlr6c47n3zs0f1cafgjy92sks5060d1gs0774kxc0c96bysypg"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circuit.tar.gz"; + sha = "0linpkxhx01v7q2s3c7z8py0h697z7a4jhwbs2gp47p2923xggij"; }; "colorful" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful.tar.gz"; - sha = "18lbyffvhdav5cjh0xnidf09amryf5dcj5rizl9z7ghxpz2z57pr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful.tar.gz"; + sha = "0m89prph31a0r0rxax989n72wdk3d5ywl8h3lygas8k7g908xr3p"; }; "colorful_loop" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_loop.tar.gz"; - sha = "0qcn19gxl9w2q0w7lihi8wnlwlh8h3k0ddbp3ww9wcw1q0wsy1vi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_loop.tar.gz"; + sha = "0nbdh6v8zn1xxm44sgr1904wik8pv0yrqjg84dym10k7hvfnb1af"; }; "colorful_sliced" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_sliced.tar.gz"; - sha = "0d9lafg76w2y77ywj1f1p5n1ci2q9jnfqfd16akf6f28h0iz1f9r"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_sliced.tar.gz"; + sha = "1yadpyiwiixxily7wzhd8myxnrvhzdc9m6lj7g4ll3hlwygw7rz1"; }; "connect" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/connect.tar.gz"; - sha = "1a0z59l391xv795d8mhcwa816wlmzyl75pwiizvvra2a0i8g6wz0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/connect.tar.gz"; + sha = "0gwd27vlr23zbf0mw34gd55f3s32a70q1s03z36dsf01bbyrvwz5"; }; "cross_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cross_hud.tar.gz"; - sha = "188wj6hkvryawmw4r3bwcsvqxx52h10jb4ddq3jx7sh2rz1kpvwa"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cross_hud.tar.gz"; + sha = "1j79c99n3r94vrf6f8n2a42jjfywaf7vf6q34awdqcl188hc3qzi"; }; "cubes" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cubes.tar.gz"; - sha = "0bydagjwfkvbhgr7sv903a7pjkrmrdz6vh22i4qjx5rhzw2wvvsk"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cubes.tar.gz"; + sha = "11r6q9f4vz64rxz8wshhhpyp7knwn2klw50z98bn3qbmwl3zfh8c"; }; "cuts" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts.tar.gz"; - sha = "0znz82zzgyqkfprvzhkzv974amcnxqdg38ajsm4d7wlagc52zs0d"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts.tar.gz"; + sha = "1bf8yrwha2bibnpf8abc0bxsj0g9sg3m1fpagxcpr61m0cl4i3vq"; }; "cuts_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts_alt.tar.gz"; - sha = "1bgs4v5kkh96m1xh29wjmdxinfsxh4g7lg9fk1nqj87igdg7wwss"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts_alt.tar.gz"; + sha = "00yrhfnfnmirzij5wd592cfn90crw3774a6wdxq4s538wrpmzhik"; }; "cyanide" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cyanide.tar.gz"; - sha = "04aklg9il310iv7zjpan6z4ha7gvh1b0yzgwi91679vm38cg0593"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cyanide.tar.gz"; + sha = "0bbrqg77m0655l9x90334b8yn60kni062p17h4rf6kp9qbi86gg0"; }; "cybernetic" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cybernetic.tar.gz"; - sha = "0ad75fcra24bjzs4pqn89l19wb4rcjph63j71lv60m0rz75vgjfb"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cybernetic.tar.gz"; + sha = "0chk52pfl81npffda6hy1pag6n8l5ssq61mc0qaa4nqfwpyvqqvw"; }; "dark_planet" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dark_planet.tar.gz"; - sha = "03i2knrfi56f8lbc8hs8rqa4jg432nsmjn74wibb04ppmvm8f47j"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dark_planet.tar.gz"; + sha = "1bbwdzgmvrdxkd379r1w2rkl0r5ixlh56xn59c47bmfbjl19927d"; }; "darth_vader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/darth_vader.tar.gz"; - sha = "0mlxy17l1hjf3nq390wc26n4x3c45n5hmks75zkzjz3l5ac1fah6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/darth_vader.tar.gz"; + sha = "1czq929j87zila0v49kikjqdw8bmssmn5cp573i3qb9kry5xdlm7"; }; "deus_ex" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/deus_ex.tar.gz"; - sha = "1mllj0xj9g1nn01vcq0xsfcwd0qnmk1s3vj5d03f9qp513k8qzdl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/deus_ex.tar.gz"; + sha = "1la8rlvy9gh593vx2w9wjq2hmsp58fd2gx9l9g2222mmzpk1hmcc"; }; "dna" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dna.tar.gz"; - sha = "0xcf4vxd99w3d44bhrdk1yqsfcakix6cd7hdpjsgccgs1jd02hi1"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dna.tar.gz"; + sha = "1mkq23khwsbnz8spf00amk48fx5vnk3rpzapx37rpx1klgxpm89q"; }; "double" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/double.tar.gz"; - sha = "07gxkzqrp0cfisdkq0wqfiai37m2yr2fhcpdpazmzkkxnm4qf25y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/double.tar.gz"; + sha = "11grxa2wblii4yxxrwfbbmwlwk26sm6mw9y00wfadijx2iyx30i1"; }; "dragon" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dragon.tar.gz"; - sha = "0ypr1vyl6zilfzncymlh2s1ivxr7n88kfaygmz2y83l332asjs66"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dragon.tar.gz"; + sha = "1hlvr2s8zhlf8mg9pskwby94kh15g8icxn3833cdqqhmgvc0d7l5"; }; "flame" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/flame.tar.gz"; - sha = "0kvly5rgp47a4lby3blb1dird9xwy9y9c8a0wg17qfvz3zr69r0g"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/flame.tar.gz"; + sha = "1yszmhmmjgdkjvqpij3gjwz8vxjhmklf7clbpz947254zgwxyn5g"; }; "glitch" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glitch.tar.gz"; - sha = "0s0kmrw01wj9i7qd7zbwvmfbbh7r3jfkc4522jv44m4rl6r4h84c"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glitch.tar.gz"; + sha = "15gwhfnrn0p80wdaymnlvrcig5cjb4m5qz56hbhg4jdwcjdlppbd"; }; "glowing" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glowing.tar.gz"; - sha = "19nkbk2cw6j763idz5z7l71lx529xcgyx1dcd9qd356x9ifdw206"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glowing.tar.gz"; + sha = "09h7dn805lrg04j5lp30l3qc6kb8xxilibdg0pxfadwyljblwl1f"; }; "green_blocks" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_blocks.tar.gz"; - sha = "0x8pgsyfbchy7z6d4rijsk2nml6fl1xwba0f0h3lw9i6359k7j3j"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_blocks.tar.gz"; + sha = "09xx5fbnby567s9s8hmryalm9k9vs520lymiprw06nig49rmy4v2"; }; "green_loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_loader.tar.gz"; - sha = "00rdpy1gbc4ikxx487w3k27z622z2rjcsi0d18i23s5p3xqd1l3a"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_loader.tar.gz"; + sha = "09vw6c9albsv28y4bdlp54csq5bl0vrd20yjph00jxhvhizffk3k"; }; "hexagon" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon.tar.gz"; - sha = "0yk47hs5qfv09q5df4x6j82ivrxfxh1bxsw8p8x7hcmlb08dh6g6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon.tar.gz"; + sha = "17api8ndiqjxyj7prxz0bv1dpq0h0wvphnll4lb2dlhxp61bjmj3"; }; "hexagon_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_2.tar.gz"; - sha = "175im23q769s2if3xi8j669r0b5y0dagz8rsbvq7kghznzw4abc2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_2.tar.gz"; + sha = "030yr5nb6q7bw1f1dh9kcdmd87x25f1fn60v45vmk7k07y1s10c8"; }; "hexagon_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_alt.tar.gz"; - sha = "1ayhw1gzrb98hf7f77b6ka5wi19ymp3mljhhgm5lx8w8pwawsxnb"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_alt.tar.gz"; + sha = "1f6i8signlscp0av3kcmdw0xm13pf2dy2lz3c6wq9d9203ibry1p"; }; "hexagon_dots" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots.tar.gz"; - sha = "0pdw9ih9fsxvv394yc5vfj7nlq7mca9w05y0s631gnsdzgqxsyd6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots.tar.gz"; + sha = "13mi9f8saw9zk8zdxp003ipigyd4y26iydn0pd1c0vr5fbz483rq"; }; "hexagon_dots_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots_alt.tar.gz"; - sha = "0aff3bgpva41b4jk4mp0fxdvli286x4pk3q9ysvps7z7srw4fvvn"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots_alt.tar.gz"; + sha = "1gkzh5i84cwv64f3r8rgpzyj8h1kpn92m4syf67kn5sdhqykvqkz"; }; "hexagon_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_hud.tar.gz"; - sha = "0wpmsffdp59dy2g5ggprgr7l50rf131c7v8pbgpir230lpn10xzi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_hud.tar.gz"; + sha = "17k5378fsydvcps9rxd117rfqlijnrsj1ggyqx445a5yrwy6rx55"; }; "hexagon_red" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_red.tar.gz"; - sha = "0fgmma5j6fnjykpwplji4rm57d07l9shfpay079gz1nhbhnq3rkl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_red.tar.gz"; + sha = "0x8i1k54qff7agwq9gqi2z59lww8qglck105bv87ylgy5z6150sx"; }; "hexa_retro" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hexa_retro.tar.gz"; - sha = "1cbyhqhv2ysx9w8cpbfidrm0w70wssp4fld0q1g01fgcbg93b7mf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexa_retro.tar.gz"; + sha = "0bwx2nvvr6bkqnmnv2kh9slbi11lv0h3hnzql99d9llr3vlid5ip"; }; "hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud.tar.gz"; - sha = "0s01p1n75ckwa69iy5v2z2cg85ipzgx356n4yvdyi1jh9pnl22k9"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud.tar.gz"; + sha = "0zng0rn4lacxf9v1azndzv5v7pl84f0amschccdlnymilyy564ck"; }; "hud_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_2.tar.gz"; - sha = "1bvkl5f0fwi7xzy23pj3p7c98fbz2zk8abz7frxr0pp0xj3ql87i"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_2.tar.gz"; + sha = "14ldw37gpysnw3k1cssh8q1hgxnrh954pgq5x5xhrlv2w6rsbfzq"; }; "hud_3" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_3.tar.gz"; - sha = "1n5qqkp0qb4mlpp7g20hpvazgwxw4gjb2p0ys0q2bglb3amzc2xr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_3.tar.gz"; + sha = "0lc3x51gjfc58y45yzfnpy2i07vk9vdzbjl5yawv3wh97jy5x6x7"; }; "hud_space" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_space.tar.gz"; - sha = "0dhajnica048smn5wpwc13ij0n9g6c10a0qxgi4rwiczr7p9vajj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_space.tar.gz"; + sha = "13ipj1l737bs9rnhh5vviq6bm5hdghpyq6s5hc1fhg2cgldfnq0i"; }; "ibm" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ibm.tar.gz"; - sha = "0xri6x716ma3y7d59yn9vm7skw5y53kn6s2ivfrvlfsac9n1zj4m"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ibm.tar.gz"; + sha = "0acs1f468xfpsvzy400f8ba7890n3pp69c9b20lb8slamm9l4swd"; }; "infinite_seal" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/infinite_seal.tar.gz"; - sha = "0r9plydfdc35s2is1zi3pbx3s0bs5hqkim3laiav8fv3rzq0f3lq"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/infinite_seal.tar.gz"; + sha = "07g4qmkfc9yqjpbs0yr277ij3pbhc1p51gzpnnbc3viwm1zzrs6p"; }; "ironman" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ironman.tar.gz"; - sha = "0af6qfdqj0n5qgsxg6nnrs2k8xas6cd18jw96mrwfcckpfz091cm"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ironman.tar.gz"; + sha = "0w5z22529jrgd2ab7fqibm2sd57740qxyqqrzhyvgd4l5axn1yzd"; }; "liquid" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/liquid.tar.gz"; - sha = "0ghavh6nj68kwcgvrnwbabkzn44zq0m2ic1b2cl278d2vffzqv87"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/liquid.tar.gz"; + sha = "01lwzb2yid7hb1f2nc0jycll9kvq89jcz7s7w81vqirx4by8p8n8"; }; "loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader.tar.gz"; - sha = "1zlba3mra45ii0gahlw8v1vq1j7nbfjq62pcjn43vb40zcc1j873"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader.tar.gz"; + sha = "0vx66kb56n6dy74k6yjk5w8apc8q1hmr8mrpgl420lzdqm4ggrgz"; }; "loader_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_2.tar.gz"; - sha = "1yw4n9bw483pl7m3ks2ajgfldslgyc4gb1kw61fszfp5x4l3k4rg"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_2.tar.gz"; + sha = "0rir3gfi8bq4m8s0xhbd2ppny6q60b42wq9vs826axk2g58jczrw"; }; "loader_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_alt.tar.gz"; - sha = "1pi97pfhg13wq5s8hai4fd31s6bcfq09r969fl216yxksj8h69wj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_alt.tar.gz"; + sha = "0pfg304xmgc46ai9d5m51p05i7zbvhfzfsscn7yk6kiw09b21fpz"; }; "lone" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/lone.tar.gz"; - sha = "0413mxr8lqlznbps5c4qgbhm0zpz8dlkbdj67r9gvzi9v020qjgl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/lone.tar.gz"; + sha = "0xx959215w8qcpbzn9w3ip4shq3ib7dcni43z4m9jwa28aa3v7y8"; }; "metal_ball" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/metal_ball.tar.gz"; - sha = "129q23q992fxfi976px5r68sf8wqbac3zby4yjh97s48zm83rzb5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/metal_ball.tar.gz"; + sha = "18nbikv736yd1q4qf9nq0fzspmxlkq1z6kl0jzady8ifkny1kvlw"; }; "motion" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/motion.tar.gz"; - sha = "0g84ac8ps69ihic2z7gr4nlwib9ra86il2fdl7rl7w5nc8xzhx1y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/motion.tar.gz"; + sha = "0nbvgsgkpkdx83v45fb4z6ywiz3cpdmbsx8jcxhaa0cpywvq40bh"; }; "optimus" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/optimus.tar.gz"; - sha = "1l4bmbiqqypwqvyhcd561nnxhrq5zif8pmkyk2hdwscbq6rlbc7r"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/optimus.tar.gz"; + sha = "0zxv3b21mxkl0dvhs6nzd94vlsphc8h1zzvkcgng6cqg9n1c206p"; }; "owl" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/owl.tar.gz"; - sha = "03gqqcvp4320qy1d3az1k2a8rj97alk8qzgkz6xg4akz9ccd731y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/owl.tar.gz"; + sha = "1ylkpydmy65xilqzkdps18kr0yyqggkxaysmmik3sz01qs6xjrz6"; }; "pie" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pie.tar.gz"; - sha = "1j479l428gq1b2g0g2ybkf81jzad69n59kphm0ns5gfv6khx10ga"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pie.tar.gz"; + sha = "1x834k0qsa8c7z3ds0vk6cw2r1f4ydmyk8yz1hdw8lxys17n9rj8"; }; "pixels" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pixels.tar.gz"; - sha = "13rfdd9v7h0k2wbwr428h2w8dv5vhhbw03wvirlmafsbhmgjz5xs"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pixels.tar.gz"; + sha = "072ag60r2n3jjj64r1nzsj5p97gjcfrvd72axm1z741rz5xaigki"; }; "polaroid" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/polaroid.tar.gz"; - sha = "096iz34hpmicixrdrqaxmx8m83vggm90xqz4zyy5vkpcy3vl60mf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/polaroid.tar.gz"; + sha = "0m748kj5qps9vwwww44i1lj64r0mg0hqnfkg7dhqrf7nl0saw4da"; }; "red_loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/red_loader.tar.gz"; - sha = "0n2jmfy558rma6knraskb7rgccvnayxh7csl0jaarx2xl9zxzzay"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/red_loader.tar.gz"; + sha = "18vvlknnp3kiviacmp0cbmagrqzbhli6qv6vbzw362cv2mxhid85"; }; "rings" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings.tar.gz"; - sha = "1g9p2cdn1w7dmy2z017xdkv6rm50gdb5qqd8a0y0662fzph5adg0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings.tar.gz"; + sha = "0xhwnxr5hcxqr64vr45lkvwzbbcpzxfbdlad006r16m480ncripw"; }; "rings_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings_2.tar.gz"; - sha = "07v4mq1lpw9vfzg0rfxmkyfhyhz3nv5zab5kf10bjjgpjq8c9fi3"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings_2.tar.gz"; + sha = "0vdjby6kyazxy042ljyv59pg4zfsvzzssf20w4r7ircfyiqypajs"; }; "rog" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog.tar.gz"; - sha = "13lcrsdk1v1xn7fxn54xbk1jkh55kmsf813q1v7x8a2l8p9pl0hp"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog.tar.gz"; + sha = "0az3vxndzym39w7357mmr6zyzfy32pg036v6jim895z10093b0y0"; }; "rog_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog_2.tar.gz"; - sha = "0cgc1y1jrb689h9wd7jf3wvf9r996k4ik965v4wclmp9wra5gflk"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog_2.tar.gz"; + sha = "13yfqb06ihzma80lfsb0mlsaq0j6qakqx607pr5rmhl6765bz116"; }; "seal" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal.tar.gz"; - sha = "0ip23x69ljdj1bwxlhvz3fbg3ia47m2aw6d122v2rqhwqasmy40n"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal.tar.gz"; + sha = "14k98v41ng3had7n6q1z513yc53zzkji7gm4n2jpjj5rd1jd2xr8"; }; "seal_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_2.tar.gz"; - sha = "1fc91n6ys2fl8xbzdj0ywck87xnyn1gp4jvjk307w49jmkpdzs15"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_2.tar.gz"; + sha = "0kwn7njj7anci9ihf8aqs7k7qv2vsnqc81sj5db672qn4hxpy50v"; }; "seal_3" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_3.tar.gz"; - sha = "1l2jlxhhaf5whbvbdf31ypcasalx4fsd4yn90xybmjq7b27bz5b2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_3.tar.gz"; + sha = "0pjqq7qlmb0mf0xnm001b1f5jcbfzd3a3hzsf0jysacb5wmpzspp"; }; "sliced" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sliced.tar.gz"; - sha = "0363lwq3rwdcz3fg47f6kch150vxspvpjdqzg87aahli30kkjfdi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sliced.tar.gz"; + sha = "1xrlhg1glykj73x9spq609y4ygfy3xw4azk3npjfh3ky5l0jqxjg"; }; "sphere" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sphere.tar.gz"; - sha = "1zjlwign7f2zd70qkg25adbbmq8ndm9b44gc4pa0ls64i6yfd6fz"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sphere.tar.gz"; + sha = "1nav61fr7wba1vbas8wci3fpyx0pidgiv9wm4zxdrw7hqw8akkpn"; }; "spin" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spin.tar.gz"; - sha = "0hwjc4i69zmzw7cpmsrhmx00w5k5y46m317m1imw2ycmhm0jicm5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spin.tar.gz"; + sha = "1yb39jmvifb1ijh5i804d06c97samhf8w4p0w1xwxq29j6ihsvw9"; }; "spinner_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spinner_alt.tar.gz"; - sha = "1ifs9xxd1cxvgjcnqjfw2zxkcapssv10hvchjrlf9nl60ayyp4m4"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spinner_alt.tar.gz"; + sha = "136nhpxlc2kar9jwz4pdxpg30b66n7bqy5mk9lm4v90pwf5m3kbs"; }; "splash" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/splash.tar.gz"; - sha = "12l8hwzmi68mjqgl384wf1fscvnzwp4a3vmlsb2zcbfwhrs5q717"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/splash.tar.gz"; + sha = "1wnmqqm07yrbd5ha31dd2iihmrjr555hd8fgra9fy9zh2pw9wgf2"; }; "square" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square.tar.gz"; - sha = "1mpyrivchsj2gr8flwj0g45vb792fvjjb5jmkn9xz1glrxxs7zww"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square.tar.gz"; + sha = "1wkixypxchsi11d8qfackcbvcjhifys9xlsc61rd7hfgz2nwjmww"; }; "square_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square_hud.tar.gz"; - sha = "1lvv00r5rg8yjwibfqncka1s0p59fnpklhz3v6ifbs7ynlyp0kag"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square_hud.tar.gz"; + sha = "13bbzxv4gq66z0h801m8fi3n2rk41212nhapa5xb3xgh7v23my04"; }; "target" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target.tar.gz"; - sha = "1ipsd3rjclmwzg2l4bxpj0mgfl5bwxs1ihf498660zhm0bqqpgpr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target.tar.gz"; + sha = "0vk8abdxhs93bj9l21db2ai7w945z472rwwn1m4070vrhs2fvzn4"; }; "target_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target_2.tar.gz"; - sha = "16lipy5c0pyyb1idwj1zchfr8g0cy6qr46c87b8g1kv2g96n5cn6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target_2.tar.gz"; + sha = "0n6f1lnmry5zv3y592gp0r2rn297h806zhcgd7yfp0z2zgay67nz"; }; "tech_a" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_a.tar.gz"; - sha = "0fn8aib05kmjxnp7j2bmgrs3avaj6bn06kxz55bw8fdg8ihxnxg0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_a.tar.gz"; + sha = "13gdq6h3m7skryr95vi0a30ylrapxg1nkc8cv8vn025gj6bafa83"; }; "tech_b" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_b.tar.gz"; - sha = "03i8jcvql76mhcq0dqaj2wygfza72fc7c22vfcyp38cx1lm6ilbv"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_b.tar.gz"; + sha = "1l383plabzlkccqjhf8x02jskykr4wkj2wy6knk9kg6qrq8w870l"; }; "unrap" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/unrap.tar.gz"; - sha = "08gqwb11539kz5178ga6f96jv82xmyyzv44q6d05ajcw3pxk5j4c"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/unrap.tar.gz"; + sha = "0571pvnhmny9642rfg7sw6csrz7bka2424zfryg858c0hg6aqrnk"; }; } diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/update.sh b/pkgs/data/themes/adi1090x-plymouth-themes/update.sh index 82eb9916553..0fe5db726b3 100755 --- a/pkgs/data/themes/adi1090x-plymouth-themes/update.sh +++ b/pkgs/data/themes/adi1090x-plymouth-themes/update.sh @@ -8,27 +8,21 @@ curl_args=( '--silent' ) # optionally takes a GITHUB_TOKEN to overcome api rate limiting. if [ -n "$GITHUB_TOKEN" ]; then curl_args+=( --header "authorization: Bearer ${GITHUB_TOKEN}" ); fi -# get last master ref -curl_args+=( --url https://api.github.com/repos/adi1090x/files/commits/master ) -last_ref=$(curl "${curl_args[@]}" | jq -r '.sha' ) - -unset curl_args[-1] -curl_args+=( https://api.github.com/repos/adi1090x/files/git/trees/$last_ref\?recursive=1 ) - -theme_archives=$(curl "${curl_args[@]}" \ - | jq '.tree | map(select(.path| test("^plymouth-themes/themes/pack_.*tar.gz$"))| .path)') +# get latest release assets +curl_args+=( --url https://api.github.com/repos/adi1090x/plymouth-themes/releases/latest ) +theme_archives=$(curl "${curl_args[@]}" | jq -r '.assets' ) dirname="$(dirname "$0")" printf '{\n' > "$dirname/shas.nix" -repo_url="https://github.com/adi1090x/files/raw/$last_ref" - while read -r file_path do - name=$(basename $file_path) - printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name%%.*}" "$repo_url/$file_path" "$(nix-prefetch-url "$repo_url/$file_path")" >>"$dirname/shas.nix" -done < <(jq -r '.[]' <<<"$theme_archives") + name="$(basename $file_path)" + name="${name/.tar.gz/}" + + printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name}" "$file_path" "$(nix-prefetch-url "$file_path")" >>"$dirname/shas.nix" +done < <(jq -r '.[].browser_download_url' <<<"$theme_archives") printf '}\n' >> "$dirname/shas.nix" diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index b7c14444110..79dcc88a6f5 100644 --- a/pkgs/data/themes/adw-gtk3/default.nix +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "adw-gtk3"; - version = "4.5"; + version = "5.1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x6ul5NZDWqEQfLzmpR7X5HgUmHNSbpuTnCquVEHFHL8="; + sha256 = "sha256-vRB6+C27M4u7v10c6dqGsKpxHMGfpCSiScZ+8qlJRr0="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix new file mode 100644 index 00000000000..203b260e251 --- /dev/null +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, nix-update-script +, stdenvNoCC +, ... }: + +stdenvNoCC.mkDerivation (self: { + name = "alacritty-theme"; + version = "unstable-2023-10-26"; + + src = fetchFromGitHub { + owner = "alacritty"; + repo = "alacritty-theme"; + rev = "e1b08b5bc06d07dd65f5e72b12fd7f736e0e7928"; + hash = "sha256-wf0aT2uGe/6Ifv//lQStTm24yt2FX3kWQq5ebdmdPJ0="; + }; + + dontConfigure = true; + dontBuild = true; + preferLocalBuild = true; + + sourceRoot = "${self.src.name}/themes"; + installPhase = '' + runHook preInstall + install -Dt $out *.yaml + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = with lib; { + description = "Collection of Alacritty color schemes"; + homepage = "https://alacritty.org/"; + license = licenses.asl20; + maintainers = [ maintainers.nicoo ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/data/themes/catppuccin-gtk/default.nix index 1e62dd73746..6459f50fe78 100644 --- a/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/pkgs/data/themes/catppuccin-gtk/default.nix @@ -28,13 +28,13 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "catppuccin"; repo = "gtk"; rev = "v${version}"; - hash = "sha256-BjdPe3wQBSVMYpeCifq93Cqt/G4bzsZYgOPBTilHqD8="; + hash = "sha256-J1iLN2FF3Ml/3zmntXYlfkv6dZcwl62A9X4ruAH1ll4="; }; nativeBuildInputs = [ gtk3 sassc ]; @@ -79,6 +79,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/catppuccin/gtk"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.fufexan ]; + maintainers = with maintainers; [ fufexan PlayerNameHere ]; }; } diff --git a/pkgs/data/themes/catppuccin/default.nix b/pkgs/data/themes/catppuccin/default.nix new file mode 100644 index 00000000000..59e030eb9e0 --- /dev/null +++ b/pkgs/data/themes/catppuccin/default.nix @@ -0,0 +1,189 @@ +let + validThemes = [ "bat" "bottom" "btop" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ]; +in +{ fetchFromGitHub +, lib +, stdenvNoCC +, accent ? "blue" +, variant ? "macchiato" +, themeList ? validThemes +}: +let + pname = "catppuccin"; + + validAccents = [ "rosewater" "flamingo" "pink" "mauve" "red" "maroon" "peach" "yellow" "green" "teal" "sky" "sapphire" "blue" "lavender" ]; + validVariants = [ "latte" "frappe" "macchiato" "mocha" ]; + + selectedSources = map (themeName: builtins.getAttr themeName sources) themeList; + sources = { + bat = fetchFromGitHub { + name = "bat"; + owner = "catppuccin"; + repo = "bat"; + rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; + hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; + }; + + bottom = fetchFromGitHub { + name = "bottom"; + owner = "catppuccin"; + repo = "bottom"; + rev = "c0efe9025f62f618a407999d89b04a231ba99c92"; + hash = "sha256-VaHX2I/Gn82wJWzybpWNqU3dPi3206xItOlt0iF6VVQ="; + }; + + btop = fetchFromGitHub { + name = "btop"; + owner = "catppuccin"; + repo = "btop"; + rev = "1.0.0"; + hash = "sha256-J3UezOQMDdxpflGax0rGBF/XMiKqdqZXuX4KMVGTxFk="; + }; + + hyprland = fetchFromGitHub { + name = "hyprland"; + owner = "catppuccin"; + repo = "hyprland"; + rev = "v1.2"; + hash = "sha256-07B5QmQmsUKYf38oWU3+2C6KO4JvinuTwmW1Pfk8CT8="; + }; + + k9s = fetchFromGitHub { + name = "k9s"; + owner = "catppuccin"; + repo = "k9s"; + rev = "516f44dd1a6680357cb30d96f7e656b653aa5059"; + hash = "sha256-PtBJRBNbLkj7D2ko7ebpEjbfK9Ywjs7zbE+Y8FQVEfA="; + }; + + kvantum = fetchFromGitHub { + name = "kvantum"; + owner = "catppuccin"; + repo = "Kvantum"; + rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc"; + sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk="; + }; + + lazygit = fetchFromGitHub { + name = "lazygit"; + owner = "catppuccin"; + repo = "lazygit"; + rev = "0543c28e8af1a935f8c512ad9451facbcc17d8a8"; + hash = "sha256-OVihY5E+elPKag2H4RyWiSv+MdIqHtfGNM3/1u2ik6U="; + }; + + plymouth = fetchFromGitHub { + name = "plymouth"; + owner = "catppuccin"; + repo = "plymouth"; + rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c"; + hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE="; + }; + + refind = fetchFromGitHub { + name = "refind"; + owner = "catppuccin"; + repo = "refind"; + rev = "ff0b593c19bb9b469ee0ee36068b8d373f0fadc5"; + hash = "sha256-itUMo0lA23bJzH0Ndq7L2IaEYoVdNPYxbB/VWkRfRso="; + }; + + rofi = fetchFromGitHub { + name = "rofi"; + owner = "catppuccin"; + repo = "rofi"; + rev = "5350da41a11814f950c3354f090b90d4674a95ce"; + hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; + }; + + waybar = fetchFromGitHub { + name = "waybar"; + owner = "catppuccin"; + repo = "waybar"; + rev = "v1.0"; + hash = "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw="; + }; + }; +in +lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] +lib.checkListOfEnum "${pname}: accent" validAccents [ accent ] +lib.checkListOfEnum "${pname}: themes" validThemes themeList + +stdenvNoCC.mkDerivation { + inherit pname; + version = "unstable-2023-10-09"; + + srcs = selectedSources; + + unpackPhase = '' + for s in $selectedSources; do + b=$(basename $s) + cp $s ''${b#*-} + done + ''; + + installPhase = '' + runHook preInstall + + local capitalizedVariant=$(sed 's/^\(.\)/\U\1/' <<< "${variant}") + local capitalizedAccent=$(sed 's/^\(.\)/\U\1/' <<< "${accent}") + + '' + lib.optionalString (lib.elem "bat" themeList) '' + mkdir -p $out/bat + cp "${sources.bat}/Catppuccin-${variant}.tmTheme" "$out/bat/" + + '' + lib.optionalString (lib.elem "btop" themeList) '' + mkdir -p $out/btop + cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop/" + + '' + lib.optionalString (lib.elem "bottom" themeList) '' + mkdir -p $out/bottom + cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/" + + '' + lib.optionalString (lib.elem "hyprland" themeList) '' + mkdir -p $out/hyprland + cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/" + + '' + lib.optionalString (lib.elem "k9s" themeList) '' + mkdir -p $out/k9s + cp "${sources.k9s}/dist/${variant}.yml" "$out/k9s/" + + '' + lib.optionalString (lib.elem "kvantum" themeList) '' + mkdir -p $out/share/Kvantum + cp -r ${sources.kvantum}/src/Catppuccin-"$capitalizedVariant"-"$capitalizedAccent" $out/share/Kvantum + + '' + lib.optionalString (lib.elem "lazygit" themeList) '' + mkdir -p $out/lazygit/{themes,themes-mergable} + cp "${sources.lazygit}/themes/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes/" + cp "${sources.lazygit}/themes-mergable/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes-mergable/" + + '' + lib.optionalString (lib.elem "plymouth" themeList) '' + mkdir -p $out/share/plymouth/themes/catppuccin-${variant} + cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant} + sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth + + '' + lib.optionalString (lib.elem "rofi" themeList) '' + mkdir -p $out/rofi + cp ${sources.rofi}/basic/.local/share/rofi/themes/catppuccin-${variant}.rasi $out/rofi/ + + '' + lib.optionalString (lib.elem "refind" themeList) '' + mkdir -p $out/refind/assets + cp ${sources.refind}/${variant}.conf $out/refind/ + cp -r ${sources.refind}/assets/${variant} $out/refind/assets/ + + '' + lib.optionalString (lib.elem "waybar" themeList) '' + mkdir -p $out/waybar + cp ${sources.waybar}/${variant}.css $out/waybar/ + + '' + '' + runHook postInstall + ''; + + meta = { + description = "Soothing pastel themes"; + homepage = "https://github.com/catppuccin/catppuccin"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.khaneliman ]; + }; +} diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/data/themes/colloid-gtk-theme/default.nix index 6b56064b873..71e7fb9a286 100644 --- a/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchFromGitHub -, gitUpdater , gnome-themes-extra , gtk-engine-murrine , jdupes @@ -23,13 +22,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-08-12"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-Ss6IXd4vYUvIF5/Hn4IVLNvDSaewTY0GNZp7X5Lmz/c="; + hash = "sha256-NxIWH3qLW8sEguovAv9wfgnlnmPlTipRJTmMo3rSHNY="; }; nativeBuildInputs = [ @@ -64,8 +63,6 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { }; - meta = with lib; { description = "A modern and clean Gtk theme"; homepage = "https://github.com/vinceliuice/Colloid-gtk-theme"; diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index 7a8444afbe3..61ddd00abd3 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20230606"; + version = "20231026"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-NnCRWADyAOR5yyOjB18zSQov+5FfKhhCSkDXBAL80wo="; + hash = "sha256-sKQOq0GMslkzND2ayL5M6XIxJv8t0yj6XCP3poA6wRc="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index 31422625a48..b59b1393c6d 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation rec { ${lib.optionalString wallpapers '' mkdir -p $out/share/backgrounds - cp -a wallpaper/Graphite-normal/*.png $out/share/backgrounds/ + cp -a wallpaper/Graphite/*.png $out/share/backgrounds/ ${lib.optionalString (builtins.elem "nord" tweaks) '' cp -a wallpaper/Graphite-nord/*.png $out/share/backgrounds/ ''} diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix index 6e9db943c91..46d6af5f24c 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TESTING=OFF" "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" ]; diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/data/themes/marwaita-peppermint/default.nix index 6873cd31f8d..16a60de9287 100644 --- a/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/pkgs/data/themes/marwaita-peppermint/default.nix @@ -5,17 +5,18 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "10.3"; + version = "17.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = version; - sha256 = "09lqp82aymj3silpwmjkkf4mgv3b1xw7181ck89lz2nxb98sr9im"; + rev = "247f9c539d6eef8ae3a5f59beed42a40b1f10434"; + hash = "sha256-uT7KnpIdxypUqKhXOao3Bz3vJecJKK+GjcAp9biNyHc="; }; buildInputs = [ @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Marwaita GTK theme with Peppermint Os Linux style"; homepage = "https://www.pling.com/p/1399569/"; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index eccff020ce5..d19ed938bf5 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "a stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-04-03"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "mr9X7p/H8H2QKZxAQC9j/8OLK4D3EnWLxriFlh16diE="; + sha256 = "+sWYUCFp5J+fhPHxicwtsHCQkFTpKwjj9H3GAXqNaYo="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 8d977671fe7..16eefee7bbb 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,119 +2,151 @@ , stdenv , fetchFromGitHub , gtk-engine-murrine +, breeze-icons +, plasma-framework +, plasma-workspace , jdupes }: stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2023-05-12"; + version = "unstable-2023-10-17"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "399246cdcbdb1a714c5bb294857cd5a6494b6006"; - sha256 = "sha256-0yZ4QYcdcGHEw6tdcXAKZ4e+mhNNmvihBxp2sLgTuu8="; + rev = "e97d2bcf4494f8ab502e33d13c74b396469a42f4"; + hash = "sha256-7WfCE3eoJ7maAYqgQNb0mlw8u3zc6NAwTJN+PVojDcE="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "3599ddb6f8b7de936cf106bddd4f929ddfe88b1c"; - sha256 = "sha256-ft5UbBnjP0xNFFVwk5Elvrpcj273OupjM+MGJVlvJZQ="; + rev = "73ed3490c13b2df6c3d27d6b3bcba0c087297f4a"; + hash = "sha256-fRmGiqtjfGFIfr5hRBS3ZPFYEpQx391WoxphB5gRTJo="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b03b66d5badadc2e5ff27b8745a2308b8fafaa61"; - sha256 = "sha256-6dORsGfYi7q8z7JWA3Y9oqVs9bhT/gbdSrcgJcebGP8="; + rev = "4b1fc2942bad203a0aa035cbb688b28005bb1011"; + hash = "sha256-VU5Bo39l8xdR6QmbTR0Qic6XkSfDFrhyjoHaMm9SBYM="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "e19b75f56e5c328352c183fc960a0be54e99836e"; - sha256 = "sha256-deKHT0dE5tsUo7+vkzxQ/eRon7COrOAWolw17VtKhiE="; + rev = "6d57a16eef66c25f0212b7d2f02e208f2afdf4f9"; + hash = "sha256-Sq5ZXOh+HA+udQHL2wUw5azgKwAVVvHGNb3SiuOn0nQ="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b134b4a1299b3c4a2d9543707ec2b5a0fc97987c"; - sha256 = "sha256-XSDwc0/59sUHkS0holvujmr/p6vX79648l9cxJqunuM="; + rev = "566e38c40bca86df93d0e9226c33d5d525d34454"; + hash = "sha256-Wl/m2O0tVCFgZhPC/gcNgKr0JqQbiyQBpGEcp8g6kvY="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "a4efbc09470b36f4cf6af60b5fdfeb8e09282fb3"; - sha256 = "sha256-Qgrl6p0AhbhK0+aM8hu85Kz/Lz/b2Nn8uWS+WpTGjU4="; + rev = "b43efee28129634fdefe70f2a03c401efc7dc22f"; + hash = "sha256-rLOWkfTMFEnVU2tuw5M2fvbNMPfxIu+gzi+3gnBEhx4="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0d44fb16d0f07ef8615fd7740317a518d2b9411f"; - sha256 = "sha256-388251/Tg4jyn7c8zkrUxVFooN9O67xk2NTSeYa0VvI="; + rev = "2192acfce55fbb9a2982886abe25e623d0e7ff66"; + hash = "sha256-B/sAy4I+9gX9dHXUldcN5t0vlOL2Jnoan/hRV+tNnSo="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0eea9185946fee20b6d7472548226a3652dea7ae"; - sha256 = "sha256-8JFrmGKn8cl1x3TeDPee1zbMmtypJ9kALv/PRqRHGAU="; + rev = "a24b42411d8ea0dc63bf0778e443be251858e586"; + hash = "sha256-02z4eMFtok1+SeW+ai7vZCXZb6ZhU4l4ch1Zc/GyhYM="; name = "Nordic-Polar-standard-buttons"; }) ]; sourceRoot = "."; + outputs = [ "out" "sddm" ]; + nativeBuildInputs = [ jdupes ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + dontWrapQtApps = true; + installPhase = '' runHook preInstall + # install theme files mkdir -p $out/share/themes cp -a Nordic* $out/share/themes + + # remove uneeded files rm -r $out/share/themes/*/.gitignore rm -r $out/share/themes/*/Art + rm -r $out/share/themes/*/FUNDING.yml rm -r $out/share/themes/*/LICENSE rm -r $out/share/themes/*/README.md rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js} rm -r $out/share/themes/*/src rm -r $out/share/themes/*/cinnamon/*.scss - rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss} + rm -r $out/share/themes/*/gnome-shell/{earlier-versions,extensions,*.scss} rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh} rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss} + rm -r $out/share/themes/*/gtk-4.0/{apps,widgets,*.scss} rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish} + # move wallpapers to appropriate directory + mkdir -p $out/share/wallpapers/Nordic + mv -v $out/share/themes/Nordic/extras/wallpapers/* $out/share/wallpapers/Nordic/ + rmdir $out/share/themes/Nordic/extras{/wallpapers,} + # move kde related contents to appropriate directories - mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes/Nordic} + mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,icons} mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/ mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/ mv -v $out/share/themes/Nordic/kde/konsole $out/share/ mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/ mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/ - mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/ + mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/ + mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/ + + mkdir -p $sddm/share/sddm/themes + mv -v $out/share/themes/Nordic/kde/sddm/* $sddm/share/sddm/themes/ + rm -rf $out/share/themes/Nordic/kde - # Replace duplicate files with hardlinks to the first file in each - # set of duplicates, reducing the installed size in about 65% - jdupes -L -r $out/share + # Replace duplicate files with symbolic links to the first file in + # each set of duplicates, reducing the installed size in about 53% + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; + postFixup = '' + # Propagate sddm theme dependencies to user env otherwise sddm + # does find them. Putting them in buildInputs is not enough. + + mkdir -p $sddm/nix-support + + printWords ${breeze-icons} ${plasma-framework} ${plasma-workspace} \ + >> $sddm/nix-support/propagated-user-env-packages + ''; + meta = with lib; { description = "Gtk and KDE themes using the Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix index 9547e354389..c18d55db5b4 100644 --- a/pkgs/data/themes/onestepback/default.nix +++ b/pkgs/data/themes/onestepback/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { pname = "onestepback"; - version = "0.991"; + version = "0.994"; srcs = [ (fetchurl { url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; - sha256 = "1jfgcgzbb6ra9qs3zcp6ij0hfldzg3m0yjw6l6vf4kq1mdby1ghm"; + hash = "sha256-kjGiGo4bF1mWJPnaPv2lf7rGG/uAntHK61mH6lcJ6e4="; }) (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-grey-brown-green-blue-v${version}.zip"; - sha256 = "0i006h1asbpfdzajws0dvk9acplvcympzgxq5v3n8hmizd6yyh77"; - }) - (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-green-brown-v${version}.zip"; - sha256 = "16p002lak6425gcskny4hzws8x9dgsm6j3a1r08y11rsz7d2hnmy"; + url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-darker-v${version}.zip"; + hash = "sha256-AuurSa45uF5GbPqaMXKblWkv3YGkYL1z0VjWrbnsB/I="; }) ]; @@ -24,15 +20,17 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = '' + runHook preInstall mkdir -p $out/share/themes cp -a OneStepBack* $out/share/themes/ rm $out/share/themes/*/{LICENSE,README*} + runHook postInstall ''; meta = with lib; { description = "Gtk theme inspired by the NextStep look"; homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index 2d07ac3ae38..351c1c22207 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-05-27"; + version = "2023-10-20"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-I1a8y9dAJqFgnhyMqfupSdGvbbScf6tSYKlAhAzY4Dk="; + hash = "sha256-GhSzTtbuvbAuXxKNm29sJX5kXE2s2jMDB6Ww6Q7GNSo="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/pkgs/data/themes/sweet-nova/default.nix b/pkgs/data/themes/sweet-nova/default.nix index 5c89964eeaf..22a16fa9284 100644 --- a/pkgs/data/themes/sweet-nova/default.nix +++ b/pkgs/data/themes/sweet-nova/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "sweet-nova"; - version = "unstable-2023-04-02"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "EliverLara"; repo = "Sweet"; - rev = "8a5d5a7d975567b5ae101b9f9d436fb1db2d9b24"; - hash = "sha256-FVcXBxcS5oFsvAUDcwit7EIfgIQznl8AYYxqQ797ddU="; + rev = "6e82150d7c3bb1e30ed9bd64de4d2ddd8e113205"; + hash = "sha256-vy4SO1j4y/cUmbQJNqW1/EPJljEtaRrigYIg4yMKXr4="; }; buildPhase = '' diff --git a/pkgs/data/themes/tokyo-night-gtk/default.nix b/pkgs/data/themes/tokyo-night-gtk/default.nix index a117562174e..dc3273e695b 100644 --- a/pkgs/data/themes/tokyo-night-gtk/default.nix +++ b/pkgs/data/themes/tokyo-night-gtk/default.nix @@ -1,38 +1,38 @@ { lib -, stdenvNoCC -, fetchFromGitHub +, callPackage +, runCommand , gtk-engine-murrine +, gnome-themes-extra }: -stdenvNoCC.mkDerivation { - pname = "tokyo-night-gtk"; - version = "2023.01.17"; +let + prefix = "tokyo-night-gtk"; - src = fetchFromGitHub { - owner = "Fausto-Korpsvart"; - repo = "Tokyo-Night-GTK-Theme"; - rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb"; - sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0="; - }; + packages = lib.mapAttrs' (type: content: { + name = type; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + value = lib.mapAttrs' (variantName: variant: { + name = variantName; + value = callPackage ./generic.nix { inherit prefix type variantName variant; }; + }) content; + }) (lib.importJSON ./variants.json); +in packages // { + # Not using `symlinkJoin` because it's massively inefficient in this case + full = runCommand "${prefix}_full" { + preferLocalBuild = true; - dontBuild = true; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + } '' + mkdir -p $out/share/{icons,themes,${prefix}} - installPhase = '' - runHook preInstall - mkdir -p $out/share/themes - cp -a themes/* $out/share/themes - runHook postInstall + ${lib.concatStrings (lib.forEach (lib.attrValues (lib.attrsets.mergeAttrsList (lib.attrValues packages))) (variant: + '' + ln -s ${variant}/share/${variant.ptype}/Tokyonight-${variant.pvariant} $out/share/${variant.ptype}/Tokyonight-${variant.pvariant} + ln -s ${variant}/share/${prefix}/LICENSE $out/share/${prefix}/LICENSE 2>/dev/null || true + '' + ))} ''; - - meta = with lib; { - description = "A GTK theme based on the Tokyo Night colour palette."; - homepage = "www.pling.com/p/1681315/"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with lib.maintainers; [ garaiza-93 ]; - }; } diff --git a/pkgs/data/themes/tokyo-night-gtk/generic.nix b/pkgs/data/themes/tokyo-night-gtk/generic.nix new file mode 100644 index 00000000000..35bf498666d --- /dev/null +++ b/pkgs/data/themes/tokyo-night-gtk/generic.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, writeScript +, gtk-engine-murrine +, gnome-themes-extra +, prefix ? "" +, type ? "" +, variantName ? "" +, variant ? "" +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "${prefix}_${type}-${variantName}"; + version = "unstable-2023-05-30"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Tokyo-Night-GTK-Theme"; + rev = "e9790345a6231cd6001f1356d578883fac52233a"; + hash = "sha256-Q9UnvmX+GpvqSmTwdjU4hsEsYhA887wPqs5pyqbIhmc="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{${type},${prefix}} + cp -a ${type}/Tokyonight-${variant} $out/share/${type} + cp -a LICENSE $out/share/${prefix} + + runHook postInstall + ''; + + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts tree jq + res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/${finalAttrs.src.owner}/${finalAttrs.src.repo}/commits/HEAD")" + + rev="$(echo $res | jq '.sha' --raw-output)" + version="unstable-$(echo $res | jq '.commit | .author | .date' --raw-output | sed 's/T.*$//')" + update-source-version ${prefix}-variants.${type}.${variantName} "$version" "$rev" --ignore-same-hash + + commonjq1='.[] .contents .[] | {(.name): .name} | walk(if type=="object" then with_entries(.key|=ascii_downcase) else . end)' + commonjq2='reduce inputs as $in (.; . + $in)' + commontree="-dJ -L 1 --noreport ${finalAttrs.src}" + + echo $(tree $commontree/icons | jq "$commonjq1" | jq "$commonjq2" | jq '{icons: .}') \ + $(tree $commontree/themes | jq "$commonjq1" | jq "$commonjq2" | jq '{themes: .}') | \ + jq 'reduce inputs as $in (.; . + $in)' | sed "s/[tT]okyonight-//g" > \ + "$(git rev-parse --show-toplevel)/pkgs/data/themes/${prefix}/variants.json" + ''; + + # For "full" in default.nix + ptype = type; + pvariant = variant; + }; + + meta = with lib; { + description = "A GTK theme based on the Tokyo Night colour palette"; + homepage = "https://www.pling.com/p/1681315"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ garaiza-93 Madouura ]; + }; +}) diff --git a/pkgs/data/themes/tokyo-night-gtk/variants.json b/pkgs/data/themes/tokyo-night-gtk/variants.json new file mode 100644 index 00000000000..6489d9c649d --- /dev/null +++ b/pkgs/data/themes/tokyo-night-gtk/variants.json @@ -0,0 +1,18 @@ +{ + "icons": { + "dark": "Dark", + "dark-cyan": "Dark-Cyan", + "light": "Light", + "moon": "Moon" + }, + "themes": { + "dark-b": "Dark-B", + "dark-bl": "Dark-BL", + "dark-b-lb": "Dark-B-LB", + "dark-bl-lb": "Dark-BL-LB", + "storm-b": "Storm-B", + "storm-bl": "Storm-BL", + "storm-b-lb": "Storm-B-LB", + "storm-bl-lb": "Storm-BL-LB" + } +} diff --git a/pkgs/data/themes/utterly-nord-plasma/default.nix b/pkgs/data/themes/utterly-nord-plasma/default.nix new file mode 100644 index 00000000000..4fbb0f5b8a8 --- /dev/null +++ b/pkgs/data/themes/utterly-nord-plasma/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, breeze-icons +, kdeclarative +, kirigami2 +, plasma-framework +, plasma-workspace +}: + +stdenv.mkDerivation rec { + pname = "utterly-nord-plasma"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "6d9ffe008f0bee47c8346c9a7ec71f206d999fd0"; + hash = "sha256-B5pIwV0BHxDluKWKTy+xuBPaE3N6UOHXip1SIAm2kM8="; + }; + + propagatedUserEnvPkgs = [ + breeze-icons + kdeclarative.bin + kirigami2 + plasma-framework.bin + plasma-workspace + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{color-schemes,Kvantum,plasma/look-and-feel,sddm/themes,wallpapers,konsole} + + cp -a look-and-feel $out/share/plasma/look-and-feel/Utterly-Nord + cp -a look-and-feel-solid $out/share/plasma/look-and-feel/Utterly-Nord-solid + cp -a look-and-feel-light $out/share/plasma/look-and-feel/Utterly-Nord-light + cp -a look-and-feel-light-solid $out/share/plasma/look-and-feel/Utterly-Nord-light-solid + + cp -a *.colors $out/share/color-schemes/ + + cp -a wallpaper $out/share/wallpapers/Utterly-Nord + + cp -a kvantum $out/share/Kvantum/Utterly-Nord + cp -a kvantum-solid $out/share/Kvantum/Utterly-Nord-Solid + cp -a kvantum-light $out/share/Kvantum/Utterly-Nord-Light + cp -a kvantum-light-solid $out/share/Kvantum/Utterly-Nord-Light-Solid + + cp -a *.colorscheme $out/share/konsole/ + + cp -a sddm $out/share/sddm/themes/Utterly-Nord + + runHook postInstall + ''; + + meta = with lib; { + description = "A Plasma theme with Nordic Colors, transparency, blur and round edges for UI elements"; + homepage = "https://himdek.com/Utterly-Nord-Plasma/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/utterly-round-plasma-style/default.nix b/pkgs/data/themes/utterly-round-plasma-style/default.nix new file mode 100644 index 00000000000..40bdb2f71d8 --- /dev/null +++ b/pkgs/data/themes/utterly-round-plasma-style/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "utterly-round-plasma-style"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "c3677d5223286f69871f6745cdb3b71367229d40"; + hash = "sha256-mlqRMz0cAZnnM4xE6p7fMzhGlqCQcM4FxmDlVnbGUgQ="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{aurorae/themes,plasma/desktoptheme} + + cp -a aurorae/dark/translucent $out/share/aurorae/themes/Utterly-Round-Dark + cp -a aurorae/dark/solid $out/share/aurorae/themes/Utterly-Round-Dark-Solid + cp -a aurorae/light/translucent $out/share/aurorae/themes/Utterly-Round-Light + cp -a aurorae/light/solid $out/share/aurorae/themes/Utterly-Round-Light-Solid + + cp -a desktoptheme/translucent $out/share/plasma/desktoptheme/Utterly-Round + cp -a desktoptheme/solid $out/share/plasma/desktoptheme/Utterly-Round-Solid + + runHook postInstall + ''; + + meta = with lib; { + description = "A rounded desktop theme and window borders for Plasma 5 that follows any color scheme"; + homepage = "https://himdek.com/Utterly-Round-Plasma-Style/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/where-is-my-sddm-theme/default.nix b/pkgs/data/themes/where-is-my-sddm-theme/default.nix index 8151ca0cc13..13ea576b3fb 100644 --- a/pkgs/data/themes/where-is-my-sddm-theme/default.nix +++ b/pkgs/data/themes/where-is-my-sddm-theme/default.nix @@ -23,13 +23,13 @@ in stdenvNoCC.mkDerivation rec { pname = "where-is-my-sddm-theme"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "stepanzubkov"; repo = pname; rev = "v${version}"; - hash = "sha256-kW6W8DELi9Xqn9xWLlcKmxk4tO5FKdApaYTZimQ+7B0="; + hash = "sha256-T6b+rxjlxZCQ/KDaxBM8ZryA3n6a+3jo+J2nETBYslM="; }; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index c01c8e08166..fb9a63b21f1 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2023-02-07"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-RGYD2+ZTUTPyFbaHvXU9VD3W6WTNeg3ifY+DAR3MmtI="; + sha256 = "sha256-H8QdKCX6C36J7AfFd0VV9Rnm8LGXSfkxj5Yp2p+PduE="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index b72bcd6c7c3..1490b5db79d 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "23.04.4"; + version = "23.10.0"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-8MtRYNJJVhZzE5Ds1HSk+Ej3FUD/z2hGZAsuCeGzWb4="; + hash = "sha256-+Szk77QeoM4PwusxKflTh83h16qz6Es6UwDXpbydJUE="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k amaxine ]; + maintainers = with maintainers; [ moni amaxine ]; }; } |