From b25e922bc36135c909f44d795ea8e01c9274bf9e Mon Sep 17 00:00:00 2001 From: dichgrem Date: Sat, 22 Nov 2025 11:53:24 +0800 Subject: [PATCH] build:update_flake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 362 -> 363: deno: ∅ → 2.5.6, +138840.2 KiB fzf: 0.66.1 → 0.67.0, +9.1 KiB hm_gdugdu.yaml: ∅ → ε kazumi: 1.8.7 → 1.8.8, +139.2 KiB libblockdev: 3.3.0 → 3.4.0 mesa: -21448.4 KiB nixos-system-dos: 25.11.20251116.50a96ed → 25.11.20251117.89c2b23 python3.13-python-xapp: 2.4.2 → 3.0.0, +84.9 KiB python3.13-yt-dlp-ejs: ∅ → 0.3.1, +173.2 KiB scx_full: 1.0.17 → 1.0.18, +707.0 KiB source: -334.4 KiB starship: 1.24.0 → 1.24.1, +17.5 KiB yt-dlp: 2025.10.22 → 2025.11.12, +329.9 KiB add:yazi remove:vscode add:nvim_mdview feat:Power-control --- flake.lock | 60 ++++++++++---------- home/nvim/default.nix | 3 + home/nvim/lua/config/keymaps.lua | 13 +++++ home/nvim/lua/plugins/markview.lua | 19 +++++++ home/{gui/editor/vscode.nix => tui/yazi.nix} | 2 +- hosts/dos/env.nix | 5 +- hosts/example/env.nix | 5 ++ modules/services/power.nix | 23 ++++++++ modules/services/scx.nix | 1 - 9 files changed, 98 insertions(+), 33 deletions(-) create mode 100644 home/nvim/lua/plugins/markview.lua rename home/{gui/editor/vscode.nix => tui/yazi.nix} (80%) create mode 100644 modules/services/power.nix diff --git a/flake.lock b/flake.lock index b82efa7..03bb7f9 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763246168, - "narHash": "sha256-gUDJZGSOg5syHtQvLImOKL6Eaw4e1ybz4o5pid66kQg=", + "lastModified": 1763732117, + "narHash": "sha256-/zBu6slgHtkuFZFJ4ReKS3NO6rdwEv4KcaYADkz6KyA=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6476fbdd52621b4a532309d982d468dc08204151", + "rev": "a34640558e83eb3ba0d52c52cb5ffd0465786e4b", "type": "github" }, "original": { @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1763651264, + "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1763313531, - "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=", + "lastModified": 1763748372, + "narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=", "owner": "nix-community", "repo": "home-manager", - "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391", + "rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1", "type": "github" }, "original": { @@ -351,11 +351,11 @@ ] }, "locked": { - "lastModified": 1762951919, - "narHash": "sha256-ma/xMEGf4J6n/RdZFdxXBJUQhP53HVEPQOC6Dp2TrkQ=", + "lastModified": 1763453666, + "narHash": "sha256-Hu8lDUlbMFvcYX30LBXX7Gq5FbU35bERH0pSX5qHf/Q=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3d248f6e8f877218dd2573fef8925ac997889922", + "rev": "b843b551415c7aecc97c8b3ab3fff26fd0cd8bbf", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -433,11 +433,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -473,11 +473,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763334942, - "narHash": "sha256-ORaewCyY3Fff+XaGrRjWi0XYzC22YTr/H3oL9c9k+9I=", + "lastModified": 1763729894, + "narHash": "sha256-hTWn0Z/BM5wzrnzY3RVNyXbguJBFGksatRtQvjCOqM8=", "owner": "nix-community", "repo": "nixvim", - "rev": "59af09b1814538b826f30eac8024d126d8c36efc", + "rev": "e13ceae64fbdf1475ee71d4170dcd2869e17cfff", "type": "github" }, "original": { @@ -553,11 +553,11 @@ ] }, "locked": { - "lastModified": 1763087910, - "narHash": "sha256-eB9Z1mWd1U6N61+F8qwDggX0ihM55s4E0CluwNukJRU=", + "lastModified": 1763433504, + "narHash": "sha256-cVid5UNpk88sPYHkLAA5aZEHOFQXSB/2L1vl18Aq7IM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cf4a68749733d45c0420726596367acd708eb2e8", + "rev": "42ce16c6d8318a654d53f047c9400b7d902d6e61", "type": "github" }, "original": { @@ -585,11 +585,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763314990, - "narHash": "sha256-gs98KFE3X2HQ64gsIpQNsj1lKFTdkNdX+1KMQTDXEus=", + "lastModified": 1763767967, + "narHash": "sha256-BMiqCHUxp2zoAjWCpvj5Scf0J+yTiXpkBlFuRo2nFIg=", "owner": "danth", "repo": "stylix", - "rev": "b68e8220689a6f0393204b07be1bc14bb973a0ed", + "rev": "cd11c057b054609b8463c20e6065de424b30b89d", "type": "github" }, "original": { diff --git a/home/nvim/default.nix b/home/nvim/default.nix index ab64738..4b88299 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -93,6 +93,7 @@ which-key-nvim fzf-lua snacks-nvim + markview-nvim { name = "lazydev.nvim"; path = lazydev-nvim; @@ -222,6 +223,8 @@ yaml toml dockerfile + markdown + markdown_inline ])).dependencies; }; in diff --git a/home/nvim/lua/config/keymaps.lua b/home/nvim/lua/config/keymaps.lua index 70f0791..b003157 100644 --- a/home/nvim/lua/config/keymaps.lua +++ b/home/nvim/lua/config/keymaps.lua @@ -29,3 +29,16 @@ vim.keymap.set("t", "", "l", { desc = "Go to right window" vim.keymap.set("n", "xo", function() vim.fn.jobstart({ "xdg-open", vim.fn.expand("%:p") }, { detach = true }) end, { desc = "使用系统默认应用程序打开当前文件" }) + +-- === Markdown priview === +vim.keymap.set("n", "mp", "Markview", { + desc = "Toggle Markview Inline Preview", +}) +-- 开启对比预览 +vim.keymap.set("n", "mv", "Markview splitToggle", { + desc = "Toggle Markview Split Preview", +}) +-- 关闭对比预览 +vim.keymap.set("n", "mc", "Markview splitClose", { + desc = "Close Markview Split Preview", +}) diff --git a/home/nvim/lua/plugins/markview.lua b/home/nvim/lua/plugins/markview.lua new file mode 100644 index 0000000..68815de --- /dev/null +++ b/home/nvim/lua/plugins/markview.lua @@ -0,0 +1,19 @@ +return { + "OXY2DEV/markview.nvim", + name = "markview.nvim", + lazy = false, + dependencies = { + "nvim-treesitter/nvim-treesitter", + "nvim-tree/nvim-web-devicons", + }, + config = function() + require("markview").setup({ + markdown = { enable = true }, + latex = { + enable = true, + inline = { enable = true }, + block = { enable = true }, + }, + }) + end, +} diff --git a/home/gui/editor/vscode.nix b/home/tui/yazi.nix similarity index 80% rename from home/gui/editor/vscode.nix rename to home/tui/yazi.nix index dee45d4..2e8ae44 100644 --- a/home/gui/editor/vscode.nix +++ b/home/tui/yazi.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { home.packages = with pkgs; [ - vscodium + yazi ]; } diff --git a/hosts/dos/env.nix b/hosts/dos/env.nix index d998e33..ec8bb89 100644 --- a/hosts/dos/env.nix +++ b/hosts/dos/env.nix @@ -6,12 +6,15 @@ GPU-AMD = true; ### See https://nixos.wiki/wiki/AMD_GPU + + Power-control = "TLP"; + ### Possible options: PPD ; TLP ## Software related QEMU-VM-Use-Case = true; + ### See https://github.com/qemu/qemu ; https://github.com/virt-manager/virt-manager Database-Use-Case = true; - ### See https://github.com/qemu/qemu ; https://github.com/virt-manager/virt-manager # Options ## System related diff --git a/hosts/example/env.nix b/hosts/example/env.nix index 302864c..bd134c3 100644 --- a/hosts/example/env.nix +++ b/hosts/example/env.nix @@ -16,10 +16,15 @@ HotSpot-Use-Case = false; ### See https://nixos.wiki/wiki/Internet_Connection_Sharing + Power control = "PPD"; + ### Possible options: PPD ; TLP + ## Software related QEMU-VM-Use-Case = false; ### See https://github.com/qemu/qemu ; https://github.com/virt-manager/virt-manager + Database-Use-Case = true; + # Options ## System related BootLoader = "systemd-boot"; diff --git a/modules/services/power.nix b/modules/services/power.nix new file mode 100644 index 0000000..aa4fa6f --- /dev/null +++ b/modules/services/power.nix @@ -0,0 +1,23 @@ +{ hostname, lib, pkgs, ... }: +with lib; let + inherit (import ../../hosts/${hostname}/env.nix) Power-control; +in +{ + services.power-profiles-daemon.enable = (Power-control == "PPD"); + + services.tlp = lib.mkIf (Power-control == "TLP") { + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "powersave"; + + CPU_MIN_PERF_ON_AC = 0; + CPU_MAX_PERF_ON_AC = 100; + CPU_MIN_PERF_ON_BAT = 0; + CPU_MAX_PERF_ON_BAT = 85; + }; + }; +} diff --git a/modules/services/scx.nix b/modules/services/scx.nix index a46968a..49ee98f 100644 --- a/modules/services/scx.nix +++ b/modules/services/scx.nix @@ -3,7 +3,6 @@ { services = { gvfs.enable = true; - power-profiles-daemon.enable = true; scx = { enable = true; scheduler = "scx_lavd";