diff --git a/flake.nix b/flake.nix index cea4163..caaf3d0 100644 --- a/flake.nix +++ b/flake.nix @@ -25,11 +25,7 @@ }; outputs = - { - home-manager, - nixpkgs, - ... - }@inputs: + { home-manager, nixpkgs, ... }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; diff --git a/modules/home-manager/programs/neovim/default.nix b/modules/home-manager/programs/neovim/default.nix index 45132f7..224c365 100644 --- a/modules/home-manager/programs/neovim/default.nix +++ b/modules/home-manager/programs/neovim/default.nix @@ -6,21 +6,9 @@ }: let - inherit (lib) - types - mkOption - 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 - ); + inherit (lib) types mkOption; + ollamaPackage = + if config.programs.neovim.ollama.type == "amd" then pkgs.ollama-rocm else pkgs.ollama-cuda; in { options.programs.neovim = { @@ -40,22 +28,20 @@ in }; }; - ollama = { - enable = mkEnableOption "enable"; - type = mkOption { - default = "amd"; - description = "The type of ollama package to install, AMD GPU accelerated or NVIDIA GPU accelerated."; - example = "amd"; - type = types.enum [ - "amd" - "nvidia" - ]; - }; + ollama.type = mkOption { + default = "amd"; + description = "The type of ollama package to install, AMD GPU accelerated or NVIDIA GPU accelerated."; + example = "amd"; + type = types.enum [ + "amd" + "nvidia" + ]; }; }; config = { programs.neovim = { + enable = true; withNodeJs = true; withPython3 = true; diff --git a/specific/desktop/home-manager.nix b/specific/desktop/home-manager.nix index 1a44a7a..18201c4 100644 --- a/specific/desktop/home-manager.nix +++ b/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 = { diff --git a/specific/laptop/home-manager.nix b/specific/laptop/home-manager.nix index ae2073f..dd25a51 100644 --- a/specific/laptop/home-manager.nix +++ b/specific/laptop/home-manager.nix @@ -106,13 +106,8 @@ # MODULES # # - # Enable neovim - programs.neovim = { - enable = true; - - # Set the hostname for nixd in neovim - nixd.hostname = "wizlap"; - }; + # Set the hostname for nixd in neovim + programs.neovim.nixd.hostname = "wizlap"; # Add monitor configuration to hyprland modules.hyprland = {