Compare commits

..

4 commits

Author SHA1 Message Date
fb7934e799
chore(deps): lock file maintenance
All checks were successful
/ check (nvimDev) (push) Successful in 8s
/ check (nvimHeadless) (push) Successful in 4s
/ check (nvimNoBundledBins) (push) Successful in 5s
/ check (nvimNoLsp) (push) Successful in 6s
/ check (nvimNoTSGrammars) (push) Successful in 5s
/ check (treefmt) (push) Successful in 3s
/ build (audiomenu) (push) Successful in 1s
/ build (docs) (push) Successful in 2s
/ build (jpassmenu) (push) Successful in 1s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 37s
/ build (nvim) (push) Successful in 9s
/ report-size (push) Successful in 1m8s
2025-01-19 00:00:31 +01:00
09cc4e6110
fix(nvim): don't combine plugins unless standalone
All checks were successful
/ check (nvimDev) (push) Successful in 5s
/ check (nvimHeadless) (push) Successful in 3s
/ check (nvimNoBundledBins) (push) Successful in 5s
/ check (nvimNoLsp) (push) Successful in 5s
/ check (nvimNoTSGrammars) (push) Successful in 5s
/ check (treefmt) (push) Successful in 2s
/ build (audiomenu) (push) Successful in 1s
/ build (docs) (push) Successful in 1s
/ build (jpassmenu) (push) Successful in 1s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 2s
/ build (nvim) (push) Successful in 2s
/ report-size (push) Successful in 4s
Its causing errors sadly T-T
2025-01-18 12:05:51 +01:00
d2babf8808
fix(nvim): remove nixd LSP
Some checks failed
/ check (nvimDev) (push) Successful in 10s
/ check (nvimHeadless) (push) Successful in 3s
/ check (nvimNoBundledBins) (push) Successful in 7s
/ check (nvimNoLsp) (push) Successful in 8s
/ check (nvimNoTSGrammars) (push) Successful in 8s
/ check (treefmt) (push) Successful in 2s
/ build (audiomenu) (push) Successful in 2s
/ build (docs) (push) Successful in 3s
/ build (jpassmenu) (push) Successful in 2s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Failing after 47s
/ build (nvim) (push) Successful in 13s
/ report-size (push) Has been skipped
It is now incompatible with Lix.
2025-01-18 11:46:01 +01:00
7963190ef1
fix(nvim): conflict with using global packages
Now it is an error to override the pkgs if global packages are being
used.
2025-01-18 11:41:26 +01:00
6 changed files with 21 additions and 39 deletions

View file

@ -2,17 +2,12 @@
{ {
flake.nixosModules = flake.nixosModules =
let let
nvim-config = nvim-config = {
{ pkgs, ... }: imports = [
{ inputs.nixvim.homeManagerModules.nixvim
imports = [ ../nvim
inputs.nixvim.homeManagerModules.nixvim ];
(import ../nvim { };
inherit (inputs) unstable;
inherit (pkgs) system;
})
];
};
homeManagerModuleSandalone = import ../home { homeManagerModuleSandalone = import ../home {
inherit nvim-config; inherit nvim-config;
inherit (inputs) stylix; inherit (inputs) stylix;

View file

@ -3,20 +3,19 @@
flake.overlays.nixvim = inputs.nixvim.overlays.default; flake.overlays.nixvim = inputs.nixvim.overlays.default;
perSystem = perSystem =
{ pkgs, system, ... }: { lib, system, ... }:
let let
nixvimLib = inputs.nixvim.lib.${system}; nixvimLib = inputs.nixvim.lib.${system};
nixvim = inputs.nixvim.legacyPackages.${system}; nixvim = inputs.nixvim.legacyPackages.${system};
testNvimModule = nixvimLib.check.mkTestDerivationFromNixvimModule; testNvimModule = nixvimLib.check.mkTestDerivationFromNixvimModule;
nvimModule = extraConfig: { nvimModule = extraConfig: {
inherit pkgs; pkgs = inputs.unstable.legacyPackages.${system};
extraSpecialArgs = {
inherit (inputs) unstable;
inherit system;
};
module = { module = {
imports = [ (import ../nvim/standalone.nix { standalone = true; }) ]; imports = [ ../nvim/standalone.nix ];
config = extraConfig; config = lib.mkMerge [
{ performance.combinePlugins.enable = true; }
extraConfig
];
}; };
}; };
moduleDev = nvimModule { }; moduleDev = nvimModule { };

12
flake.lock generated
View file

@ -281,11 +281,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736916166, "lastModified": 1737165118,
"narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -316,11 +316,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737143193, "lastModified": 1737200978,
"narHash": "sha256-+/BdPFrdJpgmzrMEUZMxsLeND8IvFtjyZbxHX2XrNv4=", "narHash": "sha256-QTUx/F8HVjrRIHQxHKrr72aPMj+cDk18WTbvBCCBBdI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "aa839cf994f6b9a6b38e755597452087beac0567", "rev": "cbf960e5659054b2ccf27b67218782e69016bef5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,4 +1,3 @@
{ system, unstable }:
{ lib, config, ... }: { lib, config, ... }:
let let
cfg = config.jhome.nvim; cfg = config.jhome.nvim;
@ -7,9 +6,8 @@ in
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config.programs.nixvim = lib.mkMerge [ config.programs.nixvim = lib.mkMerge [
(import ./standalone.nix { standalone = false; }) (import ./standalone.nix)
(lib.mkIf cfg.enable { (lib.mkIf cfg.enable {
nixpkgs = lib.mkForce { pkgs = import unstable { inherit system; }; };
enable = true; enable = true;
defaultEditor = lib.mkDefault true; defaultEditor = lib.mkDefault true;
jhome.nvim = cfg; jhome.nvim = cfg;

View file

@ -15,7 +15,6 @@ let
# "html" # Not writing html # "html" # Not writing html
"jsonls" "jsonls"
"marksman" "marksman"
"nixd"
"ruff" "ruff"
"taplo" "taplo"
# "texlab" # Not using it # "texlab" # Not using it

View file

@ -1,11 +1,4 @@
{ standalone }: { pkgs, ... }:
{
pkgs,
system,
unstable,
lib,
...
}:
{ {
imports = [ imports = [
./options.nix ./options.nix
@ -17,7 +10,6 @@
config = { config = {
withRuby = false; withRuby = false;
nixpkgs = lib.optionalAttrs standalone { pkgs = unstable.legacyPackages.${system}; };
globals.mapleader = " "; globals.mapleader = " ";
# Appearance # Appearance
colorschemes.gruvbox = { colorschemes.gruvbox = {
@ -50,7 +42,6 @@
# Enable local configuration :h 'exrc' # Enable local configuration :h 'exrc'
exrc = true; # safe since nvim 0.9 exrc = true; # safe since nvim 0.9
}; };
performance.combinePlugins.enable = true;
extraPlugins = extraPlugins =
let let
plugins = pkgs.vimPlugins; plugins = pkgs.vimPlugins;