nvim
This commit is contained in:
Philipp Hochkamp
parent
064848f34b
commit
55aa43585e
3 changed files with 116 additions and 185 deletions
120
flake.lock
generated
120
flake.lock
generated
|
|
@ -78,11 +78,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1651916036,
|
||||
"narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=",
|
||||
"lastModified": 1657835815,
|
||||
"narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba",
|
||||
"rev": "54a24f042f93c79f5679f133faddedec61955cf2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -98,11 +98,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1657769861,
|
||||
"narHash": "sha256-id1oLAYQpaezrNHj7/2s/XPcaXftPbtiaHHIEywpCi4=",
|
||||
"lastModified": 1657966905,
|
||||
"narHash": "sha256-hx93a72CpMs+Bdag02m9qpw0fwcekbu3Icf6v3c4rU4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "27297eece41ecca4b26cd7dcb0af665bf1fca0e4",
|
||||
"rev": "91804f38a4d3c41914d579ac1cb6a35785405c14",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -111,22 +111,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1650374568,
|
||||
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1656928814,
|
||||
|
|
@ -142,21 +126,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1644229661,
|
||||
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -165,11 +134,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1657719085,
|
||||
"narHash": "sha256-nQt3MEBwKuKlmFKSRhdoh60AGlc+YlspV5e8kO/3y8U=",
|
||||
"lastModified": 1657887110,
|
||||
"narHash": "sha256-8VV0/kZed2z8fGtEc2zr+WLxTow+JTIlMjnSisyv0GQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2c94b9801f1a11cde0fc97aa850687bb9137d42c",
|
||||
"rev": "4c5106ed0f3168ff2df21b646aef67e86cbfc11c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -214,52 +183,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"neovim-flake": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"neovim-nightly-overlay",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"dir": "contrib",
|
||||
"lastModified": 1657783262,
|
||||
"narHash": "sha256-dKaxv6EqHRZ54lNuY449YL8VTwUgXLCBwBEUrCvgixE=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "b81d1eb26502f403574113385a75444f8880828e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "contrib",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"neovim-nightly-overlay": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"neovim-flake": "neovim-flake",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1657786622,
|
||||
"narHash": "sha256-stsAKo9dnuU0YIKT7c6bV5a6F2yX7P2Rm5Acpa7pTfk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"rev": "758fb91ada20563788d3081dc708d570a99e4c96",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1657781616,
|
||||
|
|
@ -278,11 +201,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1657674999,
|
||||
"narHash": "sha256-RRQLkC3aGEf4ySAUQT08K0EPnsf6IW02QIy8yPLD3jw=",
|
||||
"lastModified": 1657888067,
|
||||
"narHash": "sha256-GnwJoFBTPfW3+mz7QEeJEEQ9OMHZOiIJ/qDhZxrlKh8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "01b8587401f41aecd4b77aa9698c0cba65a38882",
|
||||
"rev": "65fae659e31098ca4ac825a6fef26d890aaf3f4e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -292,11 +215,11 @@
|
|||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1657788841,
|
||||
"narHash": "sha256-ptRhna1IPv5NTPBUb9B0RdUoSBHL+iZM41Th1gzO3wE=",
|
||||
"lastModified": 1657973174,
|
||||
"narHash": "sha256-2te3Dfpo+OlhfswbH9uKwXb12gRE81F3Z7OBEwmAtpA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1f5af608e7bab7b67b47ceafcc5668e34afaae83",
|
||||
"rev": "f2dba019c6617db6299b2f3138e19344daf730fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -308,11 +231,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1657533762,
|
||||
"narHash": "sha256-/cxTFSMmpAb8tBp1yVga1fj+i8LB9aAxnMjYFpRMuVs=",
|
||||
"lastModified": 1657802959,
|
||||
"narHash": "sha256-9+JWARSdlL8KiH3ymnKDXltE1vM+/WEJ78F5B1kjXys=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "38860c9e91cb00f4d8cd19c7b4e36c45680c89b5",
|
||||
"rev": "4a01ca36d6bfc133bc617e661916a81327c9bbc8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -386,7 +309,6 @@
|
|||
"emacs-overlay": "emacs-overlay",
|
||||
"home-manager": "home-manager",
|
||||
"impermanence": "impermanence",
|
||||
"neovim-nightly-overlay": "neovim-nightly-overlay",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
|
|
@ -452,11 +374,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1657788831,
|
||||
"narHash": "sha256-GV8eGOCHrlzViMLFbTbrLeLOYD7mwLoGNUNsVSFVj7Y=",
|
||||
"lastModified": 1657974444,
|
||||
"narHash": "sha256-eoVxwb390esfsAnrebljxGK2LhuzARhMLrf3odGr3fI=",
|
||||
"owner": "thexyno",
|
||||
"repo": "blog",
|
||||
"rev": "696a626e1b6fd09c66f667c5caeaaa34e8e13c0c",
|
||||
"rev": "d3192ed59da0fc29b1505407317e6689c1dbbd7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
39
flake.nix
39
flake.nix
|
|
@ -19,8 +19,8 @@
|
|||
emacs-overlay.url = "github:nix-community/emacs-overlay";
|
||||
|
||||
## vim
|
||||
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||
neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||
#neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||
#neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||
coc-nvim.url = "github:neoclide/coc.nvim/release";
|
||||
coc-nvim.flake = false;
|
||||
nnn-vim.url = "github:mcchrish/nnn.vim";
|
||||
|
|
@ -42,7 +42,19 @@
|
|||
agkozak-zsh-prompt.flake = false;
|
||||
};
|
||||
|
||||
outputs = inputs @ { self, nixpkgs, nixpkgs-master, agenix, home-manager, impermanence, darwin, utils, emacs-overlay, neovim-nightly-overlay, ... }:
|
||||
outputs =
|
||||
inputs @ { self
|
||||
, nixpkgs
|
||||
, nixpkgs-master
|
||||
, agenix
|
||||
, home-manager
|
||||
, impermanence
|
||||
, darwin
|
||||
, utils
|
||||
, emacs-overlay
|
||||
, # neovim-nightly-overlay,
|
||||
...
|
||||
}:
|
||||
let
|
||||
extraSystems = [ ];
|
||||
lib = nixpkgs.lib.extend (self: super: {
|
||||
|
|
@ -54,11 +66,8 @@
|
|||
config.allowUnfree = true;
|
||||
overlays = [
|
||||
self.overlay
|
||||
neovim-nightly-overlay.overlay
|
||||
# neovim-nightly-overlay.overlay
|
||||
emacs-overlay.overlay
|
||||
(final: prev: {
|
||||
my = self.packages.${prev.system};
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -84,7 +93,7 @@
|
|||
networking.hostName = hostName;
|
||||
system.configurationRevision = rev;
|
||||
services.getty.greetingLine =
|
||||
"<<< Welcome to ${config.system.nixos.label} @ ${rev} - Please leave\\l >>>";
|
||||
"<<< Welcome to ${config.system.nixos.label} @ ${rev} - Please leave \\l >>>";
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
|
|
@ -147,11 +156,11 @@
|
|||
};
|
||||
|
||||
} // utils.lib.eachDefaultSystem (system:
|
||||
let pkgs = nixpkgs.legacyPackages.${system}; in
|
||||
{
|
||||
devShell = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [ lefthook nixpkgs-fmt ];
|
||||
};
|
||||
packages = lib.my.mapModules ./packages (p: pkgs.callPackage p { inputs = inputs; });
|
||||
});
|
||||
let pkgs = nixpkgs.legacyPackages.${system}; in
|
||||
{
|
||||
devShell = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [ lefthook nixpkgs-fmt ];
|
||||
};
|
||||
packages = lib.my.mapModules ./packages (p: pkgs.callPackage p { inputs = inputs; });
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,73 +1,73 @@
|
|||
{pkgs, config, inputs, ...}:
|
||||
{ pkgs, config, inputs, ... }:
|
||||
{
|
||||
home.packages = with pkgs;[
|
||||
python3 # ultisnips
|
||||
lazygit
|
||||
nodejs
|
||||
inputs.rnix-lsp.packages."${pkgs.system}".rnix-lsp
|
||||
shfmt
|
||||
shellcheck
|
||||
vim-vint
|
||||
nodePackages.write-good
|
||||
ctags
|
||||
];
|
||||
home.file.".config/nvim".source = ./config;
|
||||
home.file.".config/nvim".recursive = true;
|
||||
programs.neovim =
|
||||
let
|
||||
conf = inputs.self.nixosConfigurations.enterprise.config.programs.neovim.configure;
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
package = pkgs.neovim-nightly;
|
||||
extraConfig = ''
|
||||
set runtimepath^=~/.config/nvim
|
||||
lua dofile('${./config/nvim.lua}')
|
||||
'';
|
||||
vimAlias = true;
|
||||
viAlias = true;
|
||||
plugins =
|
||||
let
|
||||
nnn-vim = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "nnn-vim";
|
||||
src = inputs.nnn-vim;
|
||||
};
|
||||
coc-nvim = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "coc-nvim";
|
||||
src = inputs.coc-nvim;
|
||||
};
|
||||
dart-vim = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "dart-vim";
|
||||
src = inputs.dart-vim;
|
||||
};
|
||||
in
|
||||
map (x: { plugin = x; }) (with pkgs.vimPlugins; [
|
||||
vim-tmux-navigator
|
||||
galaxyline-nvim
|
||||
nvim-web-devicons
|
||||
nnn-vim
|
||||
rainbow
|
||||
vista-vim
|
||||
polyglot
|
||||
vim-commentary
|
||||
vim-table-mode
|
||||
vim-speeddating
|
||||
vim-nix
|
||||
gruvbox
|
||||
incsearch-vim
|
||||
vim-highlightedyank
|
||||
vim-fugitive
|
||||
fzf-vim
|
||||
lualine-nvim
|
||||
fzfWrapper
|
||||
vim-devicons
|
||||
toggleterm-nvim
|
||||
undotree
|
||||
vim-pandoc
|
||||
vim-pandoc-syntax
|
||||
ultisnips
|
||||
coc-nvim
|
||||
dart-vim
|
||||
]);
|
||||
};
|
||||
home.packages = with pkgs;[
|
||||
python3 # ultisnips
|
||||
lazygit
|
||||
nodejs
|
||||
inputs.rnix-lsp.packages."${pkgs.system}".rnix-lsp
|
||||
shfmt
|
||||
shellcheck
|
||||
vim-vint
|
||||
nodePackages.write-good
|
||||
ctags
|
||||
];
|
||||
home.file.".config/nvim".source = ./config;
|
||||
home.file.".config/nvim".recursive = true;
|
||||
programs.neovim =
|
||||
let
|
||||
conf = inputs.self.nixosConfigurations.enterprise.config.programs.neovim.configure;
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
#package = pkgs.neovim-nightly;
|
||||
extraConfig = ''
|
||||
set runtimepath^=~/.config/nvim
|
||||
lua dofile('${./config/nvim.lua}')
|
||||
'';
|
||||
vimAlias = true;
|
||||
viAlias = true;
|
||||
plugins =
|
||||
let
|
||||
nnn-vim = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "nnn-vim";
|
||||
src = inputs.nnn-vim;
|
||||
};
|
||||
coc-nvim = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "coc-nvim";
|
||||
src = inputs.coc-nvim;
|
||||
};
|
||||
dart-vim = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "dart-vim";
|
||||
src = inputs.dart-vim;
|
||||
};
|
||||
in
|
||||
map (x: { plugin = x; }) (with pkgs.vimPlugins; [
|
||||
vim-tmux-navigator
|
||||
galaxyline-nvim
|
||||
nvim-web-devicons
|
||||
nnn-vim
|
||||
rainbow
|
||||
vista-vim
|
||||
polyglot
|
||||
vim-commentary
|
||||
vim-table-mode
|
||||
vim-speeddating
|
||||
vim-nix
|
||||
gruvbox
|
||||
incsearch-vim
|
||||
vim-highlightedyank
|
||||
vim-fugitive
|
||||
fzf-vim
|
||||
lualine-nvim
|
||||
fzfWrapper
|
||||
vim-devicons
|
||||
toggleterm-nvim
|
||||
undotree
|
||||
vim-pandoc
|
||||
vim-pandoc-syntax
|
||||
ultisnips
|
||||
coc-nvim
|
||||
dart-vim
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue