flake/config.nix

@@ -20,6 +20,7 @@
           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,7 +7,6 @@
 
     ./programs
 
-    ./profiles.nix
     ./home.nix
   ];
 }

modules/base/home.nix

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

modules/base/profiles.nix

@@ -1,31 +0,0 @@
-{
-  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,9 +1,5 @@
 {
   imports = [
-    ./curl.nix
     ./fish.nix
-    ./jq.nix
-    ./less.nix
-    ./neovim.nix
   ];
 }

modules/base/programs/neovim.nix

@@ -1,22 +0,0 @@
-{
-  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,7 +9,5 @@
 
     ./system
     ./programs
-
-    ./profiles.nix
   ];
 }

modules/darwin/profiles.nix

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

modules/darwin/programs/default.nix

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

modules/home/profiles.nix

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

modules/home/programs/default.nix

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

modules/home/programs/nh.nix

@@ -15,7 +15,6 @@ in {
   config = lib.mkIf cfg.enable {
     programs.nh = {
       enable = true;
-
       clean =
         osConfig.programs.nh.clean
         or {
@@ -24,11 +23,5 @@ 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,6 +4,7 @@
   osConfig,
   lib,
   pkgs,
+  inputs,
   ...
 }: let
   inherit (marleylib.module) mkEnableOption' enabled;
@@ -22,6 +23,8 @@ 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,7 +12,10 @@ in {
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
+        curl = enabled;
         fish = enabled;
+        jq = enabled;
+        less = enabled;
         nh = enabled;
       };
 

modules/nixos/programs/default.nix

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

snowflake/modules/home/programs/cli/man/default.nix

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

snowflake/modules/home/programs/cli/neo/default.nix

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

snowflake/modules/home/programs/cli/nh/default.nix

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

snowflake/modules/home/programs/tui/neovim/default.nix

@@ -1,18 +1,12 @@
 {
-  marleylib,
-  config,
-  osConfig,
   lib,
+  config,
   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;
+  options.marleyos.programs.neovim.enable = lib.mkEnableOption "neovim";
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [