dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit a94c801d13ce511cea01e7f9f4101469f7164ef0 parent 39ab0c9ee2972cc0be2bc39a2f9fef5b5c1bc0f6 Author: maydayv7 <maydayv7@gmail.com> Date: Mon, 2 Dec 2024 01:04:23 +0530 chore(flake): Update `inputs` Flake lock file changes: • Updated input 'flatpak': 'github:gmodena/nix-flatpak/8db1648a95446d41e97ace7caf54e172669810ff?narHash=sha256-5kTDLWpsMaKSEnekip2rUBfzuHNS9Fafp5Y7n4Y7hr8%3D' (2024-11-15) → 'github:gmodena/nix-flatpak/01ca2cbd9fb5c29d73fac327f5a9a2a1a222e218?narHash=sha256-YGtFJ/4SE37evvHX%2BOkS2klRdHlO7HvovaaxR/yWuWg%3D' (2024-11-29) • Updated input 'formatter': 'github:numtide/treefmt-nix/37f8f47cb618eddee0c0dd31a582b1cd3013c7f6?narHash=sha256-XdW2mYXvPHYtZ8oQqO3tRYtxx7kI0Hs3NU64IwAtD68%3D' (2024-11-21) → 'github:numtide/treefmt-nix/6209c381904cab55796c5d7350e89681d3b2a8ef?narHash=sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII%2BoAc%3D' (2024-11-29) • Updated input 'gaming': 'github:fufexan/nix-gaming/d89390fd1c6e070e03b9e19d48d884612132a14f?narHash=sha256-6oOIuAMih3tN1Fjo9cQp1Q5LNe1t3eueA2i0IV1QAVI%3D' (2024-11-19) → 'github:fufexan/nix-gaming/64192ce9c540d7562e64f62e241972627446310e?narHash=sha256-xblkq1Q4pY5qEdSnOIxsL6qpdIhTmAsLVL5e6Thhd2E%3D' (2024-12-01) • Updated input 'gaming/nixpkgs': 'github:NixOS/nixpkgs/c69a9bffbecde46b4b939465422ddc59493d3e4d?narHash=sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk%3D' (2024-11-16) → 'github:NixOS/nixpkgs/33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9?narHash=sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q%3D' (2024-11-30) • Updated input 'gaming/umu': 'git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix&ref=refs/heads/main&rev=66a1088194bb13c2d86d2c0af316b280a7235640&submodules=1' (2024-11-14) → 'git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix&ref=refs/heads/main&rev=e559e2e50999093c3e837d33886f9e14e34ead0a&submodules=1' (2024-12-01) • Updated input 'generators': 'github:nix-community/nixos-generators/3280fdde8c8f0276c9f5286ad5c0f433dfa5d56c?narHash=sha256-5IgpueM8SGLOadzUJK6Gk37zEBXGd56BkNOtoWmnZos%3D' (2024-11-21) → 'github:nix-community/nixos-generators/098e8b6ff72c86944a8d54b64ddd7b7e6635830a?narHash=sha256-/MNhZLR0eh9z/d3l%2Bammq%2BF5XxHln0RHgO4Bhtjr0IM%3D' (2024-11-25) • Updated input 'hardware': 'github:NixOS/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6?narHash=sha256-UhWmEZhwJZmVZ1jfHZFzCg%2BZLO9Tb/v3Y6LC0UNyeTo%3D' (2024-11-16) → 'github:NixOS/nixos-hardware/fe01780d356d70fd119a19277bff71d3e78dad00?narHash=sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU%3D' (2024-12-01) • Updated input 'home-manager': 'github:nix-community/home-manager/aecd341dfead1c3ef7a3c15468ecd71e8343b7c6?narHash=sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg%3D' (2024-11-17) → 'github:nix-community/home-manager/62d536255879be574ebfe9b87c4ac194febf47c5?narHash=sha256-lYnT%2BEYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20%3D' (2024-12-01) • Updated input 'index': 'github:Mic92/nix-index-database/bdba246946fb079b87b4cada4df9b1cdf1c06132?narHash=sha256-l9ryrx1Twh08a%2BgxrMGM9O/aZKEimZfa6sZVyPCImgI%3D' (2024-11-17) → 'github:Mic92/nix-index-database/6e0b7f81367069589a480b91603a10bcf71f3103?narHash=sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE%3D' (2024-12-01) • Updated input 'sops': 'github:Mic92/sops-nix/53c853fb1a7e4f25f68805ee25c83d5de18dc699?narHash=sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0%3D' (2024-11-21) → 'github:Mic92/sops-nix/3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa?narHash=sha256-xtt95%2Bc7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk%3D' (2024-11-25) • Updated input 'spotify': 'github:Gerg-L/spicetify-nix/025aefe4dba52c7fef6723f3efe659b5dbab27ca?narHash=sha256-fC6UxF%2BP8bLspHFaVhX7t19UA6FzUa7yYjA2jH7P3Ok%3D' (2024-11-21) → 'github:Gerg-L/spicetify-nix/c7a940a0152bdd9914c02f8f1eea2697d548cc16?narHash=sha256-hxjD%2BdVnL2W9n1kZlmYAx2ou4ttLgzfPuEdoCsiy7cE%3D' (2024-12-01) • Updated input 'spotify/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04) → 'github:edolstra/flake-compat/9ed2ac151eada2306ca8c418ebd97807bb08f6ac?narHash=sha256-HRJ/18p%2BWoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg%3D' (2024-11-27) • Updated input 'stable': 'github:NixOS/nixpkgs/057f63b6dc1a2c67301286152eb5af20747a9cb4?narHash=sha256-v5P3dk5JdiT%2B4x69ZaB18B8%2BRcu3TIOrcdG4uEX7WZ8%3D' (2024-11-16) → 'github:NixOS/nixpkgs/62c435d93bf046a5396f3016472e8f7c8e2aed65?narHash=sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT%2B34%3D' (2024-11-30) • Updated input 'stylix': 'github:danth/stylix/5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f?narHash=sha256-Mm/JL8tFUS1SOmmZ DPcswExUxzw0VpHcEyZI1h58CGA%3D' (2024-11-15) → 'github:danth/stylix/d13ffb381c83b6139b9d67feff7addf18f8408fe?narHash=sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw%2BSpvCNAX0i6Qgwc%3D' (2024-11-30) • Updated input 'stylix/base16': 'github:SenchoPens/base16.nix/665b3c6748534eb766c777298721cece9453fdae?narHash=sha256-LlrC09LoPi8OPYOGPXegD72v%2B//VapgAqhbOFS3i8sc%3D' (2024-02-25) → 'github:SenchoPens/base16.nix/153d52373b0fb2d343592871009a286ec8837aec?narHash=sha256-%2BR1BH5wHhfnycySb7Sy5KbYEaTJZWm1h%2BLW1OtyhiTs%3D' (2024-11-21) • Updated input 'stylix/base16/fromYaml': 'github:SenchoPens/fromYaml/11fbbbfb32e3289d3c631e0134a23854e7865c84?narHash=sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq%2BeDcGPifVsCM%3D' (2023-07-16) → 'github:SenchoPens/fromYaml/106af9e2f715e2d828df706c386a685698f3223b?narHash=sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8%3D' (2024-11-18) • Updated input 'stylix/base16-vim': 'github:tinted-theming/base16-vim/6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d?narHash=sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc%3D' (2024-05-19) → 'github:tinted-theming/base16-vim/61165b1632409bd55e530f3dbdd4477f011cadc6?narHash=sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo%3D' (2024-11-18) • Updated input 'stylix/flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9?narHash=sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm%2B504Ch3sNKLd8%3D' (2023-01-17) → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04) • Updated input 'stylix/tinted-tmux': 'github:tinted-theming/tinted-tmux/c02050bebb60dbb20cb433cd4d8ce668ecc11ba7?narHash=sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU%2B3Q%3D' (2023-10-08) → 'github:tinted-theming/tinted-tmux/f0e7f7974a6441033eb0a172a0342e96722b4f14?narHash=sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54%3D' (2024-10-21) • Updated input 'unstable': 'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19) → 'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28) • Updated input 'vscode': 'github:nix-community/nix-vscode-extensions/c53c9d319e51deb97fb9a82001952c4efa74cba7?narHash=sha256-libOsvOEQjHhlNEVPuG%2Bi4OY5NyO301RZCxYovsVtrc%3D' (2024-11-21) → 'github:nix-community/nix-vscode-extensions/9bc3dde891ada1aa00f29bc6a64473f53d57547e?narHash=sha256-e34A6rHd5LO3mHY5USeRf36x0czcpHt1CD9ZyS5Eu7A%3D' (2024-12-01) • Updated input 'windows': 'github:emmanuelrosa/erosanix/dcd10289d428c1869641c8f5bfdff93aaeda391a?narHash=sha256-gALtg3dEmRIUjF2Ze85bLkhCvCyf7pOBo2FsOD74l1M%3D' (2024-11-20) → 'github:emmanuelrosa/erosanix/5963d86acfe2286f53676f7250b0775cc5e7843a?narHash=sha256-zmQ4Ambn3RMkGVtrCh3yuQRY9FHPQQWxBPcaG94xA34%3D' (2024-11-29)
Diffstat:
| M | README.md | | | 3 | +++ |
| M | flake.lock | | | 135 | +++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | modules/gui/gtk.nix | | | 8 | +++----- |
| M | modules/gui/theme.nix | | | 17 | +++++++++++++---- |
| D | packages/patches/calibre.patch | | | 38 | -------------------------------------- |
| D | packages/patches/mission-center.patch | | | 94 | ------------------------------------------------------------------------------- |
6 files changed, 86 insertions(+), 209 deletions(-)
diff --git a/README.md b/README.md @@ -513,6 +513,9 @@ You can navigate to the `README`s present in the various directories to know mor ### v25 - Upgrade to NixOS v24.11 (Vicuna)! +- Add Logseq Configuration +- Hyprland Improvements +- Use Vesktop instead of Discord ### v24.5 diff --git a/flake.lock b/flake.lock @@ -38,11 +38,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1732722421, + "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -264,11 +264,11 @@ }, "flatpak": { "locked": { - "lastModified": 1731698554, - "narHash": "sha256-5kTDLWpsMaKSEnekip2rUBfzuHNS9Fafp5Y7n4Y7hr8=", + "lastModified": 1732867134, + "narHash": "sha256-YGtFJ/4SE37evvHX+OkS2klRdHlO7HvovaaxR/yWuWg=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "8db1648a95446d41e97ace7caf54e172669810ff", + "rev": "01ca2cbd9fb5c29d73fac327f5a9a2a1a222e218", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1732187120, - "narHash": "sha256-XdW2mYXvPHYtZ8oQqO3tRYtxx7kI0Hs3NU64IwAtD68=", + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "37f8f47cb618eddee0c0dd31a582b1cd3013c7f6", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "type": "github" }, "original": { @@ -320,11 +320,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1731980711, - "narHash": "sha256-6oOIuAMih3tN1Fjo9cQp1Q5LNe1t3eueA2i0IV1QAVI=", + "lastModified": 1733056199, + "narHash": "sha256-xblkq1Q4pY5qEdSnOIxsL6qpdIhTmAsLVL5e6Thhd2E=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "d89390fd1c6e070e03b9e19d48d884612132a14f", + "rev": "64192ce9c540d7562e64f62e241972627446310e", "type": "github" }, "original": { @@ -365,11 +365,11 @@ ] }, "locked": { - "lastModified": 1732151224, - "narHash": "sha256-5IgpueM8SGLOadzUJK6Gk37zEBXGd56BkNOtoWmnZos=", + "lastModified": 1732496924, + "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "3280fdde8c8f0276c9f5286ad5c0f433dfa5d56c", + "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733066523, + "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1731880681, - "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { @@ -791,11 +791,11 @@ ] }, "locked": { - "lastModified": 1731814505, - "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", + "lastModified": 1733024876, + "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", + "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "type": "github" }, "original": { @@ -806,11 +806,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731763621, - "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", + "lastModified": 1732997066, + "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", + "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", "type": "github" }, "original": { @@ -1007,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1732186149, - "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", + "lastModified": 1732575825, + "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", + "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "type": "github" }, "original": { @@ -1028,11 +1028,11 @@ ] }, "locked": { - "lastModified": 1732162609, - "narHash": "sha256-fC6UxF+P8bLspHFaVhX7t19UA6FzUa7yYjA2jH7P3Ok=", + "lastModified": 1733026768, + "narHash": "sha256-hxjD+dVnL2W9n1kZlmYAx2ou4ttLgzfPuEdoCsiy7cE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "025aefe4dba52c7fef6723f3efe659b5dbab27ca", + "rev": "c7a940a0152bdd9914c02f8f1eea2697d548cc16", "type": "github" }, "original": { @@ -1043,11 +1043,11 @@ }, "stable": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731657386, - "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=", + "lastModified": 1732993760, + "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=", "owner": "danth", "repo": "stylix", - "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f", + "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "type": "github" }, "original": { @@ -1202,11 +1202,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1731556042, - "narHash": "sha256-eUFmLbf06Dph//IbB9KsJio3dJNADt+EhcfNFXjiJjU=", + "lastModified": 1733037609, + "narHash": "sha256-HkS24indfMaQbVZ+9GY5BHc+rqPvh8htF0rWYhvgPKI=", "ref": "refs/heads/main", - "rev": "66a1088194bb13c2d86d2c0af316b280a7235640", - "revCount": 839, + "rev": "e559e2e50999093c3e837d33886f9e14e34ead0a", + "revCount": 863, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -1220,11 +1220,11 @@ }, "unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -1283,11 +1283,11 @@ ] }, "locked": { - "lastModified": 1732153985, - "narHash": "sha256-libOsvOEQjHhlNEVPuG+i4OY5NyO301RZCxYovsVtrc=", + "lastModified": 1733018907, + "narHash": "sha256-e34A6rHd5LO3mHY5USeRf36x0czcpHt1CD9ZyS5Eu7A=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c53c9d319e51deb97fb9a82001952c4efa74cba7", + "rev": "9bc3dde891ada1aa00f29bc6a64473f53d57547e", "type": "github" }, "original": { @@ -1301,7 +1301,6 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1731786392, "narHash": "sha256-VA5hygzQzq8ccAzRPWje8371nnQ6js4xnFe87t/4KJ0=", "owner": "catppuccin", "repo": "vscode", @@ -1322,11 +1321,11 @@ ] }, "locked": { - "lastModified": 1732116882, - "narHash": "sha256-gALtg3dEmRIUjF2Ze85bLkhCvCyf7pOBo2FsOD74l1M=", + "lastModified": 1732892180, + "narHash": "sha256-zmQ4Ambn3RMkGVtrCh3yuQRY9FHPQQWxBPcaG94xA34=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "dcd10289d428c1869641c8f5bfdff93aaeda391a", + "rev": "5963d86acfe2286f53676f7250b0775cc5e7843a", "type": "github" }, "original": { diff --git a/modules/gui/gtk.nix b/modules/gui/gtk.nix @@ -7,7 +7,6 @@ }: let inherit (lib) mkEnableOption mkIf mkOption types; cfg = config.gui.gtk; - inherit (config.stylix) fonts; in { options.gui.gtk = { enable = mkEnableOption "Enable GTK Configuration"; @@ -55,11 +54,10 @@ in { gtk = { enable = true; inherit (cfg) theme; - iconTheme = config.gui.icons; cursorTheme = config.gui.cursors; - font = { - inherit (fonts.sansSerif) package name; - size = fonts.sizes.applications; + font = with config.stylix.fonts; { + inherit (sansSerif) package name; + size = sizes.applications; }; gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; diff --git a/modules/gui/theme.nix b/modules/gui/theme.nix @@ -77,10 +77,19 @@ in { targets.plymouth.enable = false; }; - user.homeConfig.stylix.targets = { - firefox.enable = false; - spicetify.enable = mkIf (exists "spotify") true; - vscode.enable = mkIf (exists "vscode") false; + user.homeConfig.stylix = { + iconTheme = { + enable = true; + inherit (cfg.icons) package; + light = cfg.icons.name; + dark = cfg.icons.name; + }; + + targets = { + firefox.enable = false; + spicetify.enable = mkIf (exists "spotify") true; + vscode.enable = mkIf (exists "vscode") false; + }; }; }; } diff --git a/packages/patches/calibre.patch b/packages/patches/calibre.patch @@ -1,38 +0,0 @@ -From 275f3090680975a30657f61f6373ce9acebdada2 Mon Sep 17 00:00:00 2001 -From: kilianar <mail@kilianar.de> -Date: Thu, 14 Nov 2024 12:21:31 +0100 -Subject: [PATCH] calibre: 7.20.0 -> 7.21.0 - -https://github.com/kovidgoyal/calibre/releases/tag/v7.21.0 -(cherry picked from commit df4f16e2b2c4dfccf3081961095a537f0e37a558) ---- - pkgs/by-name/ca/calibre/package.nix | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix -index d0b604fd2f1c9..09ca09b319caf 100644 ---- a/pkgs/by-name/ca/calibre/package.nix -+++ b/pkgs/by-name/ca/calibre/package.nix -@@ -33,11 +33,11 @@ - - stdenv.mkDerivation (finalAttrs: { - pname = "calibre"; -- version = "7.20.0"; -+ version = "7.21.0"; - - src = fetchurl { - url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; -- hash = "sha256-BhJEJsQKk/kJxycm/1mbtlrSaeFQPvWGGB9DUMidgII="; -+ hash = "sha256-61Nbclkt59sh8VHh3uRw0GvlDjlyOz1jrsFMMIuzPLE="; - }; - - patches = [ -@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { - (fetchpatch { - name = "0007-Hardening-Qt-code.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; -- hash = "sha256-8tOxFCmZal+JxOz6LeuUr+TgX7IaxC9Ow73bMgFJPt8="; -+ hash = "sha256-9hi4T9LB7aklWASMR8hIuKBgZm2arDvORfmk9S8wgCA="; - }) - ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; - diff --git a/packages/patches/mission-center.patch b/packages/patches/mission-center.patch @@ -1,94 +0,0 @@ -From cf5a1c32934569601207395e03b3fa7ad66dd625 Mon Sep 17 00:00:00 2001 -From: seth <getchoo@tuta.io> -Date: Tue, 19 Nov 2024 05:00:20 -0500 -Subject: [PATCH 1/2] mission-center: use RUSTFLAGS to link libGL and libvulkan - -A less crude method than patching `$cargoDepsCopy` - -(cherry picked from commit dd78a15b79aa3f741d16deadf209f6074938af82) ---- - pkgs/by-name/mi/mission-center/package.nix | 22 ++++++++++++++-------- - 1 file changed, 14 insertions(+), 8 deletions(-) - -diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix -index b21baead33796..4067bee90edae 100644 ---- a/pkgs/by-name/mi/mission-center/package.nix -+++ b/pkgs/by-name/mi/mission-center/package.nix -@@ -35,9 +35,8 @@ - pango, - sqlite, - udev, -- wayland, -- - vulkan-loader, -+ wayland, - - versionCheckHook, - }: -@@ -111,6 +110,7 @@ stdenv.mkDerivation rec { - pango - sqlite - udev -+ vulkan-loader - wayland - ]; - -@@ -118,12 +118,6 @@ stdenv.mkDerivation rec { - substituteInPlace src/sys_info_v2/gatherer.rs \ - --replace-fail '"missioncenter-gatherer"' '"${placeholder "out"}/bin/missioncenter-gatherer"' - -- substituteInPlace $cargoDepsCopy/gl_loader-*/src/glad.c \ -- --replace-fail "libGL.so.1" "${libGL}/lib/libGL.so.1" -- -- substituteInPlace $cargoDepsCopy/ash-*/src/entry.rs \ -- --replace-fail '"libvulkan.so.1"' '"${vulkan-loader}/lib/libvulkan.so.1"' -- - SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer - SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop - -@@ -151,6 +145,18 @@ stdenv.mkDerivation rec { - versionCheckProgram = "${builtins.placeholder "out"}/bin/${meta.mainProgram}"; - doInstallCheck = true; - -+ env = { -+ # Make sure libGL and libvulkan can be found by dlopen() -+ RUSTFLAGS = toString ( -+ map (flag: "-C link-arg=" + flag) [ -+ "-Wl,--push-state,--no-as-needed" -+ "-lGL" -+ "-lvulkan" -+ "-Wl,--pop-state" -+ ] -+ ); -+ }; -+ - meta = { - description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; - homepage = "https://gitlab.com/mission-center-devs/mission-center"; - -From d86a6878f54221ff5d1d4ddce0eb27864f1a472e Mon Sep 17 00:00:00 2001 -From: seth <getchoo@tuta.io> -Date: Tue, 19 Nov 2024 05:42:39 -0500 -Subject: [PATCH 2/2] mission-center: add getchoo to maintainers - -(cherry picked from commit 56e2eb4d1ae50f30acad6fa1fe0738b3d62adcde) ---- - pkgs/by-name/mi/mission-center/package.nix | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix -index 4067bee90edae..3b2972df4d24a 100644 ---- a/pkgs/by-name/mi/mission-center/package.nix -+++ b/pkgs/by-name/mi/mission-center/package.nix -@@ -162,7 +162,10 @@ stdenv.mkDerivation rec { - homepage = "https://gitlab.com/mission-center-devs/mission-center"; - changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}"; - license = lib.licenses.gpl3Only; -- maintainers = with lib.maintainers; [ GaetanLepage ]; -+ maintainers = with lib.maintainers; [ -+ GaetanLepage -+ getchoo -+ ]; - platforms = lib.platforms.linux; - mainProgram = "missioncenter"; - };