From 72f087c33dca2ea6967630173075490e3f71ce86 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 21:13:57 +0300 Subject: [PATCH] formatting --- config/options.nix | 9 ++++++--- plugins/cmp.nix | 13 ++++++++++--- plugins/default.nix | 8 +------- plugins/mini.nix | 22 +++++++++++++--------- plugins/oil.nix | 25 +++++++++++-------------- plugins/treesitter.nix | 2 +- 6 files changed, 42 insertions(+), 37 deletions(-) diff --git a/config/options.nix b/config/options.nix index 30543b2..8556e51 100644 --- a/config/options.nix +++ b/config/options.nix @@ -9,9 +9,12 @@ listchars = "tab:» ,trail:·,multispace:·,lead: ,nbsp:⎕"; # Tab options - tabstop = 2; # Number of spaces a in the text stands for (local to buffer) - shiftwidth = 2; # Number of spaces used for each step of (auto)indent (local to buffer) - softtabstop = 0; # If non-zero, number of spaces to insert for a (local to buffer) + tabstop = + 2; # Number of spaces a in the text stands for (local to buffer) + shiftwidth = + 2; # Number of spaces used for each step of (auto)indent (local to buffer) + softtabstop = + 0; # If non-zero, number of spaces to insert for a (local to buffer) expandtab = true; # Expand to spaces in Insert mode (local to buffer) autoindent = true; # Do clever autoindenting # TODO: i want to see 4 spaces when i press tab in python and 2 spaces in nix using setlocal diff --git a/plugins/cmp.nix b/plugins/cmp.nix index 2ec48c1..8cfb197 100644 --- a/plugins/cmp.nix +++ b/plugins/cmp.nix @@ -4,11 +4,18 @@ settings = { sources = [ # LSP source - { name = "nvim_lsp"; } + { + name = "nvim_lsp"; + } # For path completion - { name = "path"; } + { + name = "path"; + } # For buffer completion - { name = "buffer"; keyword_length = 5; } + { + name = "buffer"; + keyword_length = 5; + } # For command line completion { name = "cmdline"; } ]; diff --git a/plugins/default.nix b/plugins/default.nix index d2d6c6d..0639d6f 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,12 +1,6 @@ { # settings of these plugins live in their respective files - imports = [ - ./cmp.nix - ./lsp.nix - ./mini.nix - ./oil.nix - ./treesitter.nix - ]; + imports = [ ./cmp.nix ./lsp.nix ./mini.nix ./oil.nix ./treesitter.nix ]; plugins = { # todo comments highlighter diff --git a/plugins/mini.nix b/plugins/mini.nix index 5ed71fc..d50c80a 100644 --- a/plugins/mini.nix +++ b/plugins/mini.nix @@ -1,4 +1,4 @@ -{config, lib, ...}:{ +{ config, lib, ... }: { plugins.mini = { modules = { starter = { @@ -12,13 +12,15 @@ # this items and content_hooks are copied from khanelivim config # but i want to understand them items = { - "__unkeyed-1.builtin_actions".__raw = "require('mini.starter').sections.builtin_actions()"; + "__unkeyed-1.builtin_actions".__raw = + "require('mini.starter').sections.builtin_actions()"; "__unkeyed-2.recent_files_current_directory".__raw = "require('mini.starter').sections.recent_files(10, true)"; - "__unkeyed-3.recent_files".__raw = "require('mini.starter').sections.recent_files(10, false)"; - "__unkeyed-4.sessions".__raw = lib.mkIf ( - config.plugins.mini.enable && lib.hasAttr "sessions" config.plugins.mini.modules - ) "require('mini.starter').sections.sessions(5, true)"; + "__unkeyed-3.recent_files".__raw = + "require('mini.starter').sections.recent_files(10, false)"; + "__unkeyed-4.sessions".__raw = lib.mkIf (config.plugins.mini.enable + && lib.hasAttr "sessions" config.plugins.mini.modules) + "require('mini.starter').sections.sessions(5, true)"; __unkeyed-5 = lib.mkIf config.plugins.persistence.enable { name = "Restore session"; action.__raw = "[[lua require('persistence').load()]]"; @@ -27,12 +29,14 @@ }; content_hooks = { - "__unkeyed-1.adding_bullet".__raw = "require('mini.starter').gen_hook.adding_bullet()"; + "__unkeyed-1.adding_bullet".__raw = + "require('mini.starter').gen_hook.adding_bullet()"; "__unkeyed-2.indexing".__raw = "require('mini.starter').gen_hook.indexing('all', { 'Builtin actions' })"; - "__unkeyed-3.padding".__raw = "require('mini.starter').gen_hook.aligning('center', 'center')"; + "__unkeyed-3.padding".__raw = + "require('mini.starter').gen_hook.aligning('center', 'center')"; }; - }; + }; }; }; } diff --git a/plugins/oil.nix b/plugins/oil.nix index b54bc19..44fe414 100644 --- a/plugins/oil.nix +++ b/plugins/oil.nix @@ -1,15 +1,12 @@ -{config, lib, ...}: { - plugins.oil = { - }; +{ config, lib, ... }: { + plugins.oil = { }; # add this keymaps only if oil plugin is enabled - keymaps = lib.mkIf config.plugins.oil.enable [ - { - action = "Oil"; - key = "-"; - options = { - silent = true; - # TODO what does silent do? - }; - } - ]; -} \ No newline at end of file + keymaps = lib.mkIf config.plugins.oil.enable [{ + action = "Oil"; + key = "-"; + options = { + silent = true; + # TODO what does silent do? + }; + }]; +} diff --git a/plugins/treesitter.nix b/plugins/treesitter.nix index 00301be..adf95e5 100644 --- a/plugins/treesitter.nix +++ b/plugins/treesitter.nix @@ -17,4 +17,4 @@ highlight = { enable = true; }; }; }; -} \ No newline at end of file +}