Compare commits
4 commits
440bf3cbf8
...
fb7934e799
Author | SHA1 | Date | |
---|---|---|---|
fb7934e799 | |||
09cc4e6110 | |||
d2babf8808 | |||
7963190ef1 |
6 changed files with 21 additions and 39 deletions
|
@ -2,15 +2,10 @@
|
|||
{
|
||||
flake.nixosModules =
|
||||
let
|
||||
nvim-config =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
nvim-config = {
|
||||
imports = [
|
||||
inputs.nixvim.homeManagerModules.nixvim
|
||||
(import ../nvim {
|
||||
inherit (inputs) unstable;
|
||||
inherit (pkgs) system;
|
||||
})
|
||||
../nvim
|
||||
];
|
||||
};
|
||||
homeManagerModuleSandalone = import ../home {
|
||||
|
|
|
@ -3,20 +3,19 @@
|
|||
flake.overlays.nixvim = inputs.nixvim.overlays.default;
|
||||
|
||||
perSystem =
|
||||
{ pkgs, system, ... }:
|
||||
{ lib, system, ... }:
|
||||
let
|
||||
nixvimLib = inputs.nixvim.lib.${system};
|
||||
nixvim = inputs.nixvim.legacyPackages.${system};
|
||||
testNvimModule = nixvimLib.check.mkTestDerivationFromNixvimModule;
|
||||
nvimModule = extraConfig: {
|
||||
inherit pkgs;
|
||||
extraSpecialArgs = {
|
||||
inherit (inputs) unstable;
|
||||
inherit system;
|
||||
};
|
||||
pkgs = inputs.unstable.legacyPackages.${system};
|
||||
module = {
|
||||
imports = [ (import ../nvim/standalone.nix { standalone = true; }) ];
|
||||
config = extraConfig;
|
||||
imports = [ ../nvim/standalone.nix ];
|
||||
config = lib.mkMerge [
|
||||
{ performance.combinePlugins.enable = true; }
|
||||
extraConfig
|
||||
];
|
||||
};
|
||||
};
|
||||
moduleDev = nvimModule { };
|
||||
|
|
12
flake.lock
generated
12
flake.lock
generated
|
@ -281,11 +281,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1736916166,
|
||||
"narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
|
||||
"lastModified": 1737165118,
|
||||
"narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
|
||||
"rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -316,11 +316,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737143193,
|
||||
"narHash": "sha256-+/BdPFrdJpgmzrMEUZMxsLeND8IvFtjyZbxHX2XrNv4=",
|
||||
"lastModified": 1737200978,
|
||||
"narHash": "sha256-QTUx/F8HVjrRIHQxHKrr72aPMj+cDk18WTbvBCCBBdI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "aa839cf994f6b9a6b38e755597452087beac0567",
|
||||
"rev": "cbf960e5659054b2ccf27b67218782e69016bef5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
{ system, unstable }:
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
cfg = config.jhome.nvim;
|
||||
|
@ -7,9 +6,8 @@ in
|
|||
imports = [ ./options.nix ];
|
||||
|
||||
config.programs.nixvim = lib.mkMerge [
|
||||
(import ./standalone.nix { standalone = false; })
|
||||
(import ./standalone.nix)
|
||||
(lib.mkIf cfg.enable {
|
||||
nixpkgs = lib.mkForce { pkgs = import unstable { inherit system; }; };
|
||||
enable = true;
|
||||
defaultEditor = lib.mkDefault true;
|
||||
jhome.nvim = cfg;
|
||||
|
|
|
@ -15,7 +15,6 @@ let
|
|||
# "html" # Not writing html
|
||||
"jsonls"
|
||||
"marksman"
|
||||
"nixd"
|
||||
"ruff"
|
||||
"taplo"
|
||||
# "texlab" # Not using it
|
||||
|
|
|
@ -1,11 +1,4 @@
|
|||
{ standalone }:
|
||||
{
|
||||
pkgs,
|
||||
system,
|
||||
unstable,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./options.nix
|
||||
|
@ -17,7 +10,6 @@
|
|||
|
||||
config = {
|
||||
withRuby = false;
|
||||
nixpkgs = lib.optionalAttrs standalone { pkgs = unstable.legacyPackages.${system}; };
|
||||
globals.mapleader = " ";
|
||||
# Appearance
|
||||
colorschemes.gruvbox = {
|
||||
|
@ -50,7 +42,6 @@
|
|||
# Enable local configuration :h 'exrc'
|
||||
exrc = true; # safe since nvim 0.9
|
||||
};
|
||||
performance.combinePlugins.enable = true;
|
||||
extraPlugins =
|
||||
let
|
||||
plugins = pkgs.vimPlugins;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue