diff --git a/config/default.nix b/config/default.nix index 643d7db..6e66436 100644 --- a/config/default.nix +++ b/config/default.nix @@ -5,5 +5,4 @@ ./options.nix ./keymaps.nix ]; - # TODO shades-of-purple-superdark as a color schema } diff --git a/config/options.nix b/config/options.nix index be137aa..cd5df99 100644 --- a/config/options.nix +++ b/config/options.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - colorschemes.cyberdream.enable = true; - colorscheme = "cyberdream"; + #colorschemes.cyberdream.enable = true; + colorscheme = "shades_of_purple"; opts = { number = true; @@ -11,4 +11,13 @@ # Set as leader globals.mapleader = " "; + autoCmd = [ + # Start aw-watcher-vim on startup + { + command = ":AWStart'"; + event = [ + "VimEnter" + ]; + } + ]; } diff --git a/config/plugins.nix b/config/plugins.nix index 935fddb..d73702a 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -110,6 +110,18 @@ # A better command window plugins.noice.enable = true; + # Terminal + plugins.toggleterm = { + enable = true; + settings = { + hide_numbers = false; + autochdir = true; + close_on_exit = true; + direction = "horizontal"; + open_mapping = "[[]]"; + }; + }; + # Autocomplete plugins.cmp = { @@ -171,7 +183,6 @@ - # TODO gen.nvim not in nixvim # highlites colors (like #FFF) plugins.colorizer = { @@ -181,7 +192,6 @@ # Highlight TODO FIXME comments plugins.todo-comments.enable = true; - # TODO feline-nvim and theme for it # Inline git blame plugins.gitsigns = { @@ -317,4 +327,49 @@ }; }; + extraPlugins = with pkgs; [ + # TODO add gen.nvim + { + plugin = pkgs.vimUtils.buildVimPlugin { + pname = "aw-watcher-vim"; + version = "1.0.0"; # dummy version + src = pkgs.fetchFromGitHub { + owner = "ActivityWatch"; + repo = "aw-watcher-vim"; + rev = "4ba86d05a940574000c33f280fd7f6eccc284331"; + hash = "sha256-I7YYvQupeQxWr2HEpvba5n91+jYvJrcWZhQg+5rI908="; + }; + }; + } + # Shades of purple + # TODO self implement this color scheme as this one doesn't really represent the original one. + { + plugin = pkgs.vimUtils.buildVimPlugin { + pname = "shades-of-purple"; + version = "1.0.0"; # dummy version + src = pkgs.fetchFromGitHub { + owner = "Rigellute"; + repo = "shades-of-purple.vim"; + rev = "e806d38190a6a2e8b9244824c2953d6567f141f3"; + hash = "sha256-iiGASgVlIXnnUNBlp9viKgDBfHiOP5P/yJx9XyELT9g="; + }; + }; + } + # Gen for local ollama ai, and autocomplete + { + plugin = pkgs.vimUtils.buildVimPlugin { + pname = "gen.nvim"; + version = "1.0.0"; # dummy version + src = pkgs.fetchFromGitHub { + owner = "David-Kunz"; + repo = "gen.nvim"; + rev = "b9721662daedd880ca0a0358cf6ffbff60617ab3"; + hash = "sha256-Cyx0QBQjp+ilEEMqs4OWuuJ0x5t4bRalJ2NuemvxDKo="; + }; + }; + # TODO config for gen + #config =''''; + } + ]; + }