From 831b3fd9246ff40acb073ffb71982850451d6766 Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 1 Aug 2026 12:52:34 +0200 Subject: [PATCH 1/3] split nixvim config into multiple files --- nixos/configuration.nix | 1 - nixos/nixvim/plugins.nix | 95 ----------------------------- nixos/nixvim/plugins/barbar.nix | 10 +++ nixos/nixvim/plugins/cord.nix | 13 ++++ nixos/nixvim/plugins/lualine.nix | 57 +++++++++++++++++ nixos/nixvim/plugins/plugins.nix | 17 ++++++ nixos/nixvim/plugins/toggleterm.nix | 9 +++ 7 files changed, 106 insertions(+), 96 deletions(-) delete mode 100644 nixos/nixvim/plugins.nix create mode 100644 nixos/nixvim/plugins/barbar.nix create mode 100644 nixos/nixvim/plugins/cord.nix create mode 100644 nixos/nixvim/plugins/lualine.nix create mode 100644 nixos/nixvim/plugins/plugins.nix create mode 100644 nixos/nixvim/plugins/toggleterm.nix diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 77d4914..27ff815 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -16,7 +16,6 @@ ./services/pipewire.nix ./services/ly.nix ./stylix/stylix.nix - ./easyroam.nix ]; boot.loader.systemd-boot = { diff --git a/nixos/nixvim/plugins.nix b/nixos/nixvim/plugins.nix deleted file mode 100644 index 1c9ecc0..0000000 --- a/nixos/nixvim/plugins.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ - programs.nixvim = { - plugins = { - lspconfig.enable = true; - web-devicons.enable = true; - blink-cmp = { - enable = true; - }; - blink-indent = { - enable = true; - }; - toggleterm = { - enable = true; - settings = { - size = 30; - direction = "horizontal"; - }; - }; - cord = { - enable = true; - settings = { - display = { - theme = "atom"; - }; - editor = { - tooltip = "ur gay :3"; - }; - }; - }; - barbar = { - enable = true; - settings = { - icons = { - buffer_index = true; - }; - }; - }; - lualine = { - enable = true; - settings = { - extensions = [ "toggleterm" ]; - options = { - section_separators = { - left = "▎"; - right = "▕"; - }; - component_separators = { - left = ""; - right = ""; - }; - }; - inactive_sections = { - lualine_a = [ - "mode" - ]; - lualine_b = [ - "filename" - "filetype" - ]; - lualine_c = [ - "diagnostics" - ]; - lualine_x = [ - "lsp_status" - ]; - lualine_y = [ ]; - lualine_z = [ - "location" - ]; - }; - sections = { - lualine_a = [ - "mode" - ]; - lualine_b = [ - "filename" - "filetype" - ]; - lualine_c = [ - "diagnostics" - ]; - lualine_x = [ - "lsp_status" - ]; - lualine_y = [ ]; - lualine_z = [ - "location" - ]; - }; - }; - }; - }; - }; - -} diff --git a/nixos/nixvim/plugins/barbar.nix b/nixos/nixvim/plugins/barbar.nix new file mode 100644 index 0000000..3564c1e --- /dev/null +++ b/nixos/nixvim/plugins/barbar.nix @@ -0,0 +1,10 @@ +{ + barbar = { + enable = true; + settings = { + icons = { + buffer_index = true; + }; + }; + }; +} diff --git a/nixos/nixvim/plugins/cord.nix b/nixos/nixvim/plugins/cord.nix new file mode 100644 index 0000000..5db3fec --- /dev/null +++ b/nixos/nixvim/plugins/cord.nix @@ -0,0 +1,13 @@ +{ + cord = { + enable = true; + settings = { + display = { + theme = "atom"; + }; + editor = { + tooltip = "ur gay :3"; + }; + }; + }; +} diff --git a/nixos/nixvim/plugins/lualine.nix b/nixos/nixvim/plugins/lualine.nix new file mode 100644 index 0000000..250e78c --- /dev/null +++ b/nixos/nixvim/plugins/lualine.nix @@ -0,0 +1,57 @@ +{ + lualine = { + enable = true; + settings = { + extensions = [ "toggleterm" ]; + options = { + section_separators = { + left = "▎"; + right = "▕"; + }; + component_separators = { + left = ""; + right = ""; + }; + }; + inactive_sections = { + lualine_a = [ + "mode" + ]; + lualine_b = [ + "filename" + "filetype" + ]; + lualine_c = [ + "diagnostics" + ]; + lualine_x = [ + "lsp_status" + ]; + lualine_y = [ ]; + lualine_z = [ + "location" + ]; + }; + sections = { + lualine_a = [ + "mode" + ]; + lualine_b = [ + "filename" + "filetype" + ]; + lualine_c = [ + "diagnostics" + ]; + lualine_x = [ + "lsp_status" + ]; + lualine_y = [ ]; + lualine_z = [ + "location" + ]; + }; + }; + }; + +} diff --git a/nixos/nixvim/plugins/plugins.nix b/nixos/nixvim/plugins/plugins.nix new file mode 100644 index 0000000..3b32bd3 --- /dev/null +++ b/nixos/nixvim/plugins/plugins.nix @@ -0,0 +1,17 @@ +{ + programs.nixvim = { + plugins = { + imports = [ + ./barbar.nix + ./cord.nix + ./lualine.nix + ./toggleterm.nix + ]; + lspconfig.enable = true; + web-devicons.enable = true; + blink-cmp.enable = true; + blink-indent.enable = true; + }; + }; + +} diff --git a/nixos/nixvim/plugins/toggleterm.nix b/nixos/nixvim/plugins/toggleterm.nix new file mode 100644 index 0000000..67ad763 --- /dev/null +++ b/nixos/nixvim/plugins/toggleterm.nix @@ -0,0 +1,9 @@ +{ + toggleterm = { + enable = true; + settings = { + size = 30; + direction = "horizontal"; + }; + }; +} From bec1101a965af2b9611d67dc14c03c971ae4a7d4 Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 1 Aug 2026 12:57:39 +0200 Subject: [PATCH 2/3] add telescope --- nixos/nixvim/nixvim.nix | 2 +- nixos/nixvim/plugins/barbar.nix | 2 +- nixos/nixvim/plugins/cord.nix | 2 +- nixos/nixvim/plugins/lualine.nix | 2 +- nixos/nixvim/plugins/plugins.nix | 13 +++++++------ nixos/nixvim/plugins/telescope.nix | 10 ++++++++++ nixos/nixvim/plugins/toggleterm.nix | 2 +- 7 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 nixos/nixvim/plugins/telescope.nix diff --git a/nixos/nixvim/nixvim.nix b/nixos/nixvim/nixvim.nix index 4d5ea02..c0a008f 100644 --- a/nixos/nixvim/nixvim.nix +++ b/nixos/nixvim/nixvim.nix @@ -7,7 +7,7 @@ }: { imports = [ - ./plugins.nix + ./plugins/plugins.nix ./keymaps.nix ]; programs.nixvim = { diff --git a/nixos/nixvim/plugins/barbar.nix b/nixos/nixvim/plugins/barbar.nix index 3564c1e..f15d275 100644 --- a/nixos/nixvim/plugins/barbar.nix +++ b/nixos/nixvim/plugins/barbar.nix @@ -1,5 +1,5 @@ { - barbar = { + programs.nixvim.plugins.barbar = { enable = true; settings = { icons = { diff --git a/nixos/nixvim/plugins/cord.nix b/nixos/nixvim/plugins/cord.nix index 5db3fec..3fbb654 100644 --- a/nixos/nixvim/plugins/cord.nix +++ b/nixos/nixvim/plugins/cord.nix @@ -1,5 +1,5 @@ { - cord = { + programs.nixvim.plugins.cord = { enable = true; settings = { display = { diff --git a/nixos/nixvim/plugins/lualine.nix b/nixos/nixvim/plugins/lualine.nix index 250e78c..f0da28c 100644 --- a/nixos/nixvim/plugins/lualine.nix +++ b/nixos/nixvim/plugins/lualine.nix @@ -1,5 +1,5 @@ { - lualine = { + programs.nixvim.plugins.lualine = { enable = true; settings = { extensions = [ "toggleterm" ]; diff --git a/nixos/nixvim/plugins/plugins.nix b/nixos/nixvim/plugins/plugins.nix index 3b32bd3..5b4acda 100644 --- a/nixos/nixvim/plugins/plugins.nix +++ b/nixos/nixvim/plugins/plugins.nix @@ -1,12 +1,13 @@ { + imports = [ + ./barbar.nix + ./toggleterm.nix + ./cord.nix + ./lualine.nix + ./telescope.nix + ]; programs.nixvim = { plugins = { - imports = [ - ./barbar.nix - ./cord.nix - ./lualine.nix - ./toggleterm.nix - ]; lspconfig.enable = true; web-devicons.enable = true; blink-cmp.enable = true; diff --git a/nixos/nixvim/plugins/telescope.nix b/nixos/nixvim/plugins/telescope.nix new file mode 100644 index 0000000..ecbc511 --- /dev/null +++ b/nixos/nixvim/plugins/telescope.nix @@ -0,0 +1,10 @@ +{ + programs.nixvim.plugins.telescope = { + enable = true; + keymaps = { + "ff" = { + action = "find_files"; + }; + }; + }; +} diff --git a/nixos/nixvim/plugins/toggleterm.nix b/nixos/nixvim/plugins/toggleterm.nix index 67ad763..ff61280 100644 --- a/nixos/nixvim/plugins/toggleterm.nix +++ b/nixos/nixvim/plugins/toggleterm.nix @@ -1,5 +1,5 @@ { - toggleterm = { + programs.nixvim.plugins.toggleterm = { enable = true; settings = { size = 30; From 854a261636cf855a3ae5ef9cff6b7f5275a63583 Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 1 Aug 2026 12:59:57 +0200 Subject: [PATCH 3/3] add telescope keybinds --- nixos/nixvim/plugins/telescope.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/nixvim/plugins/telescope.nix b/nixos/nixvim/plugins/telescope.nix index ecbc511..148022b 100644 --- a/nixos/nixvim/plugins/telescope.nix +++ b/nixos/nixvim/plugins/telescope.nix @@ -5,6 +5,9 @@ "ff" = { action = "find_files"; }; + "lg" = { + action = "live_grep"; + }; }; }; }