Merge branch '24.05-migration' into mainline

This commit is contained in:
Trolli Schmittlauch 2024-06-11 22:46:28 +02:00
commit 774d08edff
10 changed files with 58 additions and 59 deletions

View file

@ -14,7 +14,7 @@
ubuntu_font_family
twemoji-color-font
open-sans
(iosevka-bin.override { variant = "curly-slab"; })
(iosevka-bin.override { variant = "CurlySlab"; })
config.nur.repos.schmittlauch.vollkorn
# TODO: humor-sans

View file

@ -122,6 +122,7 @@ let
];
pythonTools = with python3Packages; [
python3 # to shadow old macOS python
notebook
ipython
pip

View file

@ -1,5 +1,6 @@
{
pkgs,
lib,
inputs,
config,
system,
@ -75,7 +76,7 @@
"editor.formatOnSave" = false;
"editor.formatOnType" = false;
};
"nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt";
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
"editor.fontSize" = 13;
"editor.fontWeight" = "normal";
"git.detectSubmodulesLimit" = 30;