fix: overlays

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/home.nix

@@ -1,5 +1,6 @@
 {
   marleylib,
+  inputs,
   inputs',
   ...
 }: let
@@ -23,7 +24,7 @@ in {
       };
 
       sharedModules = [../home];
-      extraSpecialArgs = {inherit marleylib inputs';};
+      extraSpecialArgs = {inherit marleylib inputs inputs';};
     };
   };
 }

modules/base/profiles.nix

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

modules/base/programs/default.nix

@@ -1,5 +1,9 @@
 {
   imports = [
+    ./curl.nix
     ./fish.nix
+    ./jq.nix
+    ./less.nix
+    ./neovim.nix
   ];
 }

modules/base/programs/neovim.nix

@@ -0,0 +1,22 @@
+{
+  lib,
+  config,
+  inputs,
+  pkgs,
+  ...
+}: let
+  cfg = config.marleyos.programs.neovim;
+in {
+  options.marleyos.programs.neovim.enable = lib.mkEnableOption "neovim";
+
+  config = lib.mkIf cfg.enable {
+    # Has to be applied on the OS level to use in HM.
+    nixpkgs.overlays = [
+      (import ../../../overlays/marleyvim.nix {inherit inputs;})
+    ];
+
+    environment.systemPackages = with pkgs; [
+      neovim
+    ];
+  };
+}

modules/darwin/default.nix

@@ -9,5 +9,7 @@
 
     ./system
     ./programs
+
+    ./profiles.nix
   ];
 }

modules/darwin/profiles.nix

@@ -0,0 +1,12 @@
+{marleylib, ...}: let
+  inherit (marleylib.module) enabled;
+in {
+  marleyos = {
+    programs = {
+      fish = enabled;
+      nh = enabled;
+      wezterm = enabled;
+      wireguard = enabled;
+    };
+  };
+}

modules/darwin/programs/default.nix

@@ -1,6 +1,7 @@
 {
   imports = [
     ./fish.nix
+    ./nh.nix
     ./wezterm.nix
     ./wireguard.nix
   ];

modules/darwin/programs/nh.nix

@@ -1,11 +1,10 @@
 {
-  lib,
   config,
+  lib,
   pkgs,
   ...
 }: let
   cfg = config.marleyos.programs.nh;
-  home = config.home.homeDirectory;
 in {
   options.marleyos.programs.nh.enable = lib.mkEnableOption "nh";
 
@@ -13,11 +12,5 @@ in {
     home.packages = with pkgs; [
       nh
     ];
-
-    home.sessionVariables.FLAKE = lib.mkDefault "${home}/marleyos";
-
-    home.shellAbbrs = {
-      nhs = "nh search";
-    };
   };
 }

modules/home/profiles.nix

@@ -25,6 +25,7 @@ in {
         jq = enabled;
         just = enabled;
         less = enabled;
+        man = enabled;
         nh = enabled;
       };
     }
@@ -40,6 +41,8 @@ in {
         gh = enabled;
         glow = enabled;
         nemo = enabled;
+        neo = enabled;
+        neovim = enabled;
       };
 
       services = {

modules/home/programs/default.nix

@@ -19,7 +19,10 @@
     ./jq.nix
     ./just.nix
     ./less.nix
+    ./man.nix
     ./nemo.nix
+    ./neo.nix
+    ./neovim.nix
     ./nh.nix
     ./waybar.nix
 

modules/home/programs/man.nix

@@ -1,6 +1,6 @@
 {
-  lib,
   config,
+  lib,
   ...
 }: let
   cfg = config.marleyos.programs.man;
@@ -12,8 +12,11 @@ in {
 
     home.sessionVariables = {
       MANWIDTH = "80";
-      # TODO: Only set this is nvim is installed. Also install plugin here?
-      MANPAGER = "nvim +NoNeckPain '+set nowrap' +Man!";
+
+      MANPAGER =
+        lib.mkIf
+        config.marleyos.programs.neovim.enable
+        "nvim +NoNeckPain '+set nowrap' +Man!";
     };
   };
 }

modules/home/programs/neo.nix

@@ -1,6 +1,6 @@
 {
-  lib,
   config,
+  lib,
   pkgs,
   ...
 }: let

modules/home/programs/neovim.nix

@@ -1,12 +1,18 @@
 {
-  lib,
+  marleylib,
   config,
+  osConfig,
+  lib,
   pkgs,
   ...
 }: let
+  inherit (marleylib.module) mkEnableOption';
+
   cfg = config.marleyos.programs.neovim;
+  osCfg = osConfig.marleyos.programs.neovim;
 in {
-  options.marleyos.programs.neovim.enable = lib.mkEnableOption "neovim";
+  options.marleyos.programs.neovim.enable =
+    mkEnableOption' "neovim" osCfg.enable;
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [

modules/home/programs/nh.nix

@@ -15,6 +15,7 @@ in {
   config = lib.mkIf cfg.enable {
     programs.nh = {
       enable = true;
+
       clean =
         osConfig.programs.nh.clean
         or {
@@ -23,5 +24,11 @@ in {
           extraArgs = "--keep-since 7d --keep 3";
         };
     };
+
+    home.sessionVariables.FLAKE = "${config.home.homeDirectory}/marleyos";
+
+    home.shellAbbrs = {
+      nhs = "nh search";
+    };
   };
 }

modules/home/shell/niri.nix

@@ -4,7 +4,6 @@
   osConfig,
   lib,
   pkgs,
-  inputs,
   ...
 }: let
   inherit (marleylib.module) mkEnableOption' enabled;
@@ -23,8 +22,6 @@ in {
   };
 
   config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
-    nixpkgs.overlays = [inputs.niri-flake.overlays.niri];
-
     marleyos = {
       shell.wayland = enabled;
       programs = {

modules/nixos/profiles.nix

@@ -12,10 +12,7 @@ in {
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
-        curl = enabled;
         fish = enabled;
-        jq = enabled;
-        less = enabled;
         nh = enabled;
       };
 

modules/nixos/programs/default.nix

@@ -1,9 +1,6 @@
 {
   imports = [
-    ./curl.nix
     ./fish.nix
-    ./jq.nix
-    ./less.nix
     ./nh.nix
     ./waybar.nix
   ];