fix neovide by installing w/ nix
This commit is contained in:
@@ -46,6 +46,7 @@
|
|||||||
|
|
||||||
# base system package install list
|
# base system package install list
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
neovide
|
||||||
];
|
];
|
||||||
|
|
||||||
nix-homebrew = {
|
nix-homebrew = {
|
||||||
|
|||||||
@@ -4,13 +4,15 @@
|
|||||||
lib,
|
lib,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
program = "nvf";
|
program = "nvf";
|
||||||
cfg = config.dots.${program};
|
cfg = config.dots.${program};
|
||||||
isLinux = pkgs.stdenv.isLinux;
|
isLinux = pkgs.stdenv.isLinux;
|
||||||
isDarwin = pkgs.stdenv.isDarwin;
|
isDarwin = pkgs.stdenv.isDarwin;
|
||||||
#sec = sops.secrets;
|
#sec = sops.secrets;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.dots.${program} = {
|
options.dots.${program} = {
|
||||||
enable = lib.mkEnableOption "enables ${program}";
|
enable = lib.mkEnableOption "enables ${program}";
|
||||||
};
|
};
|
||||||
@@ -24,18 +26,20 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
vim = {
|
vim = {
|
||||||
clipboard =
|
clipboard =
|
||||||
# On Linux, use wl-copy as you do now
|
# On Linux, use wl-copy as you do now
|
||||||
if isLinux then {
|
if isLinux then
|
||||||
enable = true;
|
{
|
||||||
providers.wl-copy.enable = true;
|
enable = true;
|
||||||
registers = "unnamed,unnamedplus";
|
providers.wl-copy.enable = true;
|
||||||
}
|
registers = "unnamed,unnamedplus";
|
||||||
else {
|
}
|
||||||
enable = true;
|
else
|
||||||
registers = "unnamed,unnamedplus";
|
{
|
||||||
};
|
enable = true;
|
||||||
|
registers = "unnamed,unnamedplus";
|
||||||
|
};
|
||||||
|
|
||||||
globals = {
|
globals = {
|
||||||
mapleader = " ";
|
mapleader = " ";
|
||||||
maplocalleader = " ";
|
maplocalleader = " ";
|
||||||
@@ -53,13 +57,13 @@ in {
|
|||||||
# visual line movement (insert mode)
|
# visual line movement (insert mode)
|
||||||
{
|
{
|
||||||
key = "<Up>";
|
key = "<Up>";
|
||||||
mode = ["i"];
|
mode = [ "i" ];
|
||||||
action = "<C-o>gk";
|
action = "<C-o>gk";
|
||||||
desc = "Visual Line Up (Insert)";
|
desc = "Visual Line Up (Insert)";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<Down>";
|
key = "<Down>";
|
||||||
mode = ["i"];
|
mode = [ "i" ];
|
||||||
action = "<C-o>gj";
|
action = "<C-o>gj";
|
||||||
desc = "Visual Line Down (Insert)";
|
desc = "Visual Line Down (Insert)";
|
||||||
}
|
}
|
||||||
@@ -91,7 +95,7 @@ in {
|
|||||||
|
|
||||||
{
|
{
|
||||||
key = "gd";
|
key = "gd";
|
||||||
mode = ["n"];
|
mode = [ "n" ];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua vim.lsp.buf.definition()<CR>";
|
action = "<cmd>lua vim.lsp.buf.definition()<CR>";
|
||||||
desc = "Go to definition";
|
desc = "Go to definition";
|
||||||
@@ -99,7 +103,7 @@ in {
|
|||||||
# Hover info
|
# Hover info
|
||||||
{
|
{
|
||||||
key = "K";
|
key = "K";
|
||||||
mode = ["n"];
|
mode = [ "n" ];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua vim.lsp.buf.hover()<CR>";
|
action = "<cmd>lua vim.lsp.buf.hover()<CR>";
|
||||||
desc = "Hover info";
|
desc = "Hover info";
|
||||||
@@ -107,7 +111,7 @@ in {
|
|||||||
# Format buffer (Alejandra for Nix)
|
# Format buffer (Alejandra for Nix)
|
||||||
{
|
{
|
||||||
key = "<leader>F";
|
key = "<leader>F";
|
||||||
mode = ["n"];
|
mode = [ "n" ];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua vim.lsp.buf.format({ async = true })<CR>";
|
action = "<cmd>lua vim.lsp.buf.format({ async = true })<CR>";
|
||||||
desc = "Format buffer";
|
desc = "Format buffer";
|
||||||
@@ -115,7 +119,7 @@ in {
|
|||||||
# Code actions / quickfix
|
# Code actions / quickfix
|
||||||
{
|
{
|
||||||
key = "<leader>a";
|
key = "<leader>a";
|
||||||
mode = ["n"];
|
mode = [ "n" ];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua vim.lsp.buf.code_action()<CR>";
|
action = "<cmd>lua vim.lsp.buf.code_action()<CR>";
|
||||||
desc = "Code action";
|
desc = "Code action";
|
||||||
@@ -123,7 +127,7 @@ in {
|
|||||||
# Rename symbol
|
# Rename symbol
|
||||||
{
|
{
|
||||||
key = "<leader>r";
|
key = "<leader>r";
|
||||||
mode = ["n"];
|
mode = [ "n" ];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua vim.lsp.buf.rename()<CR>";
|
action = "<cmd>lua vim.lsp.buf.rename()<CR>";
|
||||||
desc = "Rename symbol";
|
desc = "Rename symbol";
|
||||||
@@ -131,21 +135,21 @@ in {
|
|||||||
# Diagnostics
|
# Diagnostics
|
||||||
{
|
{
|
||||||
key = "<leader>e";
|
key = "<leader>e";
|
||||||
mode = ["n"];
|
mode = [ "n" ];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua vim.diagnostic.open_float()<CR>";
|
action = "<cmd>lua vim.diagnostic.open_float()<CR>";
|
||||||
desc = "Show diagnostic";
|
desc = "Show diagnostic";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "[d";
|
key = "[d";
|
||||||
mode = ["n"];
|
mode = [ "n" ];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua vim.diagnostic.goto_prev()<CR>";
|
action = "<cmd>lua vim.diagnostic.goto_prev()<CR>";
|
||||||
desc = "Previous diagnostic";
|
desc = "Previous diagnostic";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "]d";
|
key = "]d";
|
||||||
mode = ["n"];
|
mode = [ "n" ];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua vim.diagnostic.goto_next()<CR>";
|
action = "<cmd>lua vim.diagnostic.goto_next()<CR>";
|
||||||
desc = "Next diagnostic";
|
desc = "Next diagnostic";
|
||||||
@@ -187,14 +191,14 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
languages = {
|
languages = {
|
||||||
# enableTreesitter = isLinux;
|
# enableTreesitter = isLinux;
|
||||||
enableTreesitter = true;
|
enableTreesitter = true;
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
format = {
|
format = {
|
||||||
enable = true;
|
enable = true;
|
||||||
type = ["alejandra"];
|
type = [ "alejandra" ];
|
||||||
#type = "nixfmt";
|
#type = "nixfmt";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user