From 389cc21cda079357edc052b782e1fc0cc1340ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 29 Jun 2025 21:16:13 +0200 Subject: [PATCH 01/57] git: switch back to patdiff --- nix/homeModules/common/git.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nix/homeModules/common/git.nix b/nix/homeModules/common/git.nix index a38485b7..e8f562c4 100644 --- a/nix/homeModules/common/git.nix +++ b/nix/homeModules/common/git.nix @@ -2,10 +2,7 @@ # git plugins programs.git = { lfs.enable = true; - difftastic = { - enable = true; - enableAsDifftool = true; - }; + patdiff.enable = true; }; # git itself From 8a25f7593fc2d5084ccaf55b9dd44bc92f5e8d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 29 Jun 2025 22:10:19 +0200 Subject: [PATCH 02/57] vanadium: use patdiff for lazygit --- nix/homeModules/common/git.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nix/homeModules/common/git.nix b/nix/homeModules/common/git.nix index e8f562c4..aef38c0b 100644 --- a/nix/homeModules/common/git.nix +++ b/nix/homeModules/common/git.nix @@ -1,10 +1,24 @@ -{lib, ...}: { +{ + lib, + config, + ... +}: { # git plugins programs.git = { lfs.enable = true; patdiff.enable = true; }; + # 懶惰鬼賴皮 + programs.lazygit = let + patdiffCfg = config.programs.git.patdiff; + in + lib.mkIf patdiffCfg.enable { + settings = { + git.paging.externalDiffCommand = "${lib.getExe' patdiffCfg.package "patdiff-git-wrapper"}"; + }; + }; + # git itself programs.git = { extraConfig = { From aa3f2cbc2116bcb17fd2275bf2463bb468bcf3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 29 Jun 2025 22:13:52 +0200 Subject: [PATCH 03/57] vanadium: be explicit about the emacs being vulnerable I don't think this actually changes anything Welp it actually doesn't :dodo: --- nix/configurations/vanadium/home/programs.nix | 2 +- nix/overlays/pin-emacs28.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index b39bcdd0..6ab1542f 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -77,7 +77,7 @@ emacs = { enable = true; - package = pkgs.emacs28; + package = pkgs.unsafe-emacs28; }; lazygit.enable = true; diff --git a/nix/overlays/pin-emacs28.nix b/nix/overlays/pin-emacs28.nix index ef61a025..3bcca404 100644 --- a/nix/overlays/pin-emacs28.nix +++ b/nix/overlays/pin-emacs28.nix @@ -2,5 +2,5 @@ let sources = import ../sources.nix; in _: _: { - emacs28 = (import sources.pin-emacs28 {}).emacs; + unsafe-emacs28 = (import sources.pin-emacs28 {}).emacs; } From 5e276431c56e2f344d09eba5bcd51b77d99efcf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 29 Jun 2025 22:16:49 +0200 Subject: [PATCH 04/57] {vanadium,tungsten}: -weylus --- nix/configurations/tungsten/nixos/input.nix | 10 +++++----- nix/configurations/vanadium/nixos/input.nix | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nix/configurations/tungsten/nixos/input.nix b/nix/configurations/tungsten/nixos/input.nix index 5bcfbe2f..01153159 100644 --- a/nix/configurations/tungsten/nixos/input.nix +++ b/nix/configurations/tungsten/nixos/input.nix @@ -17,9 +17,9 @@ services.fprintd.enable = false; - programs.weylus = { - enable = true; - users = ["leana"]; - openFirewall = true; - }; + # programs.weylus = { + # enable = true; + # users = ["leana"]; + # openFirewall = true; + # }; } diff --git a/nix/configurations/vanadium/nixos/input.nix b/nix/configurations/vanadium/nixos/input.nix index 30cbc716..761e8095 100644 --- a/nix/configurations/vanadium/nixos/input.nix +++ b/nix/configurations/vanadium/nixos/input.nix @@ -21,9 +21,9 @@ services.fprintd.enable = false; - programs.weylus = { - enable = true; - users = ["leana"]; - openFirewall = true; - }; + # programs.weylus = { + # enable = true; + # users = ["leana"]; + # openFirewall = true; + # }; } From 6ca9516500390a36eab4d8b9168e41846933cacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 29 Jun 2025 22:26:25 +0200 Subject: [PATCH 05/57] {vanadium,tungsten}: remove duplicated packages --- nix/configurations/tungsten.nix | 1 - nix/configurations/tungsten/home/programs.nix | 1 - nix/configurations/vanadium.nix | 1 - nix/configurations/vanadium/home/dev.nix | 4 ++++ nix/configurations/vanadium/home/programs.nix | 1 - nix/homeModules/common/neovim.nix | 17 ----------------- 6 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 nix/homeModules/common/neovim.nix diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix index a8e54d66..90f25d93 100644 --- a/nix/configurations/tungsten.nix +++ b/nix/configurations/tungsten.nix @@ -144,7 +144,6 @@ in ../homeModules/common/kitty.nix ../homeModules/common/leana.nix ../homeModules/common/locale.nix - ../homeModules/common/neovim.nix ../homeModules/common/packages.nix ../homeModules/common/password-store.nix ../homeModules/common/sioyek.nix diff --git a/nix/configurations/tungsten/home/programs.nix b/nix/configurations/tungsten/home/programs.nix index 5ddb946f..f662d598 100644 --- a/nix/configurations/tungsten/home/programs.nix +++ b/nix/configurations/tungsten/home/programs.nix @@ -76,7 +76,6 @@ pkgs.xbrightness pkgs.dmenu pkgs.xclip - pkgs.playerctl # talk to playerctld pkgs.xscreensaver # talk to xscreensaver pkgs.xcolor diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 45c3b166..1614f330 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -164,7 +164,6 @@ in ../homeModules/common/leana.nix ../homeModules/common/locale.nix ../homeModules/common/lazygit.nix - ../homeModules/common/neovim.nix ../homeModules/common/packages.nix ../homeModules/common/password-store.nix ../homeModules/common/sioyek.nix diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 71f9d9d1..c96ed512 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -23,6 +23,10 @@ pkgs.taplo # toml pkgs.vscode-langservers-extracted # JSON etc pkgs.yaml-language-server # yaml + + # bash + pkgs.shfmt + pkgs.nodePackages.bash-language-server ]; programs.git = { diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index 6ab1542f..2361abed 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -106,7 +106,6 @@ # productivity / media pkgs.evolution pkgs.libreoffice - pkgs.iamb pkgs.calibre # pkgs.rawtherapee pkgs.digikam diff --git a/nix/homeModules/common/neovim.nix b/nix/homeModules/common/neovim.nix deleted file mode 100644 index 6df8c118..00000000 --- a/nix/homeModules/common/neovim.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: let - cfg = config.programs.neovim; -in { - config = lib.mkIf cfg.enable { - home.packages = [ - # might be useful for servers, serves as minimal configuration - pkgs.nodePackages.bash-language-server - pkgs.shellcheck - pkgs.shfmt - ]; - }; -} From f75238767f7ad564157c7ab284953b8126f47a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 08:48:08 +0200 Subject: [PATCH 06/57] npins: update sources --- npins/sources.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index 24b7faf6..fc781a08 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -118,9 +118,9 @@ }, "branch": "main", "submodules": false, - "revision": "4e5ac6ec65c775fbc6adba1c6022b29c7eccde0f", - "url": "https://github.com/oxalica/nil/archive/4e5ac6ec65c775fbc6adba1c6022b29c7eccde0f.tar.gz", - "hash": "0fvkmiipmswzhak0n0hf472q5rw4k7iankv40g89ilw6ra8zwrn2" + "revision": "b043bfe1f3f4c4be4b688e24c5ae96e81f525805", + "url": "https://github.com/oxalica/nil/archive/b043bfe1f3f4c4be4b688e24c5ae96e81f525805.tar.gz", + "hash": "0jpdb5wpk6jc4b2smi7wvjrjjbi2l6r3yi95wz3jsr12xzbs0xnd" }, "nix-tree": { "type": "GitRelease", @@ -160,9 +160,9 @@ }, "branch": "nixos-25.05", "submodules": false, - "revision": "a676066377a2fe7457369dd37c31fd2263b662f4", - "url": "https://github.com/NixOS/nixpkgs/archive/a676066377a2fe7457369dd37c31fd2263b662f4.tar.gz", - "hash": "17vgcpydmk9qw2knszsdnnnh4zfxd2x7jpgifkkkz2rdg8bcwvyd" + "revision": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "url": "https://github.com/NixOS/nixpkgs/archive/b43c397f6c213918d6cfe6e3550abfe79b5d1c51.tar.gz", + "hash": "1dkp9sxci4b4f111x0ck493fiag68qjs5c927khzcj2a5pdbsayl" }, "nur": { "type": "Git", @@ -173,9 +173,9 @@ }, "branch": "main", "submodules": false, - "revision": "00b0005dbbb931014fdfe55d0db1f47af4f9aab5", - "url": "https://github.com/nix-community/nur/archive/00b0005dbbb931014fdfe55d0db1f47af4f9aab5.tar.gz", - "hash": "0lrdcaayxifnq2n4sza7sma0w8rqghc7rkb3ly1n7rdnrbmn3f8b" + "revision": "c41210bd9aea6b7cd8fea393385bef84ee1355e8", + "url": "https://github.com/nix-community/nur/archive/c41210bd9aea6b7cd8fea393385bef84ee1355e8.tar.gz", + "hash": "0lc3rzqspf9lz7fx4xb8k6690bf0hxdam51nlfckf4llx523vl9w" }, "pin-emacs28": { "type": "Git", From 9eb882e06e61df3aabf3105cae829a8c77df179b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 09:21:13 +0200 Subject: [PATCH 07/57] vanadium: temporary sudo patch --- nix/configurations/vanadium/overlay.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nix/configurations/vanadium/overlay.nix b/nix/configurations/vanadium/overlay.nix index c2e62065..2d0f3538 100644 --- a/nix/configurations/vanadium/overlay.nix +++ b/nix/configurations/vanadium/overlay.nix @@ -54,4 +54,18 @@ in ./patches/fcitx5-chinese-addons/disable-fullwidth.patch # Note: disabling pinyin helper breaks canjie ]; + + # TODO: remove this when upstream is updated + sudo.__output.patches.__append = [ + (final.fetchpatch { + name = "CVE-2025-32462"; + url = "https://github.com/sudo-project/sudo/commit/d530367828e3713d09489872743eb92d31fb11ff.patch"; + hash = "sha256-mS8fcPV1QDv9SDuGN7dfDLtVLSBP+apotYW1UsEBPvU="; + }) + (final.fetchpatch { + name = "CVE-2025-32463"; + url = "https://github.com/sudo-project/sudo/commit/fdafc2ceb36382b07e604c0f39903d56bef54016.patch"; + hash = "sha256-4FP8z5pKwcOfJxjJ9X/IbCgriKJm1H/HnswuvYjBlt8="; + }) + ]; } From cace8d880e23a91914de606e117804492cc217fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 13:31:54 +0200 Subject: [PATCH 08/57] Revert "firefox: -news-feed-eradicator" This reverts commit 8a273b6ad4129473d999ceb1af176785c0ff337f. --- nix/homeModules/common/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index 49b09800..062dee5e 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -47,6 +47,7 @@ in { in [ addons.ublock-origin addons.privacy-badger + addons.news-feed-eradicator addons.multi-account-containers ]; }; From 0589bbf6afeada3dc9c1f5e6ac441aab4952f555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 13:35:04 +0200 Subject: [PATCH 09/57] firefox: document why news-feed-eradicator is there --- nix/homeModules/common/firefox.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index 062dee5e..2c250858 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -47,7 +47,15 @@ in { in [ addons.ublock-origin addons.privacy-badger - addons.news-feed-eradicator + + /* + Here's to you who want to remove news feed eradicator because you find it annoying: + It is here to annoy you so it is less likely for you to be on the agency inversion path. + DO NOT REMOVE IT. I repeat, DO NOT REMOVE IT. + + If you think it's annoying, go do some jump rope, sing, live. + */ + addons.news-feed-eradicator # did you read the comment above? addons.multi-account-containers ]; }; From ebbc034bf87b4b32c574944473fe3ca0ddcd33a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 13:42:33 +0200 Subject: [PATCH 10/57] Just: cleanup task --- Justfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Justfile b/Justfile index 672edec8..fd4c87a8 100644 --- a/Justfile +++ b/Justfile @@ -24,5 +24,9 @@ install host: --file ./default.nix \ --attr "nixosConfigurations.{{ host }}" +cleanup: + sudo nix-env --delete-generations +10 -p /nix/var/nix/profiles/system + nix-env --delete-generations +10 -p ~/.local/state/nix/profiles/home-manager + update: npins update From 90f6171af974011cbf427b15a802b1de7a48e264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 13:55:26 +0200 Subject: [PATCH 11/57] nixos/sudo: remove fancy lecture_file --- nix/nixosModules/common/sudo-conf.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/nix/nixosModules/common/sudo-conf.nix b/nix/nixosModules/common/sudo-conf.nix index 788288c2..b31388f4 100644 --- a/nix/nixosModules/common/sudo-conf.nix +++ b/nix/nixosModules/common/sudo-conf.nix @@ -1,21 +1,5 @@ -{pkgs, ...}: { +{ security.sudo.extraConfig = '' Defaults lecture = always - Defaults lecture_file = ${pkgs.writeText "sudo_lecture_file" '' - λλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλ - - λλλλ - λλλ - λλλ - λλλ Beep Boop - λλλ Are you sure about this? - λ λλλ Think twice :3 - λ λλλ - λ λλλ - λ λλλ - λ λλλλ - - λλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλ - ''} ''; } From 40d6518fa219d87bf5b386bf151d7801af0e6f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 14:59:10 +0200 Subject: [PATCH 12/57] xmobar: add network monitoring credits: https://github.com/gautaz/phoenix --- nix/configurations/tungsten/home/xmobar.nix | 20 ++++++++++++++++++-- nix/configurations/vanadium/home/xmobar.nix | 20 ++++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/nix/configurations/tungsten/home/xmobar.nix b/nix/configurations/tungsten/home/xmobar.nix index 14f65dad..b1c6d480 100644 --- a/nix/configurations/tungsten/home/xmobar.nix +++ b/nix/configurations/tungsten/home/xmobar.nix @@ -19,10 +19,26 @@ , "-l", "red" ] 10 , Run XMonadLog - ] + , Run + DynNetwork + [ "--template" + , ": ↑ kB/s ↓ kB/s" + , "--Low" + , "102400" + , "--High" + , "1024000" + , "--low" + , "green" + , "--normal" + , "orange" + , "--high" + , "red" + ] + 10 + ] , sepChar = "%" , alignSep = "}{" - , template = " %XMonadLog% }{ %battery% | %date% " + , template = " %XMonadLog% }{ %dynnetwork% | %battery% | %date% " } ''; }; diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index 14f65dad..b1c6d480 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -19,10 +19,26 @@ , "-l", "red" ] 10 , Run XMonadLog - ] + , Run + DynNetwork + [ "--template" + , ": ↑ kB/s ↓ kB/s" + , "--Low" + , "102400" + , "--High" + , "1024000" + , "--low" + , "green" + , "--normal" + , "orange" + , "--high" + , "red" + ] + 10 + ] , sepChar = "%" , alignSep = "}{" - , template = " %XMonadLog% }{ %battery% | %date% " + , template = " %XMonadLog% }{ %dynnetwork% | %battery% | %date% " } ''; }; From e4a33ba5d0a00308e25ee201ce82ad455066f027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 16:13:54 +0200 Subject: [PATCH 13/57] vanadium: let xmonad warn instead about low battery --- nix/configurations/vanadium/home/xmobar.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index b1c6d480..69e7b70a 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -17,6 +17,9 @@ , "-h", "green" , "-m", "yell" , "-l", "red" + -- Low battery warning + , "-A", "20" + , "-a", "notify-send -u critical \"Battery Low\" \"Please charge your battery\"" ] 10 , Run XMonadLog , Run From 1c5a96350783aebaa7e3841089578278baa77054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 16:15:08 +0200 Subject: [PATCH 14/57] vanadium: show battery time left in xmobar --- nix/configurations/vanadium/home/xmobar.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index 69e7b70a..0e4476c4 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -9,7 +9,7 @@ , position = BottomH 30 , commands = [ Run Date "%a %d %H:%M:%S" "date" 10 , Run Battery - [ "-t", ":%" + [ "-t", ":% ()" , "--" , "-O", "󰂄" , "-i", "󱟦" From cd70117c09030d2c3dc360d090d26177c40d0855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 16:23:06 +0200 Subject: [PATCH 15/57] vanadium: fix xmobar battery color --- nix/configurations/vanadium/home/xmobar.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index 0e4476c4..362b7975 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -15,7 +15,7 @@ , "-i", "󱟦" , "-o", "󰁾" , "-h", "green" - , "-m", "yell" + , "-m", "orange" , "-l", "red" -- Low battery warning , "-A", "20" From 8ae5b76b76b12c3feeca314ab7de3a81958de95f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 16:26:53 +0200 Subject: [PATCH 16/57] vanadium: xmobar remove battery icons --- nix/configurations/vanadium/home/xmobar.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index 362b7975..817830e1 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -9,11 +9,8 @@ , position = BottomH 30 , commands = [ Run Date "%a %d %H:%M:%S" "date" 10 , Run Battery - [ "-t", ":% ()" + [ "-t", "% ()" , "--" - , "-O", "󰂄" - , "-i", "󱟦" - , "-o", "󰁾" , "-h", "green" , "-m", "orange" , "-l", "red" From f7573fd8490081bd096da37f5fdb7a348079e895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 18:04:37 +0200 Subject: [PATCH 17/57] vanadium: battery value color --- nix/configurations/vanadium/home/xmobar.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index 817830e1..55ff9f6c 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -9,12 +9,14 @@ , position = BottomH 30 , commands = [ Run Date "%a %d %H:%M:%S" "date" 10 , Run Battery - [ "-t", "% ()" - , "--" + [ "-t", " ()" + , "-H", "70" + , "-L", "20" , "-h", "green" - , "-m", "orange" + , "-n", "orange" , "-l", "red" - -- Low battery warning + , "--" + , "-P" , "-A", "20" , "-a", "notify-send -u critical \"Battery Low\" \"Please charge your battery\"" ] 10 From b5ed6919376d2d36aada06e465fbcb22392a5df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 18:10:33 +0200 Subject: [PATCH 18/57] tungsten: copy over xmonad changes from vanadium --- nix/configurations/tungsten/home/xmobar.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nix/configurations/tungsten/home/xmobar.nix b/nix/configurations/tungsten/home/xmobar.nix index b1c6d480..55ff9f6c 100644 --- a/nix/configurations/tungsten/home/xmobar.nix +++ b/nix/configurations/tungsten/home/xmobar.nix @@ -9,14 +9,16 @@ , position = BottomH 30 , commands = [ Run Date "%a %d %H:%M:%S" "date" 10 , Run Battery - [ "-t", ":%" - , "--" - , "-O", "󰂄" - , "-i", "󱟦" - , "-o", "󰁾" + [ "-t", " ()" + , "-H", "70" + , "-L", "20" , "-h", "green" - , "-m", "yell" + , "-n", "orange" , "-l", "red" + , "--" + , "-P" + , "-A", "20" + , "-a", "notify-send -u critical \"Battery Low\" \"Please charge your battery\"" ] 10 , Run XMonadLog , Run From 47f4fb9e4350cb60294b6ad56fe672ca69cd3a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 18:30:29 +0200 Subject: [PATCH 19/57] vanadium/xmobar: add notes --- nix/configurations/vanadium/home/xmobar.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index 55ff9f6c..f698ab5e 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -1,6 +1,10 @@ { programs.xmobar = { enable = true; + # XMobar's config file is not a segment of valid Haskell source code -- it is instead a DSL + # Note how `Run` handles its arguments properly without parens? + # + # Also xmobar wants GHC if we use it as a library, and I'm lazy, you probably want to keep it this way. extraConfig = '' Config { overrideRedirect = False , font = "Iosevka 13" From c5bc3ed7d351146327e2faaaa96358025704fb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 18:39:03 +0200 Subject: [PATCH 20/57] vanadium/xmobar: reduce update time for certain monitors too loud --- nix/configurations/vanadium/home/xmobar.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index f698ab5e..d8856b73 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -23,7 +23,7 @@ , "-P" , "-A", "20" , "-a", "notify-send -u critical \"Battery Low\" \"Please charge your battery\"" - ] 10 + ] 600 , Run XMonadLog , Run DynNetwork @@ -40,7 +40,7 @@ , "--high" , "red" ] - 10 + 100 ] , sepChar = "%" , alignSep = "}{" From 0421536d2717888018b3df4f02d1f5c5183a2e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 20:32:25 +0200 Subject: [PATCH 21/57] shell: fix incorrect schema --- shell.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shell.nix b/shell.nix index 437a936a..c8537eba 100644 --- a/shell.nix +++ b/shell.nix @@ -18,9 +18,10 @@ }; withXMonad = pkgs.mkShell { - inputsFrom = with pkgs; [ + inputsFrom = [ default - + ]; + packages = with pkgs; [ (haskellPackages.ghcWithPackages (self: [ self.xmonad-contrib self.xmonad-extras From f38aaa62afb315f3ae69d3bd10ba2842a5dce9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 20:36:44 +0200 Subject: [PATCH 22/57] vanadium/xmonad: rename tall layout --- nix/configurations/vanadium/home/xmonad/xmonad.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index 2810b591..3fa42236 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -16,6 +16,7 @@ import XMonad.Util.SpawnOnce (spawnOnce) import XMonad.Layout.NoBorders (smartBorders) import XMonad.Layout.Reflect (reflectHoriz) import XMonad.Layout.Spacing (smartSpacingWithEdge) +import XMonad.Layout.Renamed (named) import XMonad.Layout.ResizableTile (ResizableTall(ResizableTall), MirrorResize (MirrorShrink, MirrorExpand)) import XMonad.Hooks.ManageHelpers (isFullscreen, (~?), composeOne, (-?>)) @@ -93,9 +94,10 @@ main = xmonad let tallr = reflectMsg . reflectHoriz $ ResizableTall 1 (1/10) (3/7) [] in smartBorders - ( smartSpacingWithEdge 5 tallr - ||| Full - ) + ( named "Normal" + (smartSpacingWithEdge 5 tallr) + ||| Full + ) , manageHook = let From 32b6fbccf01bc041bb9e172f4500f2db784e63d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 20:06:27 +0200 Subject: [PATCH 23/57] vanadium/xmobar: cute weather module --- nix/configurations/vanadium/home/xmobar.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index d8856b73..0d660ace 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -41,10 +41,19 @@ , "red" ] 100 - ] + , Run + Weather "LFRN" + [ "-t", ": C" + , "-L","10", "-H", "25" + , "--normal", "white" + , "--high", "orange" + , "--low", "blue" + ] + 18000 + ] , sepChar = "%" , alignSep = "}{" - , template = " %XMonadLog% }{ %dynnetwork% | %battery% | %date% " + , template = " %XMonadLog% }{ %dynnetwork% | %LFRN% | %battery% | %date% " } ''; }; From ae8273ee9d53db9029a8864c13a04f8778e6fed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 1 Jul 2025 20:42:01 +0200 Subject: [PATCH 24/57] treewide: remove battery-notify script --- nix/configurations/tungsten.nix | 1 - nix/configurations/tungsten/home/programs.nix | 6 -- nix/configurations/vanadium.nix | 1 - nix/configurations/vanadium/home/programs.nix | 6 -- nix/homeModules/common/battery-notify.nix | 70 ------------------- 5 files changed, 84 deletions(-) delete mode 100644 nix/homeModules/common/battery-notify.nix diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix index 90f25d93..1fae09ed 100644 --- a/nix/configurations/tungsten.nix +++ b/nix/configurations/tungsten.nix @@ -134,7 +134,6 @@ in ../homeModules/common/vim ../homeModules/common/wired ../homeModules/common/atuin.nix - ../homeModules/common/battery-notify.nix ../homeModules/common/direnv.nix ../homeModules/common/feh.nix ../homeModules/common/firefox.nix diff --git a/nix/configurations/tungsten/home/programs.nix b/nix/configurations/tungsten/home/programs.nix index f662d598..25377437 100644 --- a/nix/configurations/tungsten/home/programs.nix +++ b/nix/configurations/tungsten/home/programs.nix @@ -103,12 +103,6 @@ enable = true; components = ["secrets"]; }; - - battery-notify = { - enable = true; - device_full = "/sys/class/power_supply/BAT0/charge_full"; - device_now = "/sys/class/power_supply/BAT0/charge_now"; - }; }; } ]; diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 1614f330..59899aac 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -153,7 +153,6 @@ in ../homeModules/common/vim ../homeModules/common/wired ../homeModules/common/atuin.nix - ../homeModules/common/battery-notify.nix ../homeModules/common/direnv.nix ../homeModules/common/feh.nix ../homeModules/common/firefox.nix diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index 2361abed..70b02447 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -158,12 +158,6 @@ enable = true; components = ["secrets"]; }; - - battery-notify = { - enable = true; - device_full = "/sys/class/power_supply/BAT1/charge_full"; - device_now = "/sys/class/power_supply/BAT1/charge_now"; - }; }; } ]; diff --git a/nix/homeModules/common/battery-notify.nix b/nix/homeModules/common/battery-notify.nix deleted file mode 100644 index e7fce649..00000000 --- a/nix/homeModules/common/battery-notify.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: let - cfg = config.services."battery-notify"; -in { - options = { - services."battery-notify" = { - enable = lib.mkEnableOption "battery-notify"; - triggerLevel = lib.mkOption { - type = with lib.types; ints.between 0 100; - description = "Below which percentage should the script send a notification"; - default = 20; - }; - checkAt = lib.mkOption { - type = with lib.types; listOf str; - description = "At which frequency should the service check for the battery status"; - default = ["*:0/5"]; # every five minutes - }; - device_full = lib.mkOption { - type = with lib.types; str; - description = "The device to read for full energy status"; - }; - device_now = lib.mkOption { - type = with lib.types; str; - description = "The device to read for current energy status"; - }; - }; - }; - - config = lib.mkIf cfg.enable { - systemd.user.services."battery-notify" = { - Unit.Description = "Notify when battery is low"; - Install = { - WantedBy = ["multi-user.target"]; - }; - Service = { - ExecStart = let - script = pkgs.writeShellApplication { - name = "battery-notify"; - runtimeInputs = [ - pkgs.libnotify - pkgs.bc - pkgs.uutils-coreutils-noprefix - ]; - text = '' - now="$(cat ${cfg.device_now})" - full="$(cat ${cfg.device_full})" - - if (( $(bc -l <<< "($now / $full) * 100 < ${builtins.toString cfg.triggerLevel}") )); then - notify-send -u critical "Battery Low" "Please charge your battery" - fi - ''; - }; - in "${lib.getExe script}"; - }; - }; - - systemd.user.timers."battery-notify" = { - Unit.Description = "Notify when battery is low"; - Timer = { - OnCalendar = cfg.checkAt; - Persistent = true; - }; - Install.WantedBy = ["timers.target"]; - }; - }; -} From 190e09e9b4cc4b391c24b8c98cf58762af3a841a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 2 Jul 2025 07:58:09 +0200 Subject: [PATCH 25/57] firefox: remove thought provoking shit --- nix/homeModules/common/firefox.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index 2c250858..9070efc3 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -17,12 +17,17 @@ in { OfferToSaveLoginsDefault = false; PasswordManagerEnabled = false; FirefoxHome = { + # https://searchfox.org/mozilla-central/source/browser/components/enterprisepolicies/Policies.sys.mjs Search = true; TopSites = true; SponsoredTopSites = false; Highlights = false; Pocket = false; SponsoredPocket = false; + + # "Thought provoking stories" + Stories = false; + SponsoredStories = false; }; UserMessaging = { ExtensionRecommendations = false; @@ -40,6 +45,10 @@ in { "browser.ctrlTab.sortByRecentlyUsed" = false; "layout.css.devPixelsPerPx" = 1.1; "full-screen-api.ignore-widgets" = true; # limit fullscreen mode to window + + # "Thought provoking stories" + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; }; extensions.packages = let From 7b80afac0d57c7217b3398b29ef431b6294ecebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 2 Jul 2025 08:48:19 +0200 Subject: [PATCH 26/57] firefox: reworked default configuration --- nix/homeModules/common/firefox.nix | 62 ++++++++++++++++++------------ 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index 9070efc3..f6936818 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -3,41 +3,21 @@ in { programs.firefox = { # https://mozilla.github.io/policy-templates + # The following have more complex logic, keep them as policies and not profiles policies = { SearchEngines = { Remove = ["Bing" "DuckDuckGo" "Qwant" "eBay"]; }; - HardwareAcceleration = true; - DisableFirefoxScreenshots = false; - DisablePocket = true; + NoDefaultBookmarks = true; DisplayMenuBar = "never"; DisplayBookmarksToolbar = "never"; - NoDefaultBookmarks = true; - OfferToSaveLogins = false; - OfferToSaveLoginsDefault = false; - PasswordManagerEnabled = false; - FirefoxHome = { - # https://searchfox.org/mozilla-central/source/browser/components/enterprisepolicies/Policies.sys.mjs - Search = true; - TopSites = true; - SponsoredTopSites = false; - Highlights = false; - Pocket = false; - SponsoredPocket = false; - - # "Thought provoking stories" - Stories = false; - SponsoredStories = false; - }; - UserMessaging = { - ExtensionRecommendations = false; - SkipOnboarding = true; - }; DNSOverHTTPS = { Enabled = true; }; }; + # https://searchfox.org/mozilla-central/source/browser/components/enterprisepolicies/Policies.sys.mjs + # Some policies can be rewritten to profiles configuration profiles.default = { settings = { "toolkit.legacyUserProfileCustomizations.stylesheets" = true; @@ -46,9 +26,41 @@ in { "layout.css.devPixelsPerPx" = 1.1; "full-screen-api.ignore-widgets" = true; # limit fullscreen mode to window - # "Thought provoking stories" + # Sponsored crap + # Yes + "browser.newtabpage.activity-stream.showSearch" = true; + "browser.newtabpage.activity-stream.feeds.topsites" = true; + # No + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.feeds.section.highlights" = false; + "browser.newtabpage.activity-stream.feeds.system.topstories" = false; "browser.newtabpage.activity-stream.feeds.section.topstories" = false; "browser.newtabpage.activity-stream.showSponsored" = false; + + # URL + # Yes + "browser.urlbar.suggest.quicksuggest.nonsponsored" = true; + # No + "browser.urlbar.suggest.quicksuggest.sponsored" = false; + + # Pasword manager + "signon.rememberSignons" = false; + "services.passwordSavingEnabled" = false; + "pref.privacy.disable_button.view_passwords" = false; + + # Hardware acceleration + "layers.acceleration.disabled" = false; + + # Screenshot + "screenshots.browser.component.enabled" = true; + + # Recommendations + "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false; + "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false; + "extensions.htmlaboutaddons.recommendations.enabled" = false; # Addons + + # Onboarding + "browser.aboutwelcome.enabled" = false; }; extensions.packages = let From 08a525a20b16ca99b223301b89920a35802a96fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 2 Jul 2025 15:52:15 +0200 Subject: [PATCH 27/57] nvim: disable treesitter textobjects --- .config/nvim/after/plugin/treesitter.lua | 29 ------------------------ 1 file changed, 29 deletions(-) diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 83d53e89..827cc95d 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -24,33 +24,4 @@ require("nvim-treesitter.configs").setup { local ok, stats = pcall(vim.uv.fs_stat, vim.api.nvim_buf_get_name(buf)) if ok and stats and stats.size > max_filesize then return true end end, - - -- Text objets - textobjects = { - select = { - enable = true, - lookahead = true, - keymaps = { - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@class.outer", - ["ic"] = "@class.inner", - }, - selection_modes = { - ["@parameter.outer"] = "v", -- charwise - ["@function.outer"] = "V", -- linewise - ["@class.outer"] = "", -- blockwise - }, - include_surrounding_whitespace = true, - }, - swap = { - enable = true, - swap_next = { - ["a"] = "@parameter.inner", - }, - swap_previous = { - ["A"] = "@parameter.inner", - }, - }, - }, } From 4661d3b2555291600bca72a4212b30db8ef931ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 2 Jul 2025 15:52:48 +0200 Subject: [PATCH 28/57] nvim: use treesitter to indent if possible --- .config/nvim/after/plugin/treesitter.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 827cc95d..c1f391f4 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -24,4 +24,6 @@ require("nvim-treesitter.configs").setup { local ok, stats = pcall(vim.uv.fs_stat, vim.api.nvim_buf_get_name(buf)) if ok and stats and stats.size > max_filesize then return true end end, + + indent = true, } From bdce0e98fb967042592248267148e859c69d0976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 2 Jul 2025 15:54:13 +0200 Subject: [PATCH 29/57] nvim: disable oil I like visual block mode --- .config/nvim/after/plugin/oil.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/after/plugin/oil.lua b/.config/nvim/after/plugin/oil.lua index a805db9e..e75dded1 100644 --- a/.config/nvim/after/plugin/oil.lua +++ b/.config/nvim/after/plugin/oil.lua @@ -11,7 +11,7 @@ require("oil").setup { keymaps = { ["g?"] = "actions.show_help", [""] = "actions.select", - [""] = "actions.select_vsplit", + -- [""] = "actions.select_vsplit", [""] = "actions.select_split", [""] = "actions.select_tab", [""] = "actions.preview", From d93f2c3a1cc5b9516c044edf23309b189ac106c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 2 Jul 2025 19:22:04 +0200 Subject: [PATCH 30/57] npins: update lix --- npins/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index fc781a08..3c5cfd5d 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -84,13 +84,13 @@ "repo": "lix" }, "pre_releases": false, - "version_upper_bound": "2.93.1", + "version_upper_bound": null, "release_prefix": null, "submodules": false, - "version": "2.93.0", - "revision": "47aad376c87e2e65967f17099277428e4b3f8e5a", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2.93.0.tar.gz", - "hash": "0g17i8yz5j0i2v29c2fddksvnc5n8fc5ml2pz0jhxaia7ghmxhc6" + "version": "2.93.2", + "revision": "22be6ff62626c8cdbb9cdb59a3e4bd910fedd0d6", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2.93.2.tar.gz", + "hash": "10pr6xp2m3fmnhywakv9msb33gllkr85qi0bl40wlgn7hlp9r317" }, "lix-module": { "type": "GitRelease", From 8cc6d2b71cedbb31aeedffc76488a41d021ae8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 08:34:22 +0200 Subject: [PATCH 31/57] remove niv residue ```fish for d in {.,**/*} if [ ! -d $d ]; continue; end set from ./nix/sources.nix set to ./npins set from (realpath -s $from --relative-to $d) set to (realpath -s $to --relative-to $d) echo "($d, $from, $to)" for f in $d/* if [ ! -f $f ]; continue; end sed -i "s=$from=$to=" $f end end ``` --- Justfile | 4 ++-- default.nix | 2 +- nix/configurations/tungsten.nix | 2 +- nix/configurations/vanadium.nix | 2 +- nix/configurations/vanadium/overlay.nix | 2 +- nix/devShells/flora.nix | 2 +- nix/devShells/necro-man.nix | 2 +- nix/devShells/vim-tw.nix | 2 +- nix/overlays/agenix.nix | 2 +- nix/overlays/disko.nix | 2 +- nix/overlays/fcitx5-table-extra-taiwanese.nix | 2 +- nix/overlays/nil.nix | 2 +- nix/overlays/nix-tree.nix | 2 +- nix/overlays/nur.nix | 2 +- nix/overlays/pin-emacs28.nix | 2 +- nix/overlays/pin-isabelle-2023.nix | 2 +- nix/overlays/pin-wireshark.nix | 2 +- nix/overlays/wallpapers.nix | 2 +- nix/overlays/wired-notify.nix | 2 +- nix/packages/default.nix | 2 +- nix/sources.nix | 2 -- shell.nix | 2 +- 22 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 nix/sources.nix diff --git a/Justfile b/Justfile index fd4c87a8..17d6a417 100644 --- a/Justfile +++ b/Justfile @@ -5,7 +5,7 @@ os host action: #!/usr/bin/env bash set -euo pipefail - nixpkgs=$(nix-instantiate --eval -E "let sources = import ./nix/sources.nix; in sources.nixpkgs.outPath" | jq -r .) + nixpkgs=$(nix-instantiate --eval -E "let sources = import ./npins; in sources.nixpkgs.outPath" | jq -r .) sudo nixos-rebuild {{ action }} \ -I nixpkgs=${nixpkgs} \ -I nixos-config=./nix/configurations/{{ host }}.nix \ @@ -17,7 +17,7 @@ install host: #!/usr/bin/env bash set -euo pipefail - nixpkgs=$(nix-instantiate --eval -E "let sources = import ./nix/sources.nix; in sources.nixpkgs.outPath" | jq -r .) + nixpkgs=$(nix-instantiate --eval -E "let sources = import ./npins; in sources.nixpkgs.outPath" | jq -r .) sudo nixos-install \ -I nixpkgs=${nixpkgs} \ -I nixos-config=./nix/configurations/{{ host }}.nix \ diff --git a/default.nix b/default.nix index 63c86ade..0a0f3316 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{sources ? import ./nix/sources.nix}: { +{sources ? import ./npins}: { lib = import (sources.nixpkgs + "/lib"); nixosConfigurations = builtins.mapAttrs (_: import (sources.nixpkgs + "/nixos/lib/eval-config.nix")) { diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix index 1fae09ed..92d2fb38 100644 --- a/nix/configurations/tungsten.nix +++ b/nix/configurations/tungsten.nix @@ -1,6 +1,6 @@ # Entry point to cherry pick modules let - sources = import ../sources.nix; + sources = import ../../npins; hostname = "tungsten"; username = "leana"; diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 59899aac..c68d59f5 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -1,6 +1,6 @@ # Entry point to cherry pick modules let - sources = import ../sources.nix; + sources = import ../../npins; hostname = "vanadium"; username = "leana"; diff --git a/nix/configurations/vanadium/overlay.nix b/nix/configurations/vanadium/overlay.nix index 2d0f3538..b866a7f9 100644 --- a/nix/configurations/vanadium/overlay.nix +++ b/nix/configurations/vanadium/overlay.nix @@ -1,5 +1,5 @@ let - sources = import ../../sources.nix; + sources = import ../../../npins; lib = import (sources.nixpkgs + "/lib"); infuse-lib = import sources.infuse { diff --git a/nix/devShells/flora.nix b/nix/devShells/flora.nix index 076867ee..21c35fb8 100644 --- a/nix/devShells/flora.nix +++ b/nix/devShells/flora.nix @@ -2,7 +2,7 @@ # This is the non flake shell that just gets the basics of flora so I can have hls support outside of docker # let - sources = import ../sources.nix; + sources = import ../../npins; in {pkgs ? import sources.pin-florashell {}}: pkgs.mkShell (let diff --git a/nix/devShells/necro-man.nix b/nix/devShells/necro-man.nix index 8b0f2cf1..098e0cdc 100644 --- a/nix/devShells/necro-man.nix +++ b/nix/devShells/necro-man.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in {pkgs ? import sources.pin-necro-man-nixpkgs {}}: let shell = { diff --git a/nix/devShells/vim-tw.nix b/nix/devShells/vim-tw.nix index f9a5ca97..58c6678c 100644 --- a/nix/devShells/vim-tw.nix +++ b/nix/devShells/vim-tw.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in {pkgs ? import sources.pin-vim-tw {}}: pkgs.mkShell { diff --git a/nix/overlays/agenix.nix b/nix/overlays/agenix.nix index 571e8ddf..952db8d7 100644 --- a/nix/overlays/agenix.nix +++ b/nix/overlays/agenix.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in final: _: { inherit (final.callPackage sources.agenix {}) agenix; diff --git a/nix/overlays/disko.nix b/nix/overlays/disko.nix index 9c2a41f0..7a7c539d 100644 --- a/nix/overlays/disko.nix +++ b/nix/overlays/disko.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in final: _: { disko = diff --git a/nix/overlays/fcitx5-table-extra-taiwanese.nix b/nix/overlays/fcitx5-table-extra-taiwanese.nix index 3fdad750..b24003f8 100644 --- a/nix/overlays/fcitx5-table-extra-taiwanese.nix +++ b/nix/overlays/fcitx5-table-extra-taiwanese.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in final: prev: { fcitx5-table-extra = prev.fcitx5-table-extra.overrideAttrs (oldAttrs: { diff --git a/nix/overlays/nil.nix b/nix/overlays/nil.nix index 778895ee..daca3bf1 100644 --- a/nix/overlays/nil.nix +++ b/nix/overlays/nil.nix @@ -1,6 +1,6 @@ # Run the one with my cool feature here for now let - sources = import ../sources.nix; + sources = import ../../npins; inherit (sources) nil; inherit (nil.repository) owner repo; in diff --git a/nix/overlays/nix-tree.nix b/nix/overlays/nix-tree.nix index 778eef6d..36c30bfe 100644 --- a/nix/overlays/nix-tree.nix +++ b/nix/overlays/nix-tree.nix @@ -1,7 +1,7 @@ # The one in nixpkgs doesn't work # Getting nix-tree: user error (Failed parsing nix path-info output.) let - sources = import ../sources.nix; + sources = import ../../npins; in final: _: { nix-tree = (import sources.nix-tree).packages.${final.system}.default; diff --git a/nix/overlays/nur.nix b/nix/overlays/nur.nix index 82cb25e6..57c2994f 100644 --- a/nix/overlays/nur.nix +++ b/nix/overlays/nur.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: prev: { nur = import sources.nur { diff --git a/nix/overlays/pin-emacs28.nix b/nix/overlays/pin-emacs28.nix index 3bcca404..f37787d7 100644 --- a/nix/overlays/pin-emacs28.nix +++ b/nix/overlays/pin-emacs28.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: _: { unsafe-emacs28 = (import sources.pin-emacs28 {}).emacs; diff --git a/nix/overlays/pin-isabelle-2023.nix b/nix/overlays/pin-isabelle-2023.nix index 121e95c0..38a100c5 100644 --- a/nix/overlays/pin-isabelle-2023.nix +++ b/nix/overlays/pin-isabelle-2023.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: _: { # Isabelle version 2023 diff --git a/nix/overlays/pin-wireshark.nix b/nix/overlays/pin-wireshark.nix index f56c1258..dd9c800a 100644 --- a/nix/overlays/pin-wireshark.nix +++ b/nix/overlays/pin-wireshark.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: _: { # Wireshark bug diff --git a/nix/overlays/wallpapers.nix b/nix/overlays/wallpapers.nix index ed6018c9..0545f74e 100644 --- a/nix/overlays/wallpapers.nix +++ b/nix/overlays/wallpapers.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: _: { wallpapers = import sources.wallpapers {}; diff --git a/nix/overlays/wired-notify.nix b/nix/overlays/wired-notify.nix index 1d1a7081..2e158aa5 100644 --- a/nix/overlays/wired-notify.nix +++ b/nix/overlays/wired-notify.nix @@ -1,4 +1,4 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in (import sources.wired-notify).overlays.default diff --git a/nix/packages/default.nix b/nix/packages/default.nix index a56b9e65..62311f0f 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -1,4 +1,4 @@ -{sources ? import ../sources.nix}: let +{sources ? import ../../npins}: let scopeOverlay = overlay: final: prev: {export = prev.export or {} // overlay final prev;}; in ( diff --git a/nix/sources.nix b/nix/sources.nix deleted file mode 100644 index fa4ff0b5..00000000 --- a/nix/sources.nix +++ /dev/null @@ -1,2 +0,0 @@ -# Compatibility shim that redirects to npins -import ../npins diff --git a/shell.nix b/shell.nix index c8537eba..d7f54c4b 100644 --- a/shell.nix +++ b/shell.nix @@ -1,5 +1,5 @@ { - sources ? import ./nix/sources.nix, + sources ? import ./npins, pkgs ? import sources.nixpkgs { overlays = map import [ From fa41c23d3c9b2e9cd257f8c68d56d5034a3a44e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 08:50:41 +0200 Subject: [PATCH 32/57] nvim: vert split move to right --- .config/nvim/lua/maps.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index 348bff1e..cd9971e4 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -12,7 +12,8 @@ vim.keymap.set("v", "=", "=gv") vim.keymap.set("n", "", "zz") vim.keymap.set("n", "", "zz") vim.keymap.set("n", "gd", "gdzz") -vim.keymap.set("n", "gD", "wgd", { remap = true }) +vim.keymap.set("n", "v", "vw") +vim.keymap.set("n", "gD", "vgd", { remap = true }) vim.keymap.set("n", "``", "``zz") vim.keymap.set("n", "n", "nzzzv") vim.keymap.set("n", "N", "Nzzzv") From 661b6cbf4af242b7d41426d41ae1125dcc5e5af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 08:58:12 +0200 Subject: [PATCH 33/57] nvim: remove unused fugitive maps --- .config/nvim/lua/maps.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index cd9971e4..75dec7cb 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -74,9 +74,6 @@ vim.keymap.set("n", "gl", function() end) -- Fugitive -vim.keymap.set("n", "gP", function() vim.cmd("G push") end) -vim.keymap.set("n", "gp", function() vim.cmd("G pull") end) - vim.keymap.set("n", "", ":Git5") vim.keymap.set("n", "gu", ":diffget //2") vim.keymap.set("n", "gh", ":diffget //3") From 07443c7ce24bd6c01a4872afeddd66367faa2e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 09:19:40 +0200 Subject: [PATCH 34/57] nvim: update deprecated functions --- .config/nvim/lua/maps.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index 75dec7cb..021b3b92 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -46,8 +46,8 @@ vim.keymap.set("n", "Q", "") -- *do not* repeat the last recorded register -- Diagnostics vim.keymap.set("n", "e", vim.diagnostic.open_float) -vim.keymap.set("n", "pe", vim.diagnostic.goto_prev) -vim.keymap.set("n", "ne", vim.diagnostic.goto_next) +vim.keymap.set("n", "pe", function() vim.diagnostic.jump { count = -1, float = true } end) +vim.keymap.set("n", "ne", function() vim.diagnostic.jump { count = 1, float = true } end) vim.keymap.set("t", "", "") From 5c88497f0a878badecdd97fdcf7d8c92785f874e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 09:24:24 +0200 Subject: [PATCH 35/57] Revert "nvim: show virtualtext diagnostic" This reverts commit 96421307349498e5f286a28fa580f0e07ca27bc3. --- .config/nvim/after/plugin/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index a9db967e..d381e8c4 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -112,7 +112,7 @@ function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...) end -- Diagnostic display configuration -vim.diagnostic.config { virtual_text = true, severity_sort = true } +vim.diagnostic.config { virtual_text = false, severity_sort = true } -- Set log level vim.lsp.set_log_level("off") From d302e65303602a5b927877c175b5adf8c8bd0698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 10:10:57 +0200 Subject: [PATCH 36/57] nvim: rework telescope configuration --- .config/nvim/after/plugin/telescope.lua | 40 +++++++++++++++++-------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index 33e7bae2..75a5d3a5 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -1,9 +1,8 @@ -local ts = require("telescope") +local telescope = require("telescope") local actions = require("telescope.actions") local themes = require("telescope.themes") local config = require("telescope.config") local builtin = require("telescope.builtin") -local map = vim.keymap.set -- Clone the default Telescope configuration local vimgrep_arguments = { unpack(config.values.vimgrep_arguments) } @@ -12,31 +11,46 @@ table.insert(vimgrep_arguments, "--hidden") -- search hidden table.insert(vimgrep_arguments, "--glob") -- ignore git table.insert(vimgrep_arguments, "!**/.git/*") -ts.setup { - defaults = { +telescope.setup { + -- Workaround + -- https://github.com/nvim-telescope/telescope.nvim/issues/938#issuecomment-877539724 + defaults = themes.get_ivy { vimgrep_arguments = vimgrep_arguments, mappings = { i = { [""] = actions.close, }, }, + layout_config = { height = 0.4 }, + borderchars = { + "", + "", + "", + "│", + "", + "", + "", + "", + }, }, pickers = { find_files = { find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" }, }, + current_buffer_fuzzy_find = { + previewer = false, + }, }, } -- Enable telescope fzf native, if installed pcall(require("telescope").load_extension, "fzf") -map("n", "/", function() builtin.current_buffer_fuzzy_find(themes.get_dropdown { previewer = false }) end) -map("n", "sf", builtin.find_files) -map("n", "gf", builtin.git_files) -map("n", "?", builtin.help_tags) -map("n", "sw", builtin.grep_string) -map("n", "sg", builtin.live_grep) -map("n", "sd", builtin.diagnostics) -map("n", "b", builtin.buffers) -map("n", "sp", builtin.spell_suggest) +vim.keymap.set("n", "/", builtin["current_buffer_fuzzy_find"]) +vim.keymap.set("n", "/", builtin["find_files"]) +-- vim.keymap.set("n", "g/", builtin["git_files"]) +vim.keymap.set("n", "?", builtin["help_tags"]) +vim.keymap.set("n", "g/", builtin["live_grep"]) +vim.keymap.set("n", "d", builtin["diagnostics"]) +vim.keymap.set("n", "b", builtin["buffers"]) +vim.keymap.set("n", "sp", builtin["spell_suggest"]) From 1fd94e7979703d47c8132c45cc0c5df3bc73d0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 10:38:02 +0200 Subject: [PATCH 37/57] nvim: gq can quit anything fugitive actually --- .config/nvim/lua/maps.lua | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index 021b3b92..ea2cd05d 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -77,16 +77,8 @@ end) vim.keymap.set("n", "", ":Git5") vim.keymap.set("n", "gu", ":diffget //2") vim.keymap.set("n", "gh", ":diffget //3") -vim.api.nvim_create_autocmd("FileType", { - pattern = "fugitive", - callback = function() vim.keymap.set("n", "", ":q", { buffer = true }) end, -}) vim.keymap.set("n", "gb", ":Git blame") vim.keymap.set("n", "gB", ":Git blame --ignore-revs-file=.git-blame-ignore-revs") -vim.api.nvim_create_autocmd("FileType", { - pattern = "fugitiveblame", - callback = function() vim.keymap.set("n", "gb", ":q", { buffer = true }) end, -}) -- NoNeckPain vim.keymap.set("n", "z", ":NoNeckPain") From d308d2ada8f17017d24d1145bebdccf2b14faad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 11:36:29 +0200 Subject: [PATCH 38/57] nvim: fugitive toggle restore windows focus --- .config/nvim/lua/maps.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index ea2cd05d..23b0c8d0 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -80,6 +80,14 @@ vim.keymap.set("n", "gh", ":diffget //3") vim.keymap.set("n", "gb", ":Git blame") vim.keymap.set("n", "gB", ":Git blame --ignore-revs-file=.git-blame-ignore-revs") +vim.api.nvim_create_autocmd("WinClosed", { + group = vim.api.nvim_create_augroup("conf_fugitive_prevwin", {}), + callback = function(args) + local win = tonumber(args.match) + if win == vim.api.nvim_get_current_win() and vim.bo.filetype == "fugitive" then vim.cmd.wincmd("p") end + end, +}) + -- NoNeckPain vim.keymap.set("n", "z", ":NoNeckPain") From 418be1bc446fce6a5dd12158484487caf8d44525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 11:41:42 +0200 Subject: [PATCH 39/57] nvim: update no-neck-pain resolved fugitive issue with autocmd --- .config/nvim/lazy-lock.json | 4 ++-- .config/nvim/lua/_lazy.lua | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index bc70503e..0f645acd 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -16,8 +16,8 @@ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "leap.nvim": { "branch": "main", "commit": "10c14af4ddfb34dbd7721f0bfb2b4d91f0558907" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "ecc584150f5c8a2a82f2e1d43201df0f65c63d0e" }, - "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "0b6e82a6f1db9ff0b694df2a8e3bd3f7828a3958" }, + "nvim-autopairs": { "branch": "master", "commit": "2647cce4cb64fb35c212146663384e05ae126bdf" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" }, "nvim-dap": { "branch": "master", "commit": "40a8189b8a57664a1850b0823fdcb3ac95b9f635" }, diff --git a/.config/nvim/lua/_lazy.lua b/.config/nvim/lua/_lazy.lua index 11decf58..d6c5e2c5 100644 --- a/.config/nvim/lua/_lazy.lua +++ b/.config/nvim/lua/_lazy.lua @@ -62,11 +62,7 @@ local plugins = { -- Align buffer { "shortcuts/no-neck-pain.nvim", - -- Note: - -- later versions have this issue with fugitive: - -- toggling fugitive with no-neck-pain opened would focus the dummy buffer on left - -- dig deeper into this if needed - version = "1.14.1", + version = "^2", }, -- Gitsigns in gutter From ef46e0433c4ee7589cb6d8defa5d2f2a5a28daeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 13:58:00 +0200 Subject: [PATCH 40/57] nvim: restore telescope normal mode what do you mean you have no normal mode --- .config/nvim/after/plugin/telescope.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index 75a5d3a5..9fbec873 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -16,11 +16,6 @@ telescope.setup { -- https://github.com/nvim-telescope/telescope.nvim/issues/938#issuecomment-877539724 defaults = themes.get_ivy { vimgrep_arguments = vimgrep_arguments, - mappings = { - i = { - [""] = actions.close, - }, - }, layout_config = { height = 0.4 }, borderchars = { "", From 864c846663f6b49ae7e920dac9c64581d1ffb0e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 13:59:38 +0200 Subject: [PATCH 41/57] nvim: use to close telescope --- .config/nvim/after/plugin/telescope.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index 9fbec873..7640a625 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -16,6 +16,11 @@ telescope.setup { -- https://github.com/nvim-telescope/telescope.nvim/issues/938#issuecomment-877539724 defaults = themes.get_ivy { vimgrep_arguments = vimgrep_arguments, + mappings = { + n = { + [""] = actions.close, + }, + }, layout_config = { height = 0.4 }, borderchars = { "", From 6cc5014445595c56249e397b73418b6365ca5583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 14:08:12 +0200 Subject: [PATCH 42/57] nvim: increase telescope overlay size when searching in current buffer --- .config/nvim/after/plugin/telescope.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index 7640a625..0a7b38cf 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -38,7 +38,7 @@ telescope.setup { find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" }, }, current_buffer_fuzzy_find = { - previewer = false, + layout_config = { height = 0.8 }, }, }, } From 21ed72823f691edc292c97c3ed3fd0e400e719ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 14:11:32 +0200 Subject: [PATCH 43/57] nvim: :dodo: --- .config/nvim/after/plugin/telescope.lua | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index 0a7b38cf..3df9315d 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -22,16 +22,7 @@ telescope.setup { }, }, layout_config = { height = 0.4 }, - borderchars = { - "", - "", - "", - "│", - "", - "", - "", - "", - }, + borderchars = { "", "", "", "│", "", "", "", "" }, }, pickers = { find_files = { From 927f6bc4efaa6d2812e26b10fc6d3a23b237ef70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 19:56:18 +0200 Subject: [PATCH 44/57] nvim: disable inlay hint request for cabal --- .config/nvim/after/plugin/lsp.lua | 41 ++++++++++++++++++------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index d381e8c4..80b9b922 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -1,4 +1,5 @@ local map = vim.keymap.set +local methods = vim.lsp.protocol.Methods ---------------------- -- Language servers -- @@ -75,22 +76,31 @@ local servers = { ------------- -- Helpers -- ------------- -local on_attach = function(client, bufno) - vim.api.nvim_set_option_value("omnifunc", "v:lua.vim.lsp.omnifunc", { buf = bufno }) - local ts = require("telescope.builtin") - local opts = { buffer = bufno } +local on_attach = function(client, bufnr) + vim.api.nvim_set_option_value("omnifunc", "v:lua.vim.lsp.omnifunc", { buf = bufnr }) + local telescope = require("telescope.builtin") - map("n", "K", vim.lsp.buf.hover, opts) - map("n", "", vim.lsp.buf.signature_help, opts) - map("n", "gd", vim.lsp.buf.definition, opts) + map("n", "K", vim.lsp.buf.hover, { buffer = bufnr }) + map("n", "", vim.lsp.buf.signature_help, { buffer = bufnr }) + map("n", "gd", vim.lsp.buf.definition, { buffer = bufnr }) -- conflicts with tabs - -- map("n", "gtd", vim.lsp.buf.type_definition, opts) - map("n", "gi", vim.lsp.buf.implementation, opts) - map("n", "gu", ts.lsp_references, opts) - map("n", "ca", vim.lsp.buf.code_action, opts) - map("n", "cl", vim.lsp.codelens.run, opts) - map("n", "r", vim.lsp.buf.rename, opts) - map("n", "f", function() vim.lsp.buf.format { async = true } end, opts) + -- map("n", "gtd", vim.lsp.buf.type_definition, { buffer = bufnr }) + map("n", "gi", vim.lsp.buf.implementation, { buffer = bufnr }) + map("n", "gu", telescope.lsp_references, { buffer = bufnr }) + map("n", "ca", vim.lsp.buf.code_action, { buffer = bufnr }) + map("n", "cl", vim.lsp.codelens.run, { buffer = bufnr }) + map("n", "r", vim.lsp.buf.rename, { buffer = bufnr }) + map("n", "f", function() vim.lsp.buf.format { async = true } end, { buffer = bufnr }) + + local filetype = vim.api.nvim_get_option_value("filetype", { buf = bufnr }) + if + client:supports_method(methods.textDocument_inlayHint) + -- Never start cabal with inlay hint request + -- Related: https://github.com/mrcjkb/haskell-tools.nvim/discussions/485 + and filetype ~= "cabal" + then + vim.lsp.inlay_hint.enable(true, { bufnr = bufnr }) + end end -- Helix style border @@ -117,9 +127,6 @@ vim.diagnostic.config { virtual_text = false, severity_sort = true } -- Set log level vim.lsp.set_log_level("off") --- Enable inlay hints -vim.lsp.inlay_hint.enable() - -- Gutter symbols setup vim.fn.sign_define("DiagnosticSignError", { text = "E", texthl = "DiagnosticSignError", numhl = "DiagnosticSignError" }) vim.fn.sign_define("DiagnosticSignWarn", { text = "W", texthl = "DiagnosticSignWarn", numhl = "DiagnosticSignWarn" }) From 33a7a415ccc2569ff93f43d1c5c67fc27d923598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 20:18:45 +0200 Subject: [PATCH 45/57] nvim: add telescope bindings to navigate in history --- .config/nvim/after/plugin/telescope.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index 3df9315d..e065db53 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -20,6 +20,10 @@ telescope.setup { n = { [""] = actions.close, }, + i = { + [""] = actions.cycle_history_prev, + [""] = actions.cycle_history_next, + }, }, layout_config = { height = 0.4 }, borderchars = { "", "", "", "│", "", "", "", "" }, From 482506fcd2e40ae9da25588ceb04a4405323b371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 10:13:20 +0200 Subject: [PATCH 46/57] nixos/firefox: only use en-US locale --- nix/configurations/vanadium/home/firefox.nix | 2 -- nix/homeModules/common/firefox.nix | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/configurations/vanadium/home/firefox.nix b/nix/configurations/vanadium/home/firefox.nix index 0aeba9f8..30f4ab5d 100644 --- a/nix/configurations/vanadium/home/firefox.nix +++ b/nix/configurations/vanadium/home/firefox.nix @@ -10,8 +10,6 @@ in { enable = true; policies = { - RequestedLocales = ["fr" "en-US" "zh-TW"]; - SearchEngines = { Default = "Google en@en"; Remove = ["Google"]; diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index f6936818..5351a046 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -5,6 +5,9 @@ in { # https://mozilla.github.io/policy-templates # The following have more complex logic, keep them as policies and not profiles policies = { + # Trans lations are of poor quality anyways + RequestedLocales = ["en-US"]; + SearchEngines = { Remove = ["Bing" "DuckDuckGo" "Qwant" "eBay"]; }; From 6c05614f18eb2687f6791726386652562b431ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 10:48:44 +0200 Subject: [PATCH 47/57] nvim/telescope: disable unused binding --- .config/nvim/after/plugin/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index 80b9b922..11ca0425 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -85,7 +85,7 @@ local on_attach = function(client, bufnr) map("n", "gd", vim.lsp.buf.definition, { buffer = bufnr }) -- conflicts with tabs -- map("n", "gtd", vim.lsp.buf.type_definition, { buffer = bufnr }) - map("n", "gi", vim.lsp.buf.implementation, { buffer = bufnr }) + -- map("n", "gi", vim.lsp.buf.implementation, { buffer = bufnr }) map("n", "gu", telescope.lsp_references, { buffer = bufnr }) map("n", "ca", vim.lsp.buf.code_action, { buffer = bufnr }) map("n", "cl", vim.lsp.codelens.run, { buffer = bufnr }) From e4fa75f0c33fdffa8ca56107ddd3869d59a82898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 10:28:26 +0200 Subject: [PATCH 48/57] nvim: make search remember last query and easy replacement of / and ? --- .config/nvim/after/plugin/telescope.lua | 33 ++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index e065db53..a29c77aa 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -3,6 +3,7 @@ local actions = require("telescope.actions") local themes = require("telescope.themes") local config = require("telescope.config") local builtin = require("telescope.builtin") +local state = require("telescope.state") -- Clone the default Telescope configuration local vimgrep_arguments = { unpack(config.values.vimgrep_arguments) } @@ -21,8 +22,8 @@ telescope.setup { [""] = actions.close, }, i = { - [""] = actions.cycle_history_prev, - [""] = actions.cycle_history_next, + [""] = actions.cycle_history_prev, + [""] = actions.cycle_history_next, }, }, layout_config = { height = 0.4 }, @@ -35,13 +36,39 @@ telescope.setup { current_buffer_fuzzy_find = { layout_config = { height = 0.8 }, }, + lsp_references = { + layout_config = { height = 0.8 }, + }, + live_grep = { + layout_config = { height = 0.8 }, + }, + resume = { + initial_mode = "normal", + }, }, } -- Enable telescope fzf native, if installed pcall(require("telescope").load_extension, "fzf") -vim.keymap.set("n", "/", builtin["current_buffer_fuzzy_find"]) +-- Waiting for better state management upstream +-- Currently we have to wire the state ourselves +local buffer_picker = nil +local init_buffer_picker = function() + builtin["current_buffer_fuzzy_find"]() + local cached_pickers = state.get_global_key("cached_pickers") or {} + buffer_picker = cached_pickers[1] +end +local cached_buffer_picker = function() + if buffer_picker == nil then + init_buffer_picker() + else + builtin.resume { picker = buffer_picker } + end +end +vim.keymap.set("n", "/", init_buffer_picker) +vim.keymap.set("n", "?", cached_buffer_picker) + vim.keymap.set("n", "/", builtin["find_files"]) -- vim.keymap.set("n", "g/", builtin["git_files"]) vim.keymap.set("n", "?", builtin["help_tags"]) From 79ccdb1263e9a084a0196ccb99d3ebf3ccf84d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 10:58:36 +0200 Subject: [PATCH 49/57] nvim: use telescope for go to definition --- .config/nvim/after/plugin/lsp.lua | 2 +- .config/nvim/after/plugin/telescope.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index 11ca0425..44796a73 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -82,7 +82,7 @@ local on_attach = function(client, bufnr) map("n", "K", vim.lsp.buf.hover, { buffer = bufnr }) map("n", "", vim.lsp.buf.signature_help, { buffer = bufnr }) - map("n", "gd", vim.lsp.buf.definition, { buffer = bufnr }) + map("n", "gd", telescope.lsp_definitions, { buffer = bufnr }) -- conflicts with tabs -- map("n", "gtd", vim.lsp.buf.type_definition, { buffer = bufnr }) -- map("n", "gi", vim.lsp.buf.implementation, { buffer = bufnr }) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index a29c77aa..8994860f 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -38,6 +38,7 @@ telescope.setup { }, lsp_references = { layout_config = { height = 0.8 }, + initial_mode = "normal", }, live_grep = { layout_config = { height = 0.8 }, From cb89de4049ae08e4154ffe2cdb0dfc8a84a23a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 11:02:03 +0200 Subject: [PATCH 50/57] nvim: split to the right and below --- .config/nvim/lua/maps.lua | 1 - .config/nvim/lua/opts.lua | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index 23b0c8d0..06360af9 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -12,7 +12,6 @@ vim.keymap.set("v", "=", "=gv") vim.keymap.set("n", "", "zz") vim.keymap.set("n", "", "zz") vim.keymap.set("n", "gd", "gdzz") -vim.keymap.set("n", "v", "vw") vim.keymap.set("n", "gD", "vgd", { remap = true }) vim.keymap.set("n", "``", "``zz") vim.keymap.set("n", "n", "nzzzv") diff --git a/.config/nvim/lua/opts.lua b/.config/nvim/lua/opts.lua index 75c66ac7..dc89050d 100644 --- a/.config/nvim/lua/opts.lua +++ b/.config/nvim/lua/opts.lua @@ -31,3 +31,6 @@ vim.o.showmode = false vim.opt.listchars = { tab = "│ ", trail = "␣" } vim.o.list = true + +vim.o.splitright = true +vim.o.splitbelow = true From d3ced57f14a7c89360c539e456d4f072156e76ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 11:08:46 +0200 Subject: [PATCH 51/57] vanadium/xmonad: no show cursor in maim --- nix/configurations/vanadium/home/xmonad/xmonad.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index 3fa42236..44994725 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -186,9 +186,9 @@ main = xmonad -- Screenshots ++ (let - fullscreen = "maim | xclip -in -selection clipboard -t image/png" - withSelection = "maim -s -b 5 -o | xclip -in -selection clipboard -t image/png" - toFloat = "maim -s -b 5 -o | feh --auto-zoom -" + fullscreen = "maim -u | xclip -in -selection clipboard -t image/png" + withSelection = "maim -u -s -b 5 -o | xclip -in -selection clipboard -t image/png" + toFloat = "maim -u -s -b 5 -o | feh --auto-zoom -" in [ ((0, xK_Print), spawn fullscreen ) , ((superMask .|. shiftMask, xK_3 ), spawn fullscreen ) From 04e5d28fca38a072b1cb93af97e971ce2a4e80a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 15:04:13 +0200 Subject: [PATCH 52/57] firefox: disable AI crap --- nix/homeModules/common/firefox.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index 5351a046..81e7b1bf 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -64,6 +64,9 @@ in { # Onboarding "browser.aboutwelcome.enabled" = false; + + # AI crap + "browser.ml.chat.enabled" = false; }; extensions.packages = let From 2b593274a169f101fff0cf5f95c9a431b171a8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 15:23:05 +0200 Subject: [PATCH 53/57] nvim/oil: document why default_file_explorer is disabled --- .config/nvim/after/plugin/oil.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/nvim/after/plugin/oil.lua b/.config/nvim/after/plugin/oil.lua index e75dded1..6acccbe1 100644 --- a/.config/nvim/after/plugin/oil.lua +++ b/.config/nvim/after/plugin/oil.lua @@ -1,4 +1,6 @@ require("oil").setup { + -- This bug would prevent downloading language files from working + -- https://github.com/stevearc/oil.nvim/issues/483 default_file_explorer = false, columns = { -- "icon", From 8000d569c71f60bace71d4d30809c4877d83e3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 16:43:25 +0200 Subject: [PATCH 54/57] vanadium/xmobar: refresh faster --- nix/configurations/vanadium/home/xmobar.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index 0d660ace..d819da60 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -23,7 +23,8 @@ , "-P" , "-A", "20" , "-a", "notify-send -u critical \"Battery Low\" \"Please charge your battery\"" - ] 600 + ] + 600 , Run XMonadLog , Run DynNetwork @@ -49,7 +50,7 @@ , "--high", "orange" , "--low", "blue" ] - 18000 + 9000 ] , sepChar = "%" , alignSep = "}{" From 363a8f403699be50036b37fa2c6b854910bccbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 17:36:33 +0200 Subject: [PATCH 55/57] shell: use nix-shell args to call This makes the different shell options easier to compose with --- shell.nix | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/shell.nix b/shell.nix index d7f54c4b..019d92c8 100644 --- a/shell.nix +++ b/shell.nix @@ -7,27 +7,24 @@ ./nix/packages/overlay.nix ]; }, -}: rec { - default = pkgs.mkShell { - packages = with pkgs; [ - just - jq - npins - disko - ]; - }; - - withXMonad = pkgs.mkShell { - inputsFrom = [ - default - ]; - packages = with pkgs; [ - (haskellPackages.ghcWithPackages (self: [ - self.xmonad-contrib - self.xmonad-extras - ])) - haskell-language-server - cabal-install - ]; - }; -} + withXMonad ? false, +}: let + inherit (pkgs) lib; +in + pkgs.mkShell { + packages = with pkgs; + [ + just + jq + npins + disko + ] + ++ lib.optionals withXMonad [ + (haskellPackages.ghcWithPackages (self: [ + self.xmonad-contrib + self.xmonad-extras + ])) + haskell-language-server + cabal-install + ]; + } From 626fa2d8ec21295941ec32692fe7b048591e728d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 17:39:36 +0200 Subject: [PATCH 56/57] README: correct disko command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80b8dcf1..be05b562 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This repo is managed with Nix + GNU stow - Installation (iirc the disko auto install has some issues) ```bash # Are you sure the disko config has the right drive path? - disko -- -m disko ./disko.nix # format the drive + disko -m disko ./disko.nix # format the drive # optional for unknown hard ware nixos-generate-config --no-filesystems --root /mnt --dir . # disko will take care of the file system configuration From 14d5284ecf3186995c09420f82abfb97ad9e9c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 4 Jul 2025 18:09:18 +0200 Subject: [PATCH 57/57] Revert "nvim: update no-neck-pain" This reverts commit 418be1bc446fce6a5dd12158484487caf8d44525. --- .config/nvim/lazy-lock.json | 4 ++-- .config/nvim/lua/_lazy.lua | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 0f645acd..bc70503e 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -16,8 +16,8 @@ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "leap.nvim": { "branch": "main", "commit": "10c14af4ddfb34dbd7721f0bfb2b4d91f0558907" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "0b6e82a6f1db9ff0b694df2a8e3bd3f7828a3958" }, - "nvim-autopairs": { "branch": "master", "commit": "2647cce4cb64fb35c212146663384e05ae126bdf" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "ecc584150f5c8a2a82f2e1d43201df0f65c63d0e" }, + "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" }, "nvim-dap": { "branch": "master", "commit": "40a8189b8a57664a1850b0823fdcb3ac95b9f635" }, diff --git a/.config/nvim/lua/_lazy.lua b/.config/nvim/lua/_lazy.lua index d6c5e2c5..11decf58 100644 --- a/.config/nvim/lua/_lazy.lua +++ b/.config/nvim/lua/_lazy.lua @@ -62,7 +62,11 @@ local plugins = { -- Align buffer { "shortcuts/no-neck-pain.nvim", - version = "^2", + -- Note: + -- later versions have this issue with fugitive: + -- toggling fugitive with no-neck-pain opened would focus the dummy buffer on left + -- dig deeper into this if needed + version = "1.14.1", }, -- Gitsigns in gutter