flake.nix

@@ -25,11 +25,7 @@
   };
 
   outputs =
-    {
+    { home-manager, nixpkgs, ... }@inputs:
-      home-manager,
-      nixpkgs,
-      ...
-    }@inputs:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};

modules/home-manager/programs/neovim/default.nix

@@ -6,21 +6,9 @@
 }:
 
 let
-  inherit (lib)
+  inherit (lib) types mkOption;
-    types
+  ollamaPackage =
-    mkOption
+    if config.programs.neovim.ollama.type == "amd" then pkgs.ollama-rocm else pkgs.ollama-cuda;
-    mkIf
-    mkEnableOption
-    ;
-
-  ollamaPackage = mkIf config.programs.neovim.ollama.enable (
-    if config.programs.neovim.ollama.type == "amd" then
-      pkgs.ollama-rocm
-    else if config.programs.neovim.ollama.type == "nvidia" then
-      pkgs.ollama-cuda
-    else
-      pkgs.ollama
-  );
 in
 {
   options.programs.neovim = {
@@ -40,22 +28,20 @@ in
       };
     };
 
-    ollama = {
+    ollama.type = mkOption {
-      enable = mkEnableOption "enable";
+      default = "amd";
-      type = mkOption {
+      description = "The type of ollama package to install, AMD GPU accelerated or NVIDIA GPU accelerated.";
-        default = "amd";
+      example = "amd";
-        description = "The type of ollama package to install, AMD GPU accelerated or NVIDIA GPU accelerated.";
+      type = types.enum [
-        example = "amd";
+        "amd"
-        type = types.enum [
+        "nvidia"
-          "amd"
+      ];
-          "nvidia"
-        ];
-      };
     };
   };
 
   config = {
     programs.neovim = {
+      enable = true;
       withNodeJs = true;
       withPython3 = true;
 

specific/desktop/home-manager.nix

@@ -42,10 +42,10 @@
           ## Start wallpaper daemon and set one.
           #
           OUTPUT_1="DP-2"
-          IMAGE_1="/mnt/internal/personal/wallpapers/edited/1440-bicycle.jpg"
+          IMAGE_1="/mnt/internal/personal/wallpapers/wallhaven-vqlvm8.jpg"
 
           OUTPUT_2="DP-3"
-          IMAGE_2="/mnt/internal/personal/wallpapers/edited/1080-bycicle.jpg"
+          IMAGE_2="/mnt/internal/personal/wallpapers/wallhaven-2yl6px.jpg"
 
           function load_wallpapers() {
             swww img -t any --transition-bezier 0.0,0.0,1.0,1.0 --transition-duration .8 --transition-step 255 --transition-fps 60 -o $OUTPUT_1 $IMAGE_1;
@@ -117,10 +117,6 @@
   # MODULES #
   #
 
-  programs.neovim = {
-    enable = true;
-  };
-
   modules.hyprland = {
     # Enable scripts
     scripts = {

specific/laptop/home-manager.nix

@@ -106,13 +106,8 @@
   # MODULES #
   #
 
-  # Enable neovim
+  # Set the hostname for nixd in neovim
-  programs.neovim = {
+  programs.neovim.nixd.hostname = "wizlap";
-    enable = true;
-
-    # Set the hostname for nixd in neovim
-    nixd.hostname = "wizlap";
-  };
 
   # Add monitor configuration to hyprland
   modules.hyprland = {