diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 614641f8..4a929825 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,7 +1,6 @@ { imports = [ ./files/mutable-files.nix - ./programs/neovide.nix ./programs/pipewire.nix ./programs/pop-launcher.nix ./programs/zed-editor.nix diff --git a/modules/home-manager/programs/neovide.nix b/modules/home-manager/programs/neovide.nix deleted file mode 100644 index 7af3f55c..00000000 --- a/modules/home-manager/programs/neovide.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.programs.neovide; - - settingsFormat = pkgs.formats.toml { }; -in -{ - options.programs.neovide = { - enable = lib.mkEnableOption "Neovide, a graphical interface for Neovim"; - - package = lib.mkPackageOption pkgs "neovide" { }; - - settings = lib.mkOption { - type = settingsFormat.type; - description = '' - The settings to be generated at - {file}`$XDG_CONFIG_HOME/neovide/config.toml`. - ''; - default = { }; - example = { - maximized = true; - - font = { - normal = [ "MonoLisa Nerd Font" ]; - size = 18; - features.MonoLisa = [ - "+ss01" - "+ss07" - "+ss11" - "-calt" - "+ss09" - "+ss02" - "+ss14" - "+ss16" - "+ss17" - ]; - }; - }; - }; - }; - - config = lib.mkIf cfg.enable (lib.mkMerge [ - { - home.packages = [ cfg.package ]; - } - - (lib.mkIf (cfg.settings != { }) { - xdg.configFile."neovide/config.toml".source = - settingsFormat.generate "home-manager-neovide-settings" cfg.settings; - }) - ]); -} diff --git a/tests/modules/home-manager/default.nix b/tests/modules/home-manager/default.nix index 6c15faa3..2f3a1e5a 100644 --- a/tests/modules/home-manager/default.nix +++ b/tests/modules/home-manager/default.nix @@ -54,7 +54,6 @@ import nmt { # TODO: Fix nmt to accept specialArgs or something. tests = builtins.foldl' (a: b: a // (import b)) { } ([ #./programs/borgmatic - ./programs/neovide ./programs/pipewire ./programs/pop-launcher ./programs/zed-editor diff --git a/tests/modules/home-manager/programs/neovide/basic.nix b/tests/modules/home-manager/programs/neovide/basic.nix deleted file mode 100644 index da6e7378..00000000 --- a/tests/modules/home-manager/programs/neovide/basic.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, lib, ... }: { - programs.neovide = { - enable = true; - settings = { - maximized = true; - font = { - normal = [ "MonoLisa Nerd Font" ]; - size = 18; - features.MonoLisa = [ - "+ss01" - "+ss07" - "+ss11" - "-calt" - "+ss09" - "+ss02" - "+ss14" - "+ss16" - "+ss17" - ]; - }; - }; - }; - - test.stubs.neovide = { }; - - nmt.script = '' - assertFileExists home-files/.config/neovide/config.toml - ''; -} diff --git a/tests/modules/home-manager/programs/neovide/default.nix b/tests/modules/home-manager/programs/neovide/default.nix deleted file mode 100644 index efc88eb3..00000000 --- a/tests/modules/home-manager/programs/neovide/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - neovide-basic-settings = ./basic.nix; - neovide-empty-settings = ./empty-settings.nix; -} diff --git a/tests/modules/home-manager/programs/neovide/empty-settings.nix b/tests/modules/home-manager/programs/neovide/empty-settings.nix deleted file mode 100644 index 11cfdebc..00000000 --- a/tests/modules/home-manager/programs/neovide/empty-settings.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: - -{ - programs.neovide.enable = true; - - test.stubs.neovide = { }; - - nmt.script = '' - assertPathNotExists home-files/.config/neovide/config.toml - ''; -}