From f6fece5fdf0b5987625942cc4956b0242c791f19 Mon Sep 17 00:00:00 2001 From: Arthur Wambst Date: Sat, 22 Feb 2025 13:44:05 +0100 Subject: [PATCH] temp update --- flake.lock | 18 +++++++++--------- flake.nix | 3 +-- modules/nvim/nvim.nix | 12 ++++++++++++ modules/nvim/theme.nix | 1 - 4 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 modules/nvim/nvim.nix diff --git a/flake.lock b/flake.lock index eff62f1..42e5ae5 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740097334, - "narHash": "sha256-m7w1Cpi9FqeFkTiwJT4/2oEOd08jHyftGZH4JQNFwlY=", + "lastModified": 1740184342, + "narHash": "sha256-1mGvCI3KlJPcnK+ttaGhvMfzhvTdt7AjMPSoGd/coII=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6d35f4af8befccf1764401509b320c117b043570", + "rev": "1b313b2d3fafd50aaf06733cc8753660068ec19b", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1740095130, - "narHash": "sha256-B+4iJ5It0sgV1oNsHTJtna38J+1RkXHbsJylPlDHBuY=", + "lastModified": 1740181035, + "narHash": "sha256-B0IflO5lsfiP5N7NOzEOWTOkWpm8Gw2eh+PHpQaxByY=", "owner": "neovim", "repo": "neovim", - "rev": "1fb606b2ff68b42f77aad6f9a6e00c37e1b2aab0", + "rev": "db2c3d1143fb5888602a2cee84578bd8a9c88bd7", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740170230, - "narHash": "sha256-Clnn2Y+bx4LI2caUqtCxaYKKRLC4ifXVSgVZKJIskFA=", + "lastModified": 1740227205, + "narHash": "sha256-+9I4UReULsZXKv0Sz8am6tlT5YECoMyRLngERYAsuPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1c5d6d23fd57011b78cb2424f5c73e68c9e8879", + "rev": "23ac1740c3d4c5923f45cec26a08020e052f9fd7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0ef3a68..09dd9d5 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,6 @@ }; }; outputs = { self, nixpkgs, neovim, ... }@inputs: { - nixosModules.neovim = import ./modules/nvim/theme.nix; - + nixosModules.neovim = import ./modules/nvim/nvim.nix; }; } diff --git a/modules/nvim/nvim.nix b/modules/nvim/nvim.nix new file mode 100644 index 0000000..feba572 --- /dev/null +++ b/modules/nvim/nvim.nix @@ -0,0 +1,12 @@ +{ config, pkgs, lib, inputs, ... }: +with lib; { + options.nvim = { + enable = lib.mkEnableOption "Enable Neovim"; + }; + config = lib.mkIf config.nvim.enable { + environment.systemPackages = [ pkgs.neovim ]; + + # Import the theme module automatically if it's available + imports = [ ./theme.nix ]; + }; +} diff --git a/modules/nvim/theme.nix b/modules/nvim/theme.nix index c1ce801..95644d1 100644 --- a/modules/nvim/theme.nix +++ b/modules/nvim/theme.nix @@ -16,7 +16,6 @@ with lib; { environment.systemPackages = [ inputs.neovim.packages.${pkgs.system}.neovim ]; programs.neovim = { - enable = true; configure = { customRC = '' " Add Dracula to runtimepath