From e7ed1720481c198bbcbd514cd28946c13a903d6a Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 11 Aug 2026 21:57:31 +0200 Subject: [PATCH 1/2] update flake lockfile --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index c946737..80d6198 100644 --- a/flake.lock +++ b/flake.lock @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1785958398, - "narHash": "sha256-5r/JgsoNMTx+qIh83WkxpujEKBR7PF5ssnh5vYCuSAw=", + "lastModified": 1786356609, + "narHash": "sha256-ou8fYz5w9yhXC8YbvvExybFIa19MyW5G/8dEPqa90hM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7c70cc290290f373f50cd820403833d250459ac", + "rev": "c30c7955cec30d664a9baced6bc0112e263d4647", "type": "github" }, "original": { @@ -306,11 +306,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1786013188, - "narHash": "sha256-zFsOHFtWozMWlH62CTUwBdKdTNN+esUGIyluRcitTQY=", + "lastModified": 1786424471, + "narHash": "sha256-vPUheEwncdu+w613Higt3O+359CSfliCdAFCPKzTWuQ=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "61ae857286c8f3c63bd3b20492e0f87d78bcead2", + "rev": "c0c689edb0b36eb36e2b6349548b18daafd6a034", "type": "github" }, "original": { @@ -321,11 +321,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785747939, - "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=", + "lastModified": 1786348146, + "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=", "owner": "nixos", "repo": "nixpkgs", - "rev": "104240a772428cc2e20d8fd86c9ddbb886bbaff2", + "rev": "d482ef84049d9b7276b83a06e4e4d76983830097", "type": "github" }, "original": { @@ -375,11 +375,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1785763201, - "narHash": "sha256-wA373y/B9orM3HatLu9oS+Ke5lmdZyBl/bdjd2gLMq4=", + "lastModified": 1786376793, + "narHash": "sha256-57PySMBzfIOqHYfBQhDMIFy9CHMpRArhK9gWHZsp3/g=", "owner": "nix-community", "repo": "nixvim", - "rev": "c7be49306b23a952c0151cf4bbeacd944ed82f2a", + "rev": "902dd3995bd830f824ca146796743e3baf587d4c", "type": "github" }, "original": { @@ -477,11 +477,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1785652745, - "narHash": "sha256-pD0VE/XwjQ3tLyxTzXKdm6JuIEWr/Jaote6xpXGZrXk=", + "lastModified": 1786252193, + "narHash": "sha256-a9SbkJWloPso00G4zIUkerd9n2qRyDYoDPeUc4O3ME8=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "802040514e09bb8539237f52f68cf053b987c65e", + "rev": "a87616995724d27079b495ca07318512af799449", "type": "github" }, "original": { @@ -510,11 +510,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1785794750, - "narHash": "sha256-OqIrGVL7AX462ISyJFAqjbqTc1RZlBkVHCa4dwPEZU4=", + "lastModified": 1786382682, + "narHash": "sha256-rWN1IYcqZD+rNA7PuNcMctjZgEzp83iPboeVVvgUHBM=", "owner": "nix-community", "repo": "stylix", - "rev": "cb5eb3a7343faba61fd694fac8040a326485a339", + "rev": "4e328a8a98eceeb25ee19c88b36b355b400a7f68", "type": "github" }, "original": { From 3f9dbf1713eba25b0c95542673efa1ae25634acc Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 12 Aug 2026 14:33:31 +0200 Subject: [PATCH 2/2] remove toggleterm and add keybinds for split navigation --- nixos/nixvim/keymaps.nix | 28 ++++++++++++++++++++++++++-- nixos/nixvim/nixvim.nix | 2 ++ nixos/nixvim/plugins/plugins.nix | 1 - 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/nixos/nixvim/keymaps.nix b/nixos/nixvim/keymaps.nix index 02917ae..48b9818 100644 --- a/nixos/nixvim/keymaps.nix +++ b/nixos/nixvim/keymaps.nix @@ -6,8 +6,16 @@ action = " lua vim.lsp.buf.format() "; } { - key = ""; - action = "ToggleTerm size=10 direction=horizontal"; + key = "j"; + action = " split "; + } + { + key = "l"; + action = " vsplit "; + } + { + key = "t"; + action = "terminal"; } { key = "tf"; @@ -38,6 +46,22 @@ key = ""; action = "h"; } + { + key = ""; + action = ">"; + } + { + key = ""; + action = "+"; + } + { + key = ""; + action = "-"; + } + { + key = ""; + action = "<"; + } ]; }; } diff --git a/nixos/nixvim/nixvim.nix b/nixos/nixvim/nixvim.nix index b3c38eb..29940e3 100644 --- a/nixos/nixvim/nixvim.nix +++ b/nixos/nixvim/nixvim.nix @@ -25,6 +25,8 @@ shiftwidth = 8; expandtab = true; swapfile = false; + splitright = true; + splitbelow = true; }; extraPackages = with pkgs; [ nixfmt diff --git a/nixos/nixvim/plugins/plugins.nix b/nixos/nixvim/plugins/plugins.nix index 392ef6f..23d0ee6 100644 --- a/nixos/nixvim/plugins/plugins.nix +++ b/nixos/nixvim/plugins/plugins.nix @@ -1,7 +1,6 @@ { imports = [ ./barbar.nix - ./toggleterm.nix ./cord.nix ./telescope.nix ./statusline.nix