Compare commits

..

No commits in common. "4b00734efee466ee951124589c3f1c237d8e94d4" and "4bd393b78e7e013c4f1d0c17d3f7184edee1254f" have entirely different histories.

14 changed files with 85 additions and 73 deletions

View file

@ -1,3 +0,0 @@
{
"ignorePatterns": ["_sources/*.json", "secrets/*.yaml"]
}

View file

@ -7,38 +7,6 @@
"arguments": ["-"]
}
}
},
"JSON": {
"formatter": {
"external": {
"command": "oxfmt",
"arguments": ["--stdin-filepath", "{buffer_path}"]
}
}
},
"Markdown": {
"formatter": {
"external": {
"command": "oxfmt",
"arguments": ["--stdin-filepath", "{buffer_path}"]
}
}
},
"YAML": {
"formatter": {
"external": {
"command": "oxfmt",
"arguments": ["--stdin-filepath", "{buffer_path}"]
}
}
},
"TOML": {
"formatter": {
"external": {
"command": "oxfmt",
"arguments": ["--stdin-filepath", "{buffer_path}"]
}
}
}
}
}

View file

@ -33,7 +33,6 @@
just
nvfetcher
alejandra
oxfmt
lua-language-server
];

View file

@ -18,7 +18,7 @@
settings = {
font-family = [
"MonoLisa"
"Source Han Sans SC"
"Source Han Sans"
];
font-size = lib.mkForce 17;
theme = "Atom One Dark";

View file

@ -118,7 +118,9 @@
"drawerEnabled": true,
"hidePassive": false,
"id": "Tray",
"pinned": ["Fcitx"]
"pinned": [
"Fcitx"
]
},
{
"clockColor": "none",
@ -455,7 +457,12 @@
"autoHideMs": 2000,
"overlayLayer": true,
"backgroundOpacity": 1,
"enabledTypes": [0, 1, 2, 3],
"enabledTypes": [
0,
1,
2,
3
],
"monitors": []
},
"audio": {

View file

@ -159,7 +159,7 @@ in {
settings = cfg.settings;
style = ''
* {
font-family: Libertinus Serif, Source Han Serif SC;
font-family: Libertinus Serif, Source Han Serif;
font-weight: bold;
font-size: 16px;
}

View file

@ -31,6 +31,7 @@ in {
"hurl"
"idris2"
"java"
"java-eclipse-jdtls"
"kdl"
"kotlin"
"lua"
@ -110,9 +111,9 @@ in {
buffer_font_size = 20;
buffer_font_family = "MonoLisa";
buffer_font_fallback = [
"Source Han Sans SC"
"Source Han Sans"
];
ui_font_family = "Source Han Sans SC";
ui_font_family = "Source Han Sans";
theme = "Catppuccin Latte";
helix_mode = true;
};

View file

@ -39,18 +39,6 @@ in {
fish_greeting = {
body = '''';
};
nani = {
body =
# fish
''
for command in $argv
echo "$command:"
for path in $(which --all "$command" 2>/dev/null)
realpath $path
end
end
'';
};
};
shellInitLast =
# fish

View file

@ -20,7 +20,7 @@
};
sansSerif = {
package = pkgs.source-han-sans;
name = "Source Han Sans SC";
name = "Source Han Sans";
};
monospace = {
package = pkgs.maple-mono.NF-CN;

View file

@ -20,7 +20,7 @@
};
sansSerif = {
package = pkgs.source-han-sans;
name = "Source Han Sans SC";
name = "Source Han Sans";
};
monospace = {
package = pkgs.maple-mono.NF-CN;

View file

@ -71,11 +71,11 @@ in {
defaultFonts = {
serif = [
"Libertinus Serif"
"Source Han Serif SC"
"Source Han Serif"
"Noto Serif CJK SC"
];
sansSerif = [
"Source Han Sans SC"
"Source Han Sans"
"Noto Sans CJK SC"
];
monospace = [

View file

@ -3,7 +3,7 @@
#lua
''
if vim.g.neovide then
vim.o.guifont = [[MonoLisa,Source Han Sans SC,Noto Color Emoji:h16]]
vim.o.guifont = [[MonoLisa,Source Han Sans,Noto Color Emoji:h16]]
vim.g.neovide_opacity = 0.9
vim.g.linespace = 0.2
vim.g.neovide_text_gamma = 0.8

View file

@ -29,12 +29,36 @@ patch:
- { when: has_menu, accept: minus, send: Page_Up }
- { when: has_menu, accept: equal, send: Page_Down }
- { when: always, toggle: ascii_punct, accept: Control+Shift+3 } # 切换中英标点
- { when: always, toggle: ascii_punct, accept: Control+Shift+numbersign } # 切换中英标点
- { when: always, toggle: traditionalization, accept: Control+Shift+4 } # 切换简繁
- { when: always, toggle: traditionalization, accept: Control+Shift+dollar } # 切换简繁
- { when: always, toggle: full_shape, accept: Control+Shift+5 } # 切换全半角
- { when: always, toggle: full_shape, accept: Control+Shift+percent } # 切换全半角
- {
when: always,
toggle: ascii_punct,
accept: Control+Shift+3,
} # 切换中英标点
- {
when: always,
toggle: ascii_punct,
accept: Control+Shift+numbersign,
} # 切换中英标点
- {
when: always,
toggle: traditionalization,
accept: Control+Shift+4,
} # 切换简繁
- {
when: always,
toggle: traditionalization,
accept: Control+Shift+dollar,
} # 切换简繁
- {
when: always,
toggle: full_shape,
accept: Control+Shift+5,
} # 切换全半角
- {
when: always,
toggle: full_shape,
accept: Control+Shift+percent,
} # 切换全半角
# 将小键盘 0~9 . 映射到主键盘,数字金额大写的 Lua 如 R1234.5678 可使用小键盘输入
- { accept: KP_0, send: 0, when: composing }

View file

@ -1,18 +1,43 @@
{
perSystem = {lib, ...}: {
perSystem = {
pkgs,
lib,
...
}: {
treefmt = {
programs = {
alejandra = {
enable = true;
excludes = ["_sources/*.nix"];
};
oxfmt = let
oxfmtConfig = with lib;
pipe ./.oxfmtrc.json [builtins.readFile builtins.fromJSON];
in {
biome = {
enable = true;
includes = ["*.json" "*.md" "*.toml" "*.yaml"];
excludes = oxfmtConfig.ignorePatterns;
includes = ["*.json"];
excludes = ["_sources/*.json"];
settings = {
formatter.indentStyle = "space";
javascript.formatter.enabled = false;
css.formatter.enabled = false;
};
};
dprint = {
enable = true;
includes = [
"*.md"
"*.toml"
"*.yaml"
];
excludes = ["secrets/*.yaml"];
settings = {
plugins = pkgs.dprint-plugins.getPluginList (
plugins:
with plugins; [
dprint-plugin-toml
dprint-plugin-markdown
g-plane-pretty_yaml
]
);
};
};
just = {
enable = true;
@ -20,7 +45,10 @@
};
typos = let
config = with lib;
pipe ./.typos.toml [builtins.readFile fromTOML];
pipe ./.typos.toml [
builtins.readFile
fromTOML
];
in {
enable = true;
includes = ["*"];