From 16ab036322c0807390bb05a30fe2350f46ba21c9 Mon Sep 17 00:00:00 2001 From: js0ny Date: Fri, 31 Oct 2025 04:09:25 +0000 Subject: [PATCH] use maple font --- home/dot_config/ghostty/config | 2 +- home/dot_config/nvim/lsp/svls.lua | 9 -- home/dot_config/nvim/lsp/verible.lua | 5 + home/dot_config/nvim/lua/keymaps/init.lua | 4 +- home/dot_config/nvim/lua/keymaps/tmap.lua | 33 +++++ .../dot_config/nvim/lua/plugins/fileutils.lua | 2 +- .../nvim/lua/plugins/mod/snacks-nvim.lua | 24 ++-- home/dot_config/waybar/style.css | 2 +- home/dot_config/yazi/init.lua | 2 +- home/dot_config/yazi/keymap.toml | 4 +- misc/firefox/policies.json | 118 ++++++++++++++++++ misc/firefox/search.json.mozlz4 | Bin 0 -> 841 bytes nixcfgs/hosts/zephyrus/default.nix | 1 + nixcfgs/modules/nixos/desktop/de/niri.nix | 2 +- nixcfgs/modules/nixos/desktop/fonts.nix | 6 +- nixcfgs/modules/nixos/desktop/keyd.nix | 17 +++ nixcfgs/users/js0ny/programs/libreoffice.nix | 3 +- nixcfgs/users/js0ny/programs/miniserve.nix | 20 +++ 18 files changed, 222 insertions(+), 32 deletions(-) delete mode 100644 home/dot_config/nvim/lsp/svls.lua create mode 100644 home/dot_config/nvim/lsp/verible.lua create mode 100644 home/dot_config/nvim/lua/keymaps/tmap.lua create mode 100644 misc/firefox/policies.json create mode 100644 misc/firefox/search.json.mozlz4 create mode 100644 nixcfgs/modules/nixos/desktop/keyd.nix create mode 100644 nixcfgs/users/js0ny/programs/miniserve.nix diff --git a/home/dot_config/ghostty/config b/home/dot_config/ghostty/config index 16089d7..1c39111 100644 --- a/home/dot_config/ghostty/config +++ b/home/dot_config/ghostty/config @@ -5,7 +5,7 @@ ### Appearance font-size = 13 -# font-family = "Maple Mono NF" +font-family = "Maple Mono NF CN" theme = light:Catppuccin Latte,dark:Catppuccin Mocha background-opacity = 0.8 diff --git a/home/dot_config/nvim/lsp/svls.lua b/home/dot_config/nvim/lsp/svls.lua deleted file mode 100644 index b558f4c..0000000 --- a/home/dot_config/nvim/lsp/svls.lua +++ /dev/null @@ -1,9 +0,0 @@ --- SystemVerilog ---[[ Installation -cargo install svls ---]] -return { - cmd = { "svls" }, - filetypes = { "systemverilog", "verilog" }, - root_markers = { ".svls.toml" } -} diff --git a/home/dot_config/nvim/lsp/verible.lua b/home/dot_config/nvim/lsp/verible.lua new file mode 100644 index 0000000..48ddcc1 --- /dev/null +++ b/home/dot_config/nvim/lsp/verible.lua @@ -0,0 +1,5 @@ +-- Verilog +return { + cmd = { "verible-verilog-ls" }, + filetypes = { "systemverilog", "verilog" }, +} diff --git a/home/dot_config/nvim/lua/keymaps/init.lua b/home/dot_config/nvim/lua/keymaps/init.lua index 8cbbf8b..a36a6bc 100644 --- a/home/dot_config/nvim/lua/keymaps/init.lua +++ b/home/dot_config/nvim/lua/keymaps/init.lua @@ -9,13 +9,15 @@ local keymaps_general = vim.tbl_extend("force", {}, require("keymaps.leaders"), -- Tables cannot be merged since `mode` are set in some keymaps of `keymaps_basic` local keymaps_basic = require("keymaps.basic") local keymaps_modifier = require("keymaps.modifier") +local keymaps_terminal = require("keymaps.tmap") require("keymaps.buffer") utils.set_keymaps(keymaps_general) utils.set_keymaps(keymaps_basic) -utils.set_keymaps(keymaps_nvim_tree_general) +-- utils.set_keymaps(keymaps_nvim_tree_general) utils.set_keymaps(keymaps_modifier) +utils.set_keymaps(keymaps_terminal) -- Added in neovim 0.11 -- vim.keymap.del({ "n", "x" }, "grn") diff --git a/home/dot_config/nvim/lua/keymaps/tmap.lua b/home/dot_config/nvim/lua/keymaps/tmap.lua new file mode 100644 index 0000000..fdd9c48 --- /dev/null +++ b/home/dot_config/nvim/lua/keymaps/tmap.lua @@ -0,0 +1,33 @@ +local M = { + { + keys = "h", + cmd = "h", + opts = { desc = "Terminal window left", silent = true }, + }, + { + keys = "j", + cmd = "j", + opts = { desc = "Terminal window down", silent = true }, + }, + { + keys = "k", + cmd = "k", + opts = { desc = "Terminal window up", silent = true }, + }, + { + keys = "l", + cmd = "l", + opts = { desc = "Terminal window right", silent = true }, + }, + { + keys = "", + cmd = "", + opts = { desc = "Terminal window prefix", silent = true }, + }, +} + +for _, map in ipairs(M) do + map.mode = "t" +end + +return M diff --git a/home/dot_config/nvim/lua/plugins/fileutils.lua b/home/dot_config/nvim/lua/plugins/fileutils.lua index a43981d..a9fe512 100644 --- a/home/dot_config/nvim/lua/plugins/fileutils.lua +++ b/home/dot_config/nvim/lua/plugins/fileutils.lua @@ -37,5 +37,5 @@ return { -- "Neogit", -- }, -- }, - -- { import = "plugins.mod.neo-tree" }, + { import = "plugins.mod.neo-tree" }, } diff --git a/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua index 8b9920f..a59bb56 100644 --- a/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua +++ b/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua @@ -71,9 +71,9 @@ return { }, }, -- stylua: ignore end - explorer = { - enabled = true, - }, + -- explorer = { + -- enabled = true, + -- }, indent = { enabled = true }, input = { enabled = true }, notifier = { enabled = true }, @@ -88,13 +88,13 @@ return { img_dirs = { "90 - System/Assets" }, }, }, - keys = { - { - "ft", - function() - require("snacks").explorer() - end, - desc = "Toggle File Explorer", - }, - }, + -- keys = { + -- { + -- "ft", + -- function() + -- require("snacks").explorer() + -- end, + -- desc = "Toggle File Explorer", + -- }, + -- }, } diff --git a/home/dot_config/waybar/style.css b/home/dot_config/waybar/style.css index 5e045f7..ee7b8eb 100644 --- a/home/dot_config/waybar/style.css +++ b/home/dot_config/waybar/style.css @@ -1,6 +1,6 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: "Maple Mono NF"; + font-family: "Maple Mono NF CN"; font-size: 14px; font-feature-settings: "tnum"; } diff --git a/home/dot_config/yazi/init.lua b/home/dot_config/yazi/init.lua index c29e977..6f9c3b6 100644 --- a/home/dot_config/yazi/init.lua +++ b/home/dot_config/yazi/init.lua @@ -15,4 +15,4 @@ -- -- -- require("dual-pane"):setup({ enabled = true }) -- require("starship"):setup() --- -- require("yaziline"):setup() +require("yaziline"):setup() diff --git a/home/dot_config/yazi/keymap.toml b/home/dot_config/yazi/keymap.toml index 31bca00..c64966d 100644 --- a/home/dot_config/yazi/keymap.toml +++ b/home/dot_config/yazi/keymap.toml @@ -8,8 +8,8 @@ prepend_keymap = [ # Seeking - { on = "E", run = "seek -5", desc = "Seek up 5 units in the preview" }, - { on = "N", run = "seek 5", desc = "Seek down 5 units in the preview" }, + { on = "K", run = "seek -5", desc = "Seek up 5 units in the preview" }, + { on = "J", run = "seek 5", desc = "Seek down 5 units in the preview" }, # Find { on = ["g", "p"], run = "cd ~/Pictures", desc = "Go ~/Pictures/"} diff --git a/misc/firefox/policies.json b/misc/firefox/policies.json new file mode 100644 index 0000000..f7a4199 --- /dev/null +++ b/misc/firefox/policies.json @@ -0,0 +1,118 @@ +{ + "policies": { + "BlockAboutConfig": false, + "DisableAppUpdate": true, + "DisableFirefoxScreenshots": true, + "DisableTelemetry": true, + "DontCheckDefaultBrowser": true, + "ExtensionSettings": { + "@testpilot-containers": { + "install_url": "https://addons.mozilla.org/firefox/downloads/latest/multi-account-containers/latest.xpi", + "installation_mode": "force_installed" + }, + "@webcompat@mozilla.org": { + "install_url": "https://addons.mozilla.org/firefox/downloads/latest/side-view/latest.xpi", + "installation_mode": "force_installed" + }, + "langpack-zh-CN@firefox.mozilla.org": { + "install_url": "https://releases.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/xpi/zh-CN.xpi", + "installation_mode": "normal_installed" + }, + "uBlock0@raymondhill.net": { + "install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi", + "installation_mode": "force_installed" + }, + "{74145f27-f039-47ce-a470-a662b129930a}": { + "install_url": "https://addons.mozilla.org/firefox/downloads/latest/clearurls/latest.xpi", + "installation_mode": "force_installed" + } + }, + "Preferences": { + "browser.contentblocking.category": { + "Status": "locked", + "Value": "strict" + }, + "browser.formfill.enable": { + "Status": "locked", + "Value": false + }, + "browser.newtabpage.activity-stream.showSponsored": { + "Status": "locked", + "Value": false + }, + "browser.newtabpage.activity-stream.showSponsoredTopSites": { + "Status": "locked", + "Value": false + }, + "browser.shell.checkDefaultBrowser": { + "Status": "locked", + "Value": false + }, + "browser.urlbar.update2.engineAliasRefresh": { + "Status": "locked", + "Value": true + }, + "dom.forms.autocomplete.formautofill": { + "Status": "locked", + "Value": false + }, + "extensions.formautofill.creditCards.enabled": { + "Status": "locked", + "Value": false + }, + "screenshots.browser.component.enabled": { + "Status": "locked", + "Value": false + }, + "toolkit.tabbox.switchByScrolling": { + "Status": "locked", + "Value": true + }, + "toolkit.telemetry.archive.enabled": { + "Status": "locked", + "Value": false + }, + "toolkit.telemetry.enabled": { + "Status": "locked", + "Value": false + }, + "widget.use-xdg-desktop-portal.file-picker": { + "Status": "locked", + "Value": 1 + }, + "widget.use-xdg-desktop-portal.mime-handler": { + "Status": "locked", + "Value": 1 + } + }, + "SearchEngines": { + "Add": [ + { + "Alias": "@np", + "Description": "Search in NixOS Packages", + "IconURL": "https://nixos.org/favicon.ico", + "Method": "GET", + "Name": "NixOS Packages", + "URLTemplate": "https://search.nixos.org/packages?from=0&size=200&sort=relevance&type=packages&query={searchTerms}" + }, + { + "Alias": "@no", + "Description": "Search in NixOS Options", + "IconURL": "https://nixos.org/favicon.ico", + "Method": "GET", + "Name": "NixOS Options", + "URLTemplate": "https://search.nixos.org/options?from=0&size=200&sort=relevance&type=packages&query={searchTerms}" + }, + { + "Alias": "@hm", + "Description": "Search in Home Manager Options", + "IconURL": "https://nixos.org/favicon.ico", + "Method": "GET", + "Name": "Home Manager options", + "URLTemplate": "https://home-manager-options.extranix.com/?query={searchTerms}" + } + ], + "Default": "DuckDuckGo" + } + } +} diff --git a/misc/firefox/search.json.mozlz4 b/misc/firefox/search.json.mozlz4 new file mode 100644 index 0000000000000000000000000000000000000000..2a5b14d97cded68c9478fef2d26b6e31271fc204 GIT binary patch literal 841 zcmd1JukxufF<|KBW?=ZpQ>~Pmm!6rITC8LhU9A+KlA4y8mzv_3lbKj7!tl9I$)O-I zSt(XWDLykfKhHO@z&|NV$*Nk(&`ilnDWjyMpx8=ZKd~q|BPTPjv_dbxC|y4-u?(bE zFEcq`sTQQM*s-7>peVmAGbJ@e$to=|r#MwdDLyAZF(n|eBtywcDLNxRH&r(`F)uMa zwJ27h4& zzdSQL)0dH3I9!Q=-8h*ld+Y7--D4&zqH7c zu}{CW$c2&nKchluacYr5P-;Pbab`(=QDp!luXSQ+kw2rpy|*J+u?-`eeR@HO4I}UV znXO?)BCZ#h;Faszz&u$Y3vl1;w&DhFSGadLisfnIS&EmHzxH3PpDBRi`+ z1AhfOC!;FEdcEQdeP#W`f`Z~-EbNS$4E!35Z1&}ud09-n{kfURMft_~X_{=Q`Q@2; z>8T~(IoV6XGxJjN%ZtBqDk=D8aPe0#@iK)oY}YFSrMB|?qU>T`)_DEIoE&{-E*2&W u21a2n_I9qvN~OiA!HH$5DgH$%sYPtu9~f(Ol*&?ziZk=`l&lPmYPkS0fco_S literal 0 HcmV?d00001 diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index 4c39feb..6b9fdb0 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -22,6 +22,7 @@ # desktop environment and display manager ../../modules/nixos/desktop/dm/sddm.nix ../../modules/nixos/desktop/de/kde.nix + ../../modules/nixos/desktop/de/niri.nix # desktop programs ../../modules/nixos/programs/zsh.nix diff --git a/nixcfgs/modules/nixos/desktop/de/niri.nix b/nixcfgs/modules/nixos/desktop/de/niri.nix index 84cdbf5..e01f668 100644 --- a/nixcfgs/modules/nixos/desktop/de/niri.nix +++ b/nixcfgs/modules/nixos/desktop/de/niri.nix @@ -2,7 +2,7 @@ programs.niri.enable = true; environment.systemPackages = with pkgs; [ waybar - mako + dunst rofi rofimoji rofi-power-menu diff --git a/nixcfgs/modules/nixos/desktop/fonts.nix b/nixcfgs/modules/nixos/desktop/fonts.nix index d014487..6a9e237 100644 --- a/nixcfgs/modules/nixos/desktop/fonts.nix +++ b/nixcfgs/modules/nixos/desktop/fonts.nix @@ -1,13 +1,14 @@ {pkgs, ...}: let fontPkgs = [ - pkgs.maple-mono.CN - pkgs.sarasa-gothic + pkgs.maple-mono.NF-CN pkgs.lxgw-wenkai pkgs.lxgw-neoxihei pkgs.noto-fonts-cjk-sans pkgs.noto-fonts pkgs.noto-fonts-emoji pkgs.nerd-fonts.jetbrains-mono + pkgs.nur.repos.definfo.sarasa-term-sc-nerd + pkgs.vollkorn ]; in { environment.systemPackages = fontPkgs; @@ -21,6 +22,7 @@ in { defaultFonts = { monospace = [ "Maple Mono NF CN" + "Sarasa Term SC Nerd" "JetBrainsMono Nerd Font" ]; serif = ["LXGW WenKai"]; diff --git a/nixcfgs/modules/nixos/desktop/keyd.nix b/nixcfgs/modules/nixos/desktop/keyd.nix new file mode 100644 index 0000000..792f137 --- /dev/null +++ b/nixcfgs/modules/nixos/desktop/keyd.nix @@ -0,0 +1,17 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + keyd + ]; + + services.keyd = { + enable = true; + keyboards = { + ids = ["*"]; + settings = { + main = { + capslock = "overload(control, esc)"; + }; + }; + }; + }; +} diff --git a/nixcfgs/users/js0ny/programs/libreoffice.nix b/nixcfgs/users/js0ny/programs/libreoffice.nix index aa8b6c2..031378f 100644 --- a/nixcfgs/users/js0ny/programs/libreoffice.nix +++ b/nixcfgs/users/js0ny/programs/libreoffice.nix @@ -11,7 +11,8 @@ X-KDE-StartupNotify=false [Desktop Action convertToPDF] - Name=转换为 PDF + Name=Convert to PDF + Name[CN]=转换为 PDF Icon=application-pdf Exec=soffice --headless --convert-to pdf "%f" --outdir . ''; diff --git a/nixcfgs/users/js0ny/programs/miniserve.nix b/nixcfgs/users/js0ny/programs/miniserve.nix new file mode 100644 index 0000000..76b1f6f --- /dev/null +++ b/nixcfgs/users/js0ny/programs/miniserve.nix @@ -0,0 +1,20 @@ +{pkgs, ...}: { + home.packages = [pkgs.miniserve]; + home.file.".local/share/kio/servicemenus/miniserve.desktop" = { + text = '' + [Desktop Entry] + Type=Service + MimeType=inode/directory + Actions=miniserveDir + Icon=network-server + X-KDE-Priority=TopLevel + X-KDE-StartupNotify=false + + [Desktop Action miniserveDir] + Name=Map Directory to Port 8080 + Name[CN]=将目录映射到网上(8080) + Icon=network-server + Exec=alacritty -t "miniserve" -e miniserve "%f" --port 8080 + ''; + }; +}