From d516a6e283820f9c0cb75f69bc6798d9851ca240 Mon Sep 17 00:00:00 2001 From: fwastring Date: Mon, 1 Dec 2025 10:13:33 +0100 Subject: [PATCH] added nixvim --- flake.nix | 1 + maskiner/core/configuration.nix | 6 +++++ moduler/programs/nixvim/default.nix | 42 ++++++++--------------------- 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/flake.nix b/flake.nix index 27e0bfb..8fcdc50 100644 --- a/flake.nix +++ b/flake.nix @@ -91,6 +91,7 @@ catppuccin.nixosModules.catppuccin confetti.nixosModules.default bbk.nixosModules.default + nixvim.nixosModules.default ]; }; diff --git a/maskiner/core/configuration.nix b/maskiner/core/configuration.nix index e07f853..831bfbd 100644 --- a/maskiner/core/configuration.nix +++ b/maskiner/core/configuration.nix @@ -24,6 +24,7 @@ in ../../moduler/sound.nix ../../moduler/programs/kubernetes-tools.nix ../../moduler/programs/confetti + ../../moduler/programs/nixvim ]; kubernetes-tools.enable = true; @@ -39,6 +40,11 @@ in theme = theme; }; + nixvim = { + enable = true; + theme = theme; + }; + home-manager.extraSpecialArgs = { inherit inputs pkgs; }; home-manager.users.fw = { imports = [ diff --git a/moduler/programs/nixvim/default.nix b/moduler/programs/nixvim/default.nix index 93e41fa..ba0bb63 100644 --- a/moduler/programs/nixvim/default.nix +++ b/moduler/programs/nixvim/default.nix @@ -36,9 +36,6 @@ with lib; }; }; - ################################# - ## Neovim options - ################################# opts = { number = true; relativenumber = true; @@ -54,9 +51,6 @@ with lib; globals.mapleader = " "; - ################################# - ## Keymaps - ################################# keymaps = [ # Telescope { @@ -182,9 +176,6 @@ with lib; } ]; - ################################# - ## Plugins - ################################# plugins = { web-devicons.enable = true; @@ -201,7 +192,7 @@ with lib; ]; lualine_y = [ "buffers" ]; }; - sections = { + inactive_sections = { lualine_a = []; lualine_b = []; lualine_c = []; @@ -298,27 +289,16 @@ with lib; }; }; enableMan = false; - - ################################# - ## LSP - ################################# - ################################# - ## Autocommands - ################################# - autoCmd = [ - { - event = [ - "BufRead" - "BufNewFile" - ]; - pattern = "*.{md,typ}"; - callback = "vim.opt_local.spell = true"; - } - ]; - - ################################# - ## Colorscheme - ################################# + # autoCmd = [ + # { + # event = [ + # "BufRead" + # "BufNewFile" + # ]; + # pattern = "*.{md,typ}"; + # callback = "vim.opt_local.spell = true"; + # } + # ]; }; };