fix: nix Maple Fonts

This commit is contained in:
js0ny 2025-10-26 16:14:39 +00:00
parent 9605a62e9c
commit e2209cea57
12 changed files with 96 additions and 46 deletions

View file

@ -3,22 +3,40 @@ return {
version = "*", -- Use the latest tagged version version = "*", -- Use the latest tagged version
-- opts = , -- This causes the plugin setup function to be called -- opts = , -- This causes the plugin setup function to be called
keys = { keys = {
{ "<A-n>", "<Cmd>MultipleCursorsAddDown<CR>", mode = { "n", "x" }, desc = "Add cursor and move down" }, {
{ "<A-e>", "<Cmd>MultipleCursorsAddUp<CR>", mode = { "n", "x" }, desc = "Add cursor and move up" }, "<A-j>",
"<Cmd>MultipleCursorsAddDown<CR>",
mode = { "n", "x" },
desc = "Add cursor and move down",
},
{
"<A-k>",
"<Cmd>MultipleCursorsAddUp<CR>",
mode = { "n", "x" },
desc = "Add cursor and move up",
},
{ "<C-Up>", "<Cmd>MultipleCursorsAddUp<CR>", mode = { "n", "i", "x" }, desc = "Add cursor and move up" }, {
{ "<C-Down>", "<Cmd>MultipleCursorsAddDown<CR>", mode = { "n", "i", "x" }, desc = "Add cursor and move down" }, "<C-Up>",
"<Cmd>MultipleCursorsAddUp<CR>",
mode = { "n", "i", "x" },
desc = "Add cursor and move up",
},
{
"<C-Down>",
"<Cmd>MultipleCursorsAddDown<CR>",
mode = { "n", "i", "x" },
desc = "Add cursor and move down",
},
{ "<A-LeftMouse>", "<Cmd>MultipleCursorsMouseAddDelete<CR>", mode = { "n", "i" }, desc = "Add or remove cursor" }, {
"<A-LeftMouse>",
"<Cmd>MultipleCursorsMouseAddDelete<CR>",
mode = { "n", "i" },
desc = "Add or remove cursor",
},
}, },
config = function() config = function()
local normal_mode_motion = require("multiple-cursors.normal_mode.motion")
local normal_mode_edit = require("multiple-cursors.normal_mode.edit")
local visual_mode_edit = require("multiple-cursors.visual_mode.edit")
local normal_mode_mode_change = require("multiple-cursors.normal_mode.mode_change")
local visual_mode_modify_area = require("multiple-cursors.visual_mode.modify_area")
require("multiple-cursors").setup({ require("multiple-cursors").setup({
pre_hook = function() pre_hook = function()
require("nvim-autopairs").disable() require("nvim-autopairs").disable()
@ -26,22 +44,6 @@ return {
post_hook = function() post_hook = function()
require("nvim-autopairs").enable() require("nvim-autopairs").enable()
end, end,
custom_key_maps = {
{ { "n", "x" }, { "e", "<Up>" }, normal_mode_motion.k, "nowrap" },
{ { "n", "x" }, { "n", "<Down>" }, normal_mode_motion.j, "nowrap" },
{ { "n", "x" }, { "i", "<Right>", "<Space>" }, normal_mode_motion.l, "nowrap" },
{ { "n", "x" }, "j", normal_mode_motion.e, "nowrap" },
{ { "n", "x" }, "J", normal_mode_motion.E, "nowrap" },
{ { "n", "x" }, "gj", normal_mode_motion.ge, "nowrap" },
{ { "n", "x" }, "gJ", normal_mode_motion.gE, "nowrap" },
{ "n", "E", normal_mode_edit.J, "nowrap" },
{ "n", "gE", normal_mode_edit.gJ, "nowrap" },
{ "n", { "l", "<Insert>" }, normal_mode_mode_change.i, "nowrap" },
{ "n", "L", normal_mode_mode_change.I, "nowrap" },
{ "x", "l", visual_mode_modify_area.i, "nowrap" },
{ "x", "E", visual_mode_edit.J, "nowrap" },
{ "x", "gE", visual_mode_edit.gJ, "nowrap" },
},
}) })
end, end,
} }

View file

@ -14,7 +14,7 @@
../../modules/nixos/desktop/laptop.nix ../../modules/nixos/desktop/laptop.nix
# hardware drivers # hardware drivers
../../modules/nixos/hardware/nvidia-disable.nix ../../modules/nixos/hardware/nvidia.nix
# udev rules # udev rules
../../modules/nixos/hardware/udev/basys3.nix ../../modules/nixos/hardware/udev/basys3.nix
@ -22,7 +22,7 @@
# desktop environment and display manager # desktop environment and display manager
../../modules/nixos/desktop/dm/sddm.nix ../../modules/nixos/desktop/dm/sddm.nix
../../modules/nixos/desktop/de/kde.nix ../../modules/nixos/desktop/de/kde.nix
../../modules/nixos/desktop/de/sway.nix ../../modules/nixos/desktop/de/niri.nix
# desktop programs # desktop programs
../../modules/nixos/programs/chromium.nix ../../modules/nixos/programs/chromium.nix

View file

@ -1,8 +1,15 @@
{pkgs, ...}: { {
pkgs,
config,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
go go
gopls gopls
]; ];
home.sessionVariables = {
GOPATH = "${config.xdg.dataHome}/go";
};
programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
golang.go golang.go
]; ];

View file

@ -1,8 +1,15 @@
{pkgs, ...}: { {
pkgs,
config,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
uv uv
ruff ruff
]; ];
home.sessionVariables = {
PYTHON_HISTORY = "${config.xdg.dataHome}/python/history";
};
programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
ms-python.python ms-python.python
ms-python.debugpy ms-python.debugpy

View file

@ -7,5 +7,7 @@
rofimoji rofimoji
rofi-power-menu rofi-power-menu
swaylock-effects swaylock-effects
xwayland-satellite
wmname
]; ];
} }

View file

@ -1,6 +1,6 @@
{pkgs, ...}: let {pkgs, ...}: let
fontPkgs = [ fontPkgs = [
pkgs.maple-mono.NF pkgs.maple-mono.CN
pkgs.sarasa-gothic pkgs.sarasa-gothic
pkgs.lxgw-wenkai pkgs.lxgw-wenkai
pkgs.lxgw-neoxihei pkgs.lxgw-neoxihei
@ -20,7 +20,7 @@ in {
enable = true; enable = true;
defaultFonts = { defaultFonts = {
monospace = [ monospace = [
"Maple Mono NF" "Maple Mono NF CN"
"JetBrainsMono Nerd Font" "JetBrainsMono Nerd Font"
]; ];
serif = ["LXGW WenKai"]; serif = ["LXGW WenKai"];

View file

@ -50,5 +50,6 @@
powershell powershell
powershell-editor-services powershell-editor-services
package-version-server package-version-server
gemini-cli
]; ];
} }

View file

@ -3,7 +3,7 @@
fonts.fontconfig = { fonts.fontconfig = {
defaultFonts = { defaultFonts = {
monospace = [ monospace = [
"Maple Mono NF" "Maple Mono NF CN"
"JetBrainsMono Nerd Font" "JetBrainsMono Nerd Font"
]; ];
serif = ["LXGW WenKai"]; serif = ["LXGW WenKai"];

View file

@ -5,19 +5,26 @@
kitty kitty
alacritty alacritty
warp-terminal warp-terminal
# Explorer # Explorer
kdePackages.dolphin kdePackages.dolphin
kdePackages.dolphin-plugins # dolphin git integration kdePackages.dolphin-plugins # dolphin git integration
kdePackages.konsole # dolphin terminal integration kdePackages.konsole # dolphin terminal integration
yazi # terminal file manager yazi # terminal file manager
# PDF Viewer # PDF Viewer
kdePackages.okular # default kdePackages.okular # default
sioyek sioyek
# Image Viewer # Image Viewer
vimiv-qt # Default vimiv-qt # Default
loupe # SUPER FAST 有催人跑的感觉 w/ GPU Accel. loupe # SUPER FAST 有催人跑的感觉 w/ GPU Accel.
papirus-icon-theme
kdePackages.elisa kdePackages.elisa
mpv
haruna
papirus-icon-theme
pcloud pcloud
telegram-desktop telegram-desktop
steam steam
@ -28,7 +35,6 @@
(jetbrains.rider.override { (jetbrains.rider.override {
vmopts = ''-Dawt.toolkit.name=WLToolkit''; vmopts = ''-Dawt.toolkit.name=WLToolkit'';
}) })
haruna
localsend localsend
neovide neovide
cherry-studio cherry-studio
@ -39,7 +45,6 @@
qbittorrent qbittorrent
protonvpn-gui protonvpn-gui
proton-pass proton-pass
mpv
neovim-qt neovim-qt
goldendict-ng goldendict-ng
kdePackages.kdenlive kdePackages.kdenlive
@ -47,6 +52,8 @@
steam-run steam-run
bottles bottles
lutris lutris
libreoffice
vivaldi
]; ];
xdg.desktopEntries = { xdg.desktopEntries = {

View file

@ -1,4 +1,8 @@
{config, ...}: { {
config,
pkgs,
...
}: {
programs.distrobox = { programs.distrobox = {
enable = true; enable = true;
containers = { containers = {
@ -14,4 +18,21 @@
}; };
}; };
}; };
home.packages = with pkgs; [
wmname
];
xdg.desktopEntries = {
"xilinx.vivado" = {
name = "Xilinx Vivado 2022.2";
type = "Application";
terminal = false;
exec = "distrobox enter Xilinx -- /opt/Xilinx/Vivado/2022.2/bin/vivado";
};
"xilinx.vitis" = {
name = "Xilinx Vitis 2022.2";
type = "Application";
terminal = false;
exec = "distrobox enter Xilinx -- bash ${config.home.homeDirectory}/.vitis-wr.sh";
};
};
} }

View file

@ -4,11 +4,14 @@
krunner-vscodeprojects krunner-vscodeprojects
jetbrains-runner jetbrains-runner
]; ];
home.sessionVariables = {
QT_STYLE_OVERRIDE = "Breeze";
};
programs.plasma = { programs.plasma = {
enable = true; enable = true;
session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession"; session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
fonts = { fonts = {
fixedWidth.family = "Maple Mono NF"; fixedWidth.family = "Maple Mono NF CN";
fixedWidth.pointSize = 10; fixedWidth.pointSize = 10;
general.family = "LXGW Neo XiHei"; general.family = "LXGW Neo XiHei";
general.pointSize = 10; general.pointSize = 10;
@ -121,7 +124,7 @@
programs.kate.enable = true; programs.kate.enable = true;
programs.kate.editor = { programs.kate.editor = {
font = { font = {
family = "Maple Mono NF"; family = "Maple Mono NF CN";
pointSize = 10; pointSize = 10;
}; };
inputMode = "vi"; inputMode = "vi";
@ -134,7 +137,7 @@
command = "${pkgs.fish}/bin/fish"; command = "${pkgs.fish}/bin/fish";
colorScheme = "catppuccin-mocha"; colorScheme = "catppuccin-mocha";
font = { font = {
name = "Maple Mono NF"; name = "Maple Mono NF CN";
size = 12; size = 12;
}; };
}; };

View file

@ -1,5 +1,5 @@
{pkgs, ...}: let {pkgs, ...}: let
alias = {"c" = "code";}; codeAlias = {"c" = "code";};
in { in {
programs.vscode = { programs.vscode = {
package = pkgs.vscode; package = pkgs.vscode;
@ -16,7 +16,7 @@ in {
vspacecode.whichkey vspacecode.whichkey
]; ];
}; };
programs.fish.shellAbbrs = alias; programs.fish.shellAbbrs = codeAlias;
programs.bash.shellAliases = alias; programs.bash.shellAliases = codeAlias;
programs.zsh.shellAliases = alias; programs.zsh.shellAliases = codeAlias;
} }