feat: neovim

flake/config.nix

@@ -20,7 +20,6 @@
           inherit inputs;
         })
         (import ./overlays/jetbrains.nix {inherit inputs;})
-        (import ./overlays/marleyvim.nix {inherit inputs;})
         (import ./overlays/wezterm.nix {inherit inputs;})
       ];
     };

modules/base/default.nix

@@ -7,6 +7,7 @@
 
     ./programs
 
+    ./profiles.nix
     ./home.nix
   ];
 }

modules/base/profiles.nix

@@ -0,0 +1,28 @@
+{
+  config,
+  marleylib,
+  lib,
+  ...
+}: let
+  cfg = config.marleycfg.profiles;
+
+  inherit (marleylib.module) enabled;
+in {
+  marleyos = lib.mkMerge [
+    # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    {
+      programs = {
+        fish = enabled;
+        neovim = enabled;
+      };
+    }
+    #
+    #
+    # Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    (lib.optionalAttrs cfg.desktop {})
+    #
+    #
+    # Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    (lib.optionalAttrs cfg.server {})
+  ];
+}

modules/base/programs/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
     ./fish.nix
+    ./neovim.nix
   ];
 }

modules/base/programs/neovim.nix

@@ -9,14 +9,8 @@ in {
   options.marleyos.programs.neovim.enable = lib.mkEnableOption "neovim";
 
   config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
-      nvim
+      neovim
     ];
-
-    home.sessionVariables = rec {
-      EDITOR = "nvim";
-      VISUAL = "${EDITOR}";
-      SUDO_EDITOR = "${EDITOR}";
-    };
   };
 }

modules/home/profiles.nix

@@ -42,6 +42,7 @@ in {
         glow = enabled;
         nemo = enabled;
         neo = enabled;
+        neovim = enabled;
       };
 
       services = {

modules/home/programs/default.nix

@@ -22,6 +22,7 @@
     ./man.nix
     ./nemo.nix
     ./neo.nix
+    ./neovim.nix
     ./nh.nix
     ./waybar.nix
 

modules/home/programs/neovim.nix

@@ -0,0 +1,33 @@
+{
+  marleylib,
+  config,
+  osConfig,
+  lib,
+  inputs,
+  pkgs,
+  ...
+}: let
+  inherit (marleylib.module) mkEnableOption';
+
+  cfg = config.marleyos.programs.neovim;
+  osCfg = osConfig.marleyos.programs.neovim;
+in {
+  options.marleyos.programs.neovim.enable =
+    mkEnableOption' "neovim" osCfg.enable;
+
+  config = lib.mkIf cfg.enable {
+    nixpkgs.overlays = [
+      (import ../../../overlays/marleyvim.nix {inherit inputs;})
+    ];
+
+    home.packages = with pkgs; [
+      nvim
+    ];
+
+    home.sessionVariables = rec {
+      EDITOR = "nvim";
+      VISUAL = "${EDITOR}";
+      SUDO_EDITOR = "${EDITOR}";
+    };
+  };
+}