From 608bf58ff8490ac33f518c121589dfe86280710d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 01:45:40 +0300 Subject: [PATCH 1/3] move plugins folder --- {plugins => config/plugins}/blink-cmp.nix | 0 {plugins => config/plugins}/cmp.nix | 0 {plugins => config/plugins}/comment.nix | 0 {plugins => config/plugins}/default.nix | 0 {plugins => config/plugins}/gitsigns.nix | 0 {plugins => config/plugins}/lsp.nix | 0 {plugins => config/plugins}/mini.nix | 0 {plugins => config/plugins}/oil.nix | 0 {plugins => config/plugins}/treesitter.nix | 0 {plugins => config/plugins}/which-key.nix | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {plugins => config/plugins}/blink-cmp.nix (100%) rename {plugins => config/plugins}/cmp.nix (100%) rename {plugins => config/plugins}/comment.nix (100%) rename {plugins => config/plugins}/default.nix (100%) rename {plugins => config/plugins}/gitsigns.nix (100%) rename {plugins => config/plugins}/lsp.nix (100%) rename {plugins => config/plugins}/mini.nix (100%) rename {plugins => config/plugins}/oil.nix (100%) rename {plugins => config/plugins}/treesitter.nix (100%) rename {plugins => config/plugins}/which-key.nix (100%) diff --git a/plugins/blink-cmp.nix b/config/plugins/blink-cmp.nix similarity index 100% rename from plugins/blink-cmp.nix rename to config/plugins/blink-cmp.nix diff --git a/plugins/cmp.nix b/config/plugins/cmp.nix similarity index 100% rename from plugins/cmp.nix rename to config/plugins/cmp.nix diff --git a/plugins/comment.nix b/config/plugins/comment.nix similarity index 100% rename from plugins/comment.nix rename to config/plugins/comment.nix diff --git a/plugins/default.nix b/config/plugins/default.nix similarity index 100% rename from plugins/default.nix rename to config/plugins/default.nix diff --git a/plugins/gitsigns.nix b/config/plugins/gitsigns.nix similarity index 100% rename from plugins/gitsigns.nix rename to config/plugins/gitsigns.nix diff --git a/plugins/lsp.nix b/config/plugins/lsp.nix similarity index 100% rename from plugins/lsp.nix rename to config/plugins/lsp.nix diff --git a/plugins/mini.nix b/config/plugins/mini.nix similarity index 100% rename from plugins/mini.nix rename to config/plugins/mini.nix diff --git a/plugins/oil.nix b/config/plugins/oil.nix similarity index 100% rename from plugins/oil.nix rename to config/plugins/oil.nix diff --git a/plugins/treesitter.nix b/config/plugins/treesitter.nix similarity index 100% rename from plugins/treesitter.nix rename to config/plugins/treesitter.nix diff --git a/plugins/which-key.nix b/config/plugins/which-key.nix similarity index 100% rename from plugins/which-key.nix rename to config/plugins/which-key.nix -- 2.51.0 From 9870cb1236c095c0578a3b82d42711d59a4d01db Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 01:47:32 +0300 Subject: [PATCH 2/3] move default.nix --- config/default.nix | 66 +++++++++++++++++++++++++++++++++++++++++----- default.nix | 60 ----------------------------------------- flake.nix | 4 +-- 3 files changed, 61 insertions(+), 69 deletions(-) delete mode 100644 default.nix diff --git a/config/default.nix b/config/default.nix index c8b1cd7..b3b896b 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,6 +1,60 @@ -{lib, ...}: let - definitions = lib.attrNames (lib.filterAttrs (filename: kind: - filename != "default.nix" && (kind == "regular" || kind == "directory")) - (builtins.readDir ./.)); -in - lib.mkMerge (map (file: import ./${file}) definitions) +{pkgs, ...}: { + imports = [./config ./plugins]; + + config = { + # Use as leader key + globals.mapleader = " "; + globals.maplocalleader = " "; + + # Set 'vi' and 'vim' aliases to nixvim + viAlias = true; + vimAlias = true; + + # Setup clipboard support + clipboard = { + # Use xsel as clipboard provider + # providers.xsel.enable = true; + + # Sync system clipboard + register = "unnamedplus"; + }; + extraPackages = with pkgs; [ + nix-inspect + nixd + git + git-lfs + cloc + ripgrep + lazygit + black + fd + ripgrep + ]; + + keymaps = [ + { + mode = "n"; + key = "gg"; + action = "LazyGit"; + options = { + desc = "LazyGit (root dir)"; + }; + } + ]; +extraPlugins = with pkgs.vimPlugins; [ + lazygit-nvim + ]; + + extraConfigLua = '' + require("telescope").load_extension("lazygit") + ''; + performance = { + byteCompileLua = { + enable = true; + nvimRuntime = true; + configs = true; + plugins = true; + }; + }; + }; +} diff --git a/default.nix b/default.nix deleted file mode 100644 index b3b896b..0000000 --- a/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{pkgs, ...}: { - imports = [./config ./plugins]; - - config = { - # Use as leader key - globals.mapleader = " "; - globals.maplocalleader = " "; - - # Set 'vi' and 'vim' aliases to nixvim - viAlias = true; - vimAlias = true; - - # Setup clipboard support - clipboard = { - # Use xsel as clipboard provider - # providers.xsel.enable = true; - - # Sync system clipboard - register = "unnamedplus"; - }; - extraPackages = with pkgs; [ - nix-inspect - nixd - git - git-lfs - cloc - ripgrep - lazygit - black - fd - ripgrep - ]; - - keymaps = [ - { - mode = "n"; - key = "gg"; - action = "LazyGit"; - options = { - desc = "LazyGit (root dir)"; - }; - } - ]; -extraPlugins = with pkgs.vimPlugins; [ - lazygit-nvim - ]; - - extraConfigLua = '' - require("telescope").load_extension("lazygit") - ''; - performance = { - byteCompileLua = { - enable = true; - nvimRuntime = true; - configs = true; - plugins = true; - }; - }; - }; -} diff --git a/flake.nix b/flake.nix index 2c0fcc5..8203217 100644 --- a/flake.nix +++ b/flake.nix @@ -41,9 +41,7 @@ mkNixvim = specialArgs: nixvim.legacyPackages.${system}.makeNixvimWithModule { inherit pkgs; - - module = ./.; - + module = ./config; extraSpecialArgs = specialArgs // { -- 2.51.0 From d459d592eb4036a84b587f8825960457ecd7bafa Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 01:49:05 +0300 Subject: [PATCH 3/3] new imports --- config/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/default.nix b/config/default.nix index b3b896b..474b23f 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,5 +1,9 @@ {pkgs, ...}: { - imports = [./config ./plugins]; + imports = [ + ./colorscheme.nix + ./options.nix + ./plugins + ]; config = { # Use as leader key -- 2.51.0