working NixVim!

2024-05-22 14:04:58 +02:00 · 2024-05-22 14:04:58 +02:00 · 9d1dfa44d7
commit 9d1dfa44d7
parent 6198767e5b
42 changed files with 774 additions and 454 deletions
--- a/modules/editors/nixvim/plug/completion/cmp.nix
+++ b/modules/editors/nixvim/plug/completion/cmp.nix
@ -1,5 +1,6 @@
 {
-  programs.nixvim.plugins = {
+  programs.nixvim = {
+    plugins = {
    cmp-emoji = {enable = true;};
    cmp = {
      enable = true;
@ -117,4 +118,5 @@
    --      end
    -- }
       })  '';
+     };
 }
--- a/modules/editors/nixvim/plug/git/gitsigns.nix
+++ b/modules/editors/nixvim/plug/git/gitsigns.nix
@ -1,5 +1,6 @@
 {
-  programs.nixvim.plugins.gitsigns = {
+  programs.nixvim = {
+    plugins.gitsigns = {
    enable = true;
    settings = {
      trouble = true;
@ -73,4 +74,5 @@
      };
    }
  ];
+};
 }
--- a/modules/editors/nixvim/plug/lsp/none-ls.nix
+++ b/modules/editors/nixvim/plug/lsp/none-ls.nix
@ -1,4 +1,5 @@
 {
+  programs.nixvim = {
  plugins.none-ls = {
    enable = true;
    enableLspFormat = true;
@ -47,4 +48,5 @@
      };
    }
  ];
+};
 }
--- a/modules/editors/nixvim/plug/lsp/trouble.nix
+++ b/modules/editors/nixvim/plug/lsp/trouble.nix
@ -1,5 +1,5 @@
 {
-  plugins.trouble = {
+  programs.nixvim.plugins.trouble = {
    enable = true;
  };
 }
--- a/modules/editors/nixvim/plug/snippets/luasnip.nix
+++ b/modules/editors/nixvim/plug/snippets/luasnip.nix
@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  plugins.luasnip = {
+  programs.nixvim.plugins.luasnip = {
    enable = true;
    extraConfig = {
      enable_autosnippets = true;
--- a/modules/editors/nixvim/plug/statusline/lualine.nix
+++ b/modules/editors/nixvim/plug/statusline/lualine.nix
@ -1,30 +1,30 @@
 {
-  plugins.lualine = {
+  programs.nixvim.plugins.lualine = {
    enable = true;
    globalstatus = true;
    disabledFiletypes = {
      statusline = ["dashboard" "alpha" "starter"];
    };
-    theme = {
-      normal = {
-        a = {
-          bg = "#b4befe";
-          fg = "#1c1d21";
-        };
-        b = {
-          bg = "nil";
-        };
-        c = {
-          bg = "nil";
-        };
-        z = {
-          bg = "nil";
-        };
-        y = {
-          bg = "nil";
-        };
-      };
-    };
+#    theme = {
+#      normal = {
+#        a = {
+#          bg = "#b4befe";
+#          fg = "#1c1d21";
+#        };
+#        b = {
+#          bg = "nil";
+#        };
+#        c = {
+#          bg = "nil";
+#        };
+#        z = {
+#          bg = "nil";
+#        };
+#        y = {
+#          bg = "nil";
+#        };
+#      };
+#    };
    sections = {
      lualine_a = [
        {
--- a/modules/editors/nixvim/plug/treesitter/treesitter-context.nix
+++ b/modules/editors/nixvim/plug/treesitter/treesitter-context.nix
@ -1,5 +1,5 @@
 {
-  plugins.treesitter-context = {
+  programs.nixvim.plugins.treesitter-context = {
    enable = true;
  };
 }
--- a/modules/editors/nixvim/plug/treesitter/treesitter-textobjects.nix
+++ b/modules/editors/nixvim/plug/treesitter/treesitter-textobjects.nix
@ -1,5 +1,5 @@
 {
-  plugins.treesitter-textobjects = {
+  programs.nixvim.plugins.treesitter-textobjects = {
    enable = false;
    select = {
      enable = true;
--- a/modules/editors/nixvim/plug/treesitter/treesitter.nix
+++ b/modules/editors/nixvim/plug/treesitter/treesitter.nix
@ -10,6 +10,7 @@
    };
  };
 in {
+  programs.nixvim = {
  filetype.extension.liq = "liquidsoap";
  filetype.extension.nu = "nu";

@ -41,4 +42,5 @@ in {
      filetype = "nu",
    }
  '';
+};
 }
--- a/modules/editors/nixvim/plug/ui/alpha.nix
+++ b/modules/editors/nixvim/plug/ui/alpha.nix
@ -1,19 +1,22 @@
 {
+programs.nixvim = {
  plugins.alpha = let
    nixFlake = [
-      "                                          "
-      " ▓█████  ██▓   ▓██   ██▓▄▄▄█████▓ ██░ ██  "
-      " ▓█   ▀ ▓██▒    ▒██  ██▒▓  ██▒ ▓▒▓██░ ██▒ "
-      " ▒███   ▒██░     ▒██ ██░▒ ▓██░ ▒░▒██▀▀██░ "
-      " ▒▓█  ▄ ▒██░     ░ ▐██▓░░ ▓██▓ ░ ░▓█ ░██  "
-      " ░▒████▒░██████▒ ░ ██▒▓░  ▒██▒ ░ ░▓█▒░██▓ "
-      " ░░ ▒░ ░░ ▒░▓  ░  ██▒▒▒   ▒ ░░    ▒ ░░▒░▒ "
-      "  ░ ░  ░░ ░ ▒  ░▓██ ░▒░     ░     ▒ ░▒░ ░ "
-      "    ░     ░ ░   ▒ ▒ ░░    ░       ░  ░░ ░ "
-      "    ░  ░    ░  ░░ ░               ░  ░  ░ "
-      "                ░ ░                       "
-      "                                          "
-      "           git@github.com:elythh          "
+      "⠄⠄⠄⢰⣧⣼⣯⠄⣸⣠⣶⣶⣦⣾⠄⠄⠄⠄⡀⠄⢀⣿⣿⠄⠄⠄⢸⡇⠄⠄"
+      "⠄⠄⠄⣾⣿⠿⠿⠶⠿⢿⣿⣿⣿⣿⣦⣤⣄⢀⡅⢠⣾⣛⡉⠄⠄⠄⠸⢀⣿⠄"
+      "⠄⠄⢀⡋⣡⣴⣶⣶⡀⠄⠄⠙⢿⣿⣿⣿⣿⣿⣴⣿⣿⣿⢃⣤⣄⣀⣥⣿⣿⠄"
+      "⠄⠄⢸⣇⠻⣿⣿⣿⣧⣀⢀⣠⡌⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠿⠿⣿⣿⣿⠄"
+      "⠄⢀⢸⣿⣷⣤⣤⣤⣬⣙⣛⢿⣿⣿⣿⣿⣿⣿⡿⣿⣿⡍⠄⠄⢀⣤⣄⠉⠋⣰"
+      "⠄⣼⣖⣿⣿⣿⣿⣿⣿⣿⣿⣿⢿⣿⣿⣿⣿⣿⢇⣿⣿⡷⠶⠶⢿⣿⣿⠇⢀⣤"
+      "⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣽⣿⣿⣿⡇⣿⣿⣿⣿⣿⣿⣷⣶⣥⣴⣿⡗"
+      "⢀⠈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠄"
+      "⢸⣿⣦⣌⣛⣻⣿⣿⣧⠙⠛⠛⡭⠅⠒⠦⠭⣭⡻⣿⣿⣿⣿⣿⣿⣿⣿⡿⠃⠄"
+      "⠘⣿⣿⣿⣿⣿⣿⣿⣿⡆⠄⠄⠄⠄⠄⠄⠄⠄⠹⠈⢋⣽⣿⣿⣿⣿⣵⣾⠃⠄"
+      "⠄⠘⣿⣿⣿⣿⣿⣿⣿⣿⠄⣴⣿⣶⣄⠄⣴⣶⠄⢀⣾⣿⣿⣿⣿⣿⣿⠃⠄⠄"
+      "⠄⠄⠈⠻⣿⣿⣿⣿⣿⣿⡄⢻⣿⣿⣿⠄⣿⣿⡀⣾⣿⣿⣿⣿⣛⠛⠁⠄⠄⠄"
+      "⠄⠄⠄⠄⠈⠛⢿⣿⣿⣿⠁⠞⢿⣿⣿⡄⢿⣿⡇⣸⣿⣿⠿⠛⠁⠄⠄⠄⠄⠄"
+      "⠄⠄⠄⠄⠄⠄⠄⠉⠻⣿⣿⣾⣦⡙⠻⣷⣾⣿⠃⠿⠋⠁⠄⠄⠄⠄⠄⢀⣠⣴"
+      "⣿⣿⣿⣶⣶⣮⣥⣒⠲⢮⣝⡿⣿⣿⡆⣿⡿⠃⠄⠄⠄⠄⠄⠄⠄⣠⣴⣿⣿⣿"
    ];
  in {
    enable = true;
@ -86,4 +89,5 @@
      }
    ];
  };
+};
 }
--- a/modules/editors/nixvim/plug/ui/btw.nix
+++ b/modules/editors/nixvim/plug/ui/btw.nix
@ -1,4 +1,5 @@
 {pkgs, ...}: {
+  programs.nixvim = {
  extraPlugins = with pkgs.vimUtils; [
    (buildVimPlugin {
      pname = "btw.nvim";
@ -17,4 +18,5 @@
      text = "I use Neovim (and NixOS, BTW)",
    })
  '';
+};
 }
--- a/modules/editors/nixvim/plug/ui/bufferline.nix
+++ b/modules/editors/nixvim/plug/ui/bufferline.nix
@ -5,11 +5,12 @@
 }: let
  colors = import ../../colors/${config.theme}.nix {};
 in {
+  programs.nixvim = {
  plugins = {
    bufferline = {
      enable = true;
      separatorStyle = "thick"; # “slant”, “padded_slant”, “slope”, “padded_slope”, “thick”, “thin”
-      highlights = lib.mkIf config.colorschemes.base16.enable {
+      highlights = {
        fill = {
          fg = colors.base00;
          bg = colors.base00;
@ -172,4 +173,5 @@ in {
      };
    }
  ];
+};
 }
--- a/modules/editors/nixvim/plug/ui/noice.nix
+++ b/modules/editors/nixvim/plug/ui/noice.nix
@ -1,5 +1,5 @@
 {
-  plugins.noice = {
+  programs.nixvim.plugins.noice = {
    enable = true;
    notify = {
      enabled = false;
--- a/modules/editors/nixvim/plug/ui/nvim-notify.nix
+++ b/modules/editors/nixvim/plug/ui/nvim-notify.nix
@ -1,4 +1,5 @@
 {
+  programs.nixvim = {
  plugins.notify = {
    enable = true;
    backgroundColour = "#000000";
@ -42,4 +43,5 @@
    	return notify(message, level, merged_opts)
    end
  '';
+};
 }
--- a/modules/editors/nixvim/plug/ui/telescope.nix
+++ b/modules/editors/nixvim/plug/ui/telescope.nix
@ -1,4 +1,5 @@
 {
+  programs.nixvim = {
  plugins.telescope = {
    enable = true;
    extensions = {
@ -207,4 +208,5 @@
      }
    }
  '';
+};
 }
--- a/modules/editors/nixvim/plug/utils/comment.nix
+++ b/modules/editors/nixvim/plug/utils/comment.nix
@ -1,5 +1,5 @@
 {
-  plugins.comment = {
+  programs.nixvim.plugins.comment = {
    enable = true;
  };
 }
--- a/modules/editors/nixvim/plug/utils/copilot.nix
+++ b/modules/editors/nixvim/plug/utils/copilot.nix
@ -10,6 +10,7 @@
    hash = "sha256-Q+g81BQVQTY5J2c2ZWB7bjJLuNSdI0PAan+75YJ7mI0=";
  };
 in {
+  programs.nixvim = {
  extraPlugins = with pkgs.vimUtils; [
    (buildVimPlugin {
      pname = "copilotchat";
@ -53,4 +54,5 @@ in {
      action = "<cmd>CopilotChatCommit<cr>";
    }
  ];
+};
 }
--- a/modules/editors/nixvim/plug/utils/flash.nix
+++ b/modules/editors/nixvim/plug/utils/flash.nix
@ -1,4 +1,5 @@
 {
+  programs.nixvim = {
  plugins.flash = {
    enable = true;
    labels = "asdfghjklqwertyuiopzxcvbnm";
@ -53,4 +54,5 @@
      };
    }
  ];
+};
 }
--- a/modules/editors/nixvim/plug/utils/grapple.nix
+++ b/modules/editors/nixvim/plug/utils/grapple.nix
@ -1,4 +1,5 @@
 {pkgs, ...}: {
+  programs.nixvim = {
  extraPlugins = with pkgs.vimUtils; [
    (buildVimPlugin {
      pname = "grapple.nvim";
@ -17,4 +18,5 @@
      scope = "git_branch",
    })
  '';
+  };
 }
--- a/modules/editors/nixvim/plug/utils/hardtime.nix
+++ b/modules/editors/nixvim/plug/utils/hardtime.nix
@ -1,5 +1,5 @@
 {
-  plugins.hardtime = {
+  programs.nixvim.plugins.hardtime = {
    enable = true;
    enabled = true;
    disableMouse = true;
--- a/modules/editors/nixvim/plug/utils/harpoon.nix
+++ b/modules/editors/nixvim/plug/utils/harpoon.nix
@ -1,5 +1,5 @@
 {
-  plugins.harpoon = {
+  programs.nixvim.plugins.harpoon = {
    enable = true;
    enableTelescope = true;
    keymapsSilent = true;
--- a/modules/editors/nixvim/plug/utils/illuminate.nix
+++ b/modules/editors/nixvim/plug/utils/illuminate.nix
@ -1,5 +1,5 @@
 {
-  plugins.illuminate = {
+  programs.nixvim.plugins.illuminate = {
    enable = true;
    underCursor = false;
    filetypesDenylist = [
--- a/modules/editors/nixvim/plug/utils/nvim-autopairs.nix
+++ b/modules/editors/nixvim/plug/utils/nvim-autopairs.nix
@ -1,5 +1,5 @@
 {
-  plugins.nvim-autopairs = {
+  programs.nixvim.plugins.nvim-autopairs = {
    enable = true;
  };
 }
--- a/modules/editors/nixvim/plug/utils/oil.nix
+++ b/modules/editors/nixvim/plug/utils/oil.nix
@ -1,4 +1,5 @@
 {
+  programs.nixvim = {
  plugins.oil = {
    enable = true;
    settings = {
@ -47,4 +48,5 @@
      };
    }
  ];
+};
 }
--- a/modules/editors/nixvim/plug/utils/ufo.nix
+++ b/modules/editors/nixvim/plug/utils/ufo.nix
@ -1,5 +1,5 @@
 {
-  plugins.nvim-ufo = {
+  programs.nixvim.plugins.nvim-ufo = {
    enable = true;
  };
 }
--- a/modules/editors/nixvim/plug/utils/undotree.nix
+++ b/modules/editors/nixvim/plug/utils/undotree.nix
@ -1,4 +1,5 @@
 {
+  programs.nixvim = {
  plugins.undotree = {
    enable = true;
    settings = {
@ -17,4 +18,5 @@
      };
    }
  ];
+};
 }
--- a/modules/editors/nixvim/plug/utils/whichkey.nix
+++ b/modules/editors/nixvim/plug/utils/whichkey.nix
@ -1,5 +1,5 @@
 {
-  plugins.which-key = {
+  programs.nixvim.plugins.which-key = {
    enable = true;
  };
 }