From e32f338024bf2a59e371fa3714945333dea4c6d9 Mon Sep 17 00:00:00 2001 From: meml0rz Date: Wed, 13 Nov 2024 01:15:31 +0100 Subject: [PATCH] kekl --- modules/nix/nvim/alpha.nix | 85 +++++++++++++------------ modules/nix/nvim/cmp.nix | 2 + modules/nix/nvim/dev.nix | 19 +++--- modules/nix/nvim/lualine.nix | 21 ++++--- modules/nix/nvim/neotree.nix | 33 +++++----- modules/nix/nvim/nonels.nix | 116 +++++++++++++++++------------------ 6 files changed, 149 insertions(+), 127 deletions(-) diff --git a/modules/nix/nvim/alpha.nix b/modules/nix/nvim/alpha.nix index 31b36c6..49f76eb 100644 --- a/modules/nix/nvim/alpha.nix +++ b/modules/nix/nvim/alpha.nix @@ -1,43 +1,48 @@ -{ config, pkgs, nixvim, ... }: { - programs.nixvim = { - plugins = { - alpha = { - enable = true; - layout = [ - { - type = "padding"; - val = 2; - } - { - opts = { - hl = "Type"; - position = "center"; - }; - type = "text"; - val = [ - " ⣿⣿⣷⡁⢆⠈⠕⢕⢂⢕⢂⢕⢂⢔⢂⢕⢄⠂⣂⠂⠆⢂⢕⢂⢕⢂⢕⢂⢕⢂ " - " ⣿⣿⣿⡷⠊⡢⡹⣦⡑⢂⢕⢂⢕⢂⢕⢂⠕⠔⠌⠝⠛⠶⠶⢶⣦⣄⢂⢕⢂⢕ " - " ⣿⣿⠏⣠⣾⣦⡐⢌⢿⣷⣦⣅⡑⠕⠡⠐⢿⠿⣛⠟⠛⠛⠛⠛⠡⢷⡈⢂⢕⢂ " - " ⠟⣡⣾⣿⣿⣿⣿⣦⣑⠝⢿⣿⣿⣿⣿⣿⡵⢁⣤⣶⣶⣿⢿⢿⢿⡟⢻⣤⢑⢂ " - " ⣾⣿⣿⡿⢟⣛⣻⣿⣿⣿⣦⣬⣙⣻⣿⣿⣷⣿⣿⢟⢝⢕⢕⢕⢕⢽⣿⣿⣷⣔ " - " ⣿⣿⠵⠚⠉⢀⣀⣀⣈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣗⢕⢕⢕⢕⢕⢕⣽⣿⣿⣿⣿ " - " ⢷⣂⣠⣴⣾⡿⡿⡻⡻⣿⣿⣴⣿⣿⣿⣿⣿⣿⣷⣵⣵⣵⣷⣿⣿⣿⣿⣿⣿⡿ " - " ⢌⠻⣿⡿⡫⡪⡪⡪⡪⣺⣿⣿⣿⣿⣿⠿⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃ " - " ⠣⡁⠹⡪⡪⡪⡪⣪⣾⣿⣿⣿⣿⠋⠐⢉⢍⢄⢌⠻⣿⣿⣿⣿⣿⣿⣿⣿⠏⠈ " - " ⡣⡘⢄⠙⣾⣾⣾⣿⣿⣿⣿⣿⣿⡀⢐⢕⢕⢕⢕⢕⡘⣿⣿⣿⣿⣿⣿⠏⠠⠈ " - " ⠌⢊⢂⢣⠹⣿⣿⣿⣿⣿⣿⣿⣿⣧⢐⢕⢕⢕⢕⢕⢅⣿⣿⣿⣿⡿⢋⢜⠠⠈ " - " ⠄⠁⠕⢝⡢⠈⠻⣿⣿⣿⣿⣿⣿⣿⣷⣕⣑⣑⣑⣵⣿⣿⣿⡿⢋⢔⢕⣿⠠⠈ " - " ⠨⡂⡀⢑⢕⡅⠂⠄⠉⠛⠻⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⡿⢋⢔⢕⢕⣿⣿⠠⠈ " - " ⠄⠪⣂⠁⢕⠆⠄⠂⠄⠁⡀⠂⡀⠄⢈⠉⢍⢛⢛⢛⢋⢔⢕⢕⢕⣽⣿⣿⠠⠈ " - ]; - } - { - type = "padding"; - val = 2; - } - ]; - }; - }; + config, + pkgs, + nixvim, + ... +}: +{ + programs.nixvim = { + plugins = { + alpha = { + enable = true; + layout = [ + { + type = "padding"; + val = 2; + } + { + opts = { + hl = "Type"; + position = "center"; + }; + type = "text"; + val = [ + " ⣿⣿⣷⡁⢆⠈⠕⢕⢂⢕⢂⢕⢂⢔⢂⢕⢄⠂⣂⠂⠆⢂⢕⢂⢕⢂⢕⢂⢕⢂ " + " ⣿⣿⣿⡷⠊⡢⡹⣦⡑⢂⢕⢂⢕⢂⢕⢂⠕⠔⠌⠝⠛⠶⠶⢶⣦⣄⢂⢕⢂⢕ " + " ⣿⣿⠏⣠⣾⣦⡐⢌⢿⣷⣦⣅⡑⠕⠡⠐⢿⠿⣛⠟⠛⠛⠛⠛⠡⢷⡈⢂⢕⢂ " + " ⠟⣡⣾⣿⣿⣿⣿⣦⣑⠝⢿⣿⣿⣿⣿⣿⡵⢁⣤⣶⣶⣿⢿⢿⢿⡟⢻⣤⢑⢂ " + " ⣾⣿⣿⡿⢟⣛⣻⣿⣿⣿⣦⣬⣙⣻⣿⣿⣷⣿⣿⢟⢝⢕⢕⢕⢕⢽⣿⣿⣷⣔ " + " ⣿⣿⠵⠚⠉⢀⣀⣀⣈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣗⢕⢕⢕⢕⢕⢕⣽⣿⣿⣿⣿ " + " ⢷⣂⣠⣴⣾⡿⡿⡻⡻⣿⣿⣴⣿⣿⣿⣿⣿⣿⣷⣵⣵⣵⣷⣿⣿⣿⣿⣿⣿⡿ " + " ⢌⠻⣿⡿⡫⡪⡪⡪⡪⣺⣿⣿⣿⣿⣿⠿⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃ " + " ⠣⡁⠹⡪⡪⡪⡪⣪⣾⣿⣿⣿⣿⠋⠐⢉⢍⢄⢌⠻⣿⣿⣿⣿⣿⣿⣿⣿⠏⠈ " + " ⡣⡘⢄⠙⣾⣾⣾⣿⣿⣿⣿⣿⣿⡀⢐⢕⢕⢕⢕⢕⡘⣿⣿⣿⣿⣿⣿⠏⠠⠈ " + " ⠌⢊⢂⢣⠹⣿⣿⣿⣿⣿⣿⣿⣿⣧⢐⢕⢕⢕⢕⢕⢅⣿⣿⣿⣿⡿⢋⢜⠠⠈ " + " ⠄⠁⠕⢝⡢⠈⠻⣿⣿⣿⣿⣿⣿⣿⣷⣕⣑⣑⣑⣵⣿⣿⣿⡿⢋⢔⢕⣿⠠⠈ " + " ⠨⡂⡀⢑⢕⡅⠂⠄⠉⠛⠻⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⡿⢋⢔⢕⢕⣿⣿⠠⠈ " + " ⠄⠪⣂⠁⢕⠆⠄⠂⠄⠁⡀⠂⡀⠄⢈⠉⢍⢛⢛⢛⢋⢔⢕⢕⢕⣽⣿⣿⠠⠈ " + ]; + } + { + type = "padding"; + val = 2; + } + ]; + }; }; + }; } diff --git a/modules/nix/nvim/cmp.nix b/modules/nix/nvim/cmp.nix index 8bb22b5..99884a0 100644 --- a/modules/nix/nvim/cmp.nix +++ b/modules/nix/nvim/cmp.nix @@ -26,6 +26,8 @@ in "" = "cmp.mapping.complete()"; "" = "cmp.mapping.abort()"; "" = "cmp.mapping.abort()"; + "" = "cmp.mapping.select_prev_item()"; + "" = "cmp.mapping.select_next_item()"; "" = "cmp.mapping.confirm({ select = false })"; }; diff --git a/modules/nix/nvim/dev.nix b/modules/nix/nvim/dev.nix index 9857b66..819c796 100644 --- a/modules/nix/nvim/dev.nix +++ b/modules/nix/nvim/dev.nix @@ -1,10 +1,15 @@ -{ config, pkgs, nixvim, ... }: { - programs.nixvim = { - plugins = { - toggleterm.enable = true; - autoclose.enable = true; - web-devicons.enable = true; - }; + config, + pkgs, + nixvim, + ... +}: +{ + programs.nixvim = { + plugins = { + toggleterm.enable = true; + autoclose.enable = true; + web-devicons.enable = true; }; + }; } diff --git a/modules/nix/nvim/lualine.nix b/modules/nix/nvim/lualine.nix index 257eaa6..c66ecef 100644 --- a/modules/nix/nvim/lualine.nix +++ b/modules/nix/nvim/lualine.nix @@ -1,10 +1,15 @@ -{ config, pkgs, nixvim, ... }: { - programs.nixvim = { - plugins = { - lualine = { - enable = true; - }; - }; - }; + config, + pkgs, + nixvim, + ... +}: +{ + programs.nixvim = { + plugins = { + lualine = { + enable = true; + }; + }; + }; } diff --git a/modules/nix/nvim/neotree.nix b/modules/nix/nvim/neotree.nix index b3efe48..2353eda 100644 --- a/modules/nix/nvim/neotree.nix +++ b/modules/nix/nvim/neotree.nix @@ -1,16 +1,21 @@ -{ config, pkgs, nixvim, ... }: { - programs.nixvim = { - plugins = { - neo-tree = { - enable = true; - enableDiagnostics = true; - enableGitStatus = true; - window = { - position = "right"; - width = 40; - }; - }; - }; - }; + config, + pkgs, + nixvim, + ... +}: +{ + programs.nixvim = { + plugins = { + neo-tree = { + enable = true; + enableDiagnostics = true; + enableGitStatus = true; + window = { + position = "right"; + width = 40; + }; + }; + }; + }; } diff --git a/modules/nix/nvim/nonels.nix b/modules/nix/nvim/nonels.nix index 6b6dde0..2236a67 100644 --- a/modules/nix/nvim/nonels.nix +++ b/modules/nix/nvim/nonels.nix @@ -1,62 +1,62 @@ { pkgs, ... }: { - programs.nixvim.plugins.none-ls = { - enable = true; - enableLspFormat = true; - settings = { - updateInInsert = false; - }; - sources = { - code_actions = { - gitsigns.enable = true; - statix.enable = true; - }; - diagnostics = { - statix.enable = true; - yamllint.enable = true; - }; - formatting = { - nixfmt = { - enable = true; - package = pkgs.nixfmt-rfc-style; - }; - black = { - enable = true; - settings = '' - { - extra_args = { "--fast" }, - } - ''; - }; - prettier = { - enable = true; - disableTsServerFormatter = true; - settings = '' - { - extra_args = { "--no-semi" }, - } - ''; - }; - stylua.enable = true; - yamlfmt = { - enable = true; - }; - hclfmt.enable = true; - }; - }; + programs.nixvim.plugins.none-ls = { + enable = true; + enableLspFormat = true; + settings = { + updateInInsert = false; }; - programs.nixvim.keymaps = [ - { - mode = [ - "n" - "v" - ]; - key = "cf"; - action = "lua vim.lsp.buf.format()"; - options = { - silent = true; - desc = "Format"; - }; - } - ]; + sources = { + code_actions = { + gitsigns.enable = true; + statix.enable = true; + }; + diagnostics = { + statix.enable = true; + yamllint.enable = true; + }; + formatting = { + nixfmt = { + enable = true; + package = pkgs.nixfmt-rfc-style; + }; + black = { + enable = true; + settings = '' + { + extra_args = { "--fast" }, + } + ''; + }; + prettier = { + enable = true; + disableTsServerFormatter = true; + settings = '' + { + extra_args = { "--no-semi" }, + } + ''; + }; + stylua.enable = true; + yamlfmt = { + enable = true; + }; + hclfmt.enable = true; + }; + }; + }; + programs.nixvim.keymaps = [ + { + mode = [ + "n" + "v" + ]; + key = "cf"; + action = "lua vim.lsp.buf.format()"; + options = { + silent = true; + desc = "Format"; + }; + } + ]; }