js0ny/dotfiles
1
0
Fork 0
mirror of https://github.com/js0ny/dotfiles.git synced 2025-12-21 00:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: nix Maple Fonts

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

58
home/dot_config/nvim/lua/plugins/mod/mc.lua
View file

@ -3,22 +3,40 @@ return {
version = "*", -- Use the latest tagged version
-- opts = , -- This causes the plugin setup function to be called
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()
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({
pre_hook = function()
require("nvim-autopairs").disable()
@ -26,22 +44,6 @@ return {
post_hook = function()
require("nvim-autopairs").enable()
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,
}

4
nixcfgs/hosts/zephyrus/default.nix
View file

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

9
nixcfgs/modules/home/dev/go.nix
View file

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

9
nixcfgs/modules/home/dev/python.nix
View file

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

2
nixcfgs/modules/nixos/desktop/de/niri.nix
View file

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

4
nixcfgs/modules/nixos/desktop/fonts.nix
View file

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

1
nixcfgs/users/js0ny/packages/cli.nix
View file

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

2
nixcfgs/users/js0ny/packages/fonts.nix
View file

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

13
nixcfgs/users/js0ny/packages/gui.nix
View file

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

23
nixcfgs/users/js0ny/programs/distrobox.nix
View file

@ -1,4 +1,8 @@
{config, ...}: {
{
config,
pkgs,
...
}: {
programs.distrobox = {
enable = true;
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";
};
};
}

9
nixcfgs/users/js0ny/programs/plasma.nix
View file

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

8
nixcfgs/users/js0ny/programs/vscode.nix
View file

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