From e2209cea579f069f7db87da7c94efa8eb9b32041 Mon Sep 17 00:00:00 2001 From: js0ny Date: Sun, 26 Oct 2025 16:14:39 +0000 Subject: [PATCH] fix: nix Maple Fonts --- home/dot_config/nvim/lua/plugins/mod/mc.lua | 58 +++++++++++---------- nixcfgs/hosts/zephyrus/default.nix | 4 +- nixcfgs/modules/home/dev/go.nix | 9 +++- nixcfgs/modules/home/dev/python.nix | 9 +++- nixcfgs/modules/nixos/desktop/de/niri.nix | 2 + nixcfgs/modules/nixos/desktop/fonts.nix | 4 +- nixcfgs/users/js0ny/packages/cli.nix | 1 + nixcfgs/users/js0ny/packages/fonts.nix | 2 +- nixcfgs/users/js0ny/packages/gui.nix | 13 +++-- nixcfgs/users/js0ny/programs/distrobox.nix | 23 +++++++- nixcfgs/users/js0ny/programs/plasma.nix | 9 ++-- nixcfgs/users/js0ny/programs/vscode.nix | 8 +-- 12 files changed, 96 insertions(+), 46 deletions(-) diff --git a/home/dot_config/nvim/lua/plugins/mod/mc.lua b/home/dot_config/nvim/lua/plugins/mod/mc.lua index fcd4079..c78cdb9 100644 --- a/home/dot_config/nvim/lua/plugins/mod/mc.lua +++ b/home/dot_config/nvim/lua/plugins/mod/mc.lua @@ -3,22 +3,40 @@ return { version = "*", -- Use the latest tagged version -- opts = , -- This causes the plugin setup function to be called keys = { - { "", "MultipleCursorsAddDown", mode = { "n", "x" }, desc = "Add cursor and move down" }, - { "", "MultipleCursorsAddUp", mode = { "n", "x" }, desc = "Add cursor and move up" }, + { + "", + "MultipleCursorsAddDown", + mode = { "n", "x" }, + desc = "Add cursor and move down", + }, + { + "", + "MultipleCursorsAddUp", + mode = { "n", "x" }, + desc = "Add cursor and move up", + }, - { "", "MultipleCursorsAddUp", mode = { "n", "i", "x" }, desc = "Add cursor and move up" }, - { "", "MultipleCursorsAddDown", mode = { "n", "i", "x" }, desc = "Add cursor and move down" }, + { + "", + "MultipleCursorsAddUp", + mode = { "n", "i", "x" }, + desc = "Add cursor and move up", + }, + { + "", + "MultipleCursorsAddDown", + mode = { "n", "i", "x" }, + desc = "Add cursor and move down", + }, - { "", "MultipleCursorsMouseAddDelete", mode = { "n", "i" }, desc = "Add or remove cursor" }, + { + "", + "MultipleCursorsMouseAddDelete", + 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", "" }, normal_mode_motion.k, "nowrap" }, - { { "n", "x" }, { "n", "" }, normal_mode_motion.j, "nowrap" }, - { { "n", "x" }, { "i", "", "" }, 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", "" }, 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, } diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index f40e2db..ec3f584 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -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 diff --git a/nixcfgs/modules/home/dev/go.nix b/nixcfgs/modules/home/dev/go.nix index df36afa..83bee62 100644 --- a/nixcfgs/modules/home/dev/go.nix +++ b/nixcfgs/modules/home/dev/go.nix @@ -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 ]; diff --git a/nixcfgs/modules/home/dev/python.nix b/nixcfgs/modules/home/dev/python.nix index 4bccaa7..3133886 100644 --- a/nixcfgs/modules/home/dev/python.nix +++ b/nixcfgs/modules/home/dev/python.nix @@ -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 diff --git a/nixcfgs/modules/nixos/desktop/de/niri.nix b/nixcfgs/modules/nixos/desktop/de/niri.nix index 7ceff18..84cdbf5 100644 --- a/nixcfgs/modules/nixos/desktop/de/niri.nix +++ b/nixcfgs/modules/nixos/desktop/de/niri.nix @@ -7,5 +7,7 @@ rofimoji rofi-power-menu swaylock-effects + xwayland-satellite + wmname ]; } diff --git a/nixcfgs/modules/nixos/desktop/fonts.nix b/nixcfgs/modules/nixos/desktop/fonts.nix index 39d59a1..d014487 100644 --- a/nixcfgs/modules/nixos/desktop/fonts.nix +++ b/nixcfgs/modules/nixos/desktop/fonts.nix @@ -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"]; diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index 2b33543..2e02b1c 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -50,5 +50,6 @@ powershell powershell-editor-services package-version-server + gemini-cli ]; } diff --git a/nixcfgs/users/js0ny/packages/fonts.nix b/nixcfgs/users/js0ny/packages/fonts.nix index 59375ed..653caba 100644 --- a/nixcfgs/users/js0ny/packages/fonts.nix +++ b/nixcfgs/users/js0ny/packages/fonts.nix @@ -3,7 +3,7 @@ fonts.fontconfig = { defaultFonts = { monospace = [ - "Maple Mono NF" + "Maple Mono NF CN" "JetBrainsMono Nerd Font" ]; serif = ["LXGW WenKai"]; diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 68ee672..0950dfb 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -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 = { diff --git a/nixcfgs/users/js0ny/programs/distrobox.nix b/nixcfgs/users/js0ny/programs/distrobox.nix index a10d7a6..659380f 100644 --- a/nixcfgs/users/js0ny/programs/distrobox.nix +++ b/nixcfgs/users/js0ny/programs/distrobox.nix @@ -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"; + }; + }; } diff --git a/nixcfgs/users/js0ny/programs/plasma.nix b/nixcfgs/users/js0ny/programs/plasma.nix index e07ef10..f4692d8 100644 --- a/nixcfgs/users/js0ny/programs/plasma.nix +++ b/nixcfgs/users/js0ny/programs/plasma.nix @@ -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; }; }; diff --git a/nixcfgs/users/js0ny/programs/vscode.nix b/nixcfgs/users/js0ny/programs/vscode.nix index 3f499cf..64f46d7 100644 --- a/nixcfgs/users/js0ny/programs/vscode.nix +++ b/nixcfgs/users/js0ny/programs/vscode.nix @@ -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; }