Merge remote-tracking branch 'origin/main' into thinkpad

This commit is contained in:
2025-02-11 17:44:03 +01:00
11 changed files with 22 additions and 10 deletions

View File

@ -5,6 +5,7 @@
userEmail = "git@martials.no";
aliases = {
amend = "commit --amend";
cm = "commit";
s = "status";
};

View File

@ -7,9 +7,10 @@
extensions = [
"html"
"catppuccin"
"catppuccin-icons"
"toml"
"nix"
"git_firefly"
"git-firefly"
];
userSettings =
let
@ -20,10 +21,15 @@
{
autosave = "on_focus_change";
base_keymap = "JetBrains";
ui_font_family = font;
buffer_font_family = font;
icon-theme = "Catppuccin Mocha"; # TODO doesn't work?
ui_font_family = font;
ui_font_size = fontSize;
buffer_font_size = fontSize;
tabs = {
file_icons = true;
git_status = true;
};
theme = {
mode = theme.mode;
light = "Catppuccin Latte";