7 files changed, 17 insertions, 17 deletions
diff --git a/modules/tools/editor/neovim/default.nix b/modules/tools/editor/neovim/default.nix
index 64f2600..7d257ba 100644
--- a/modules/tools/editor/neovim/default.nix
+++ b/modules/tools/editor/neovim/default.nix
@@ -3,13 +3,13 @@
 {
 	options.tools.editor.neovim = {
 		enable = lib.mkEnableOption "Enables neovim.";
-		configuration = lib.mkOption {
+		profile = lib.mkOption {
 			type = lib.types.enum [
 				"minimal"
 				"full"
 			];
 			default = "minimal";
-			description = "The configuration for neovim to use.";
+			description = "The profile for neovim to use.";
 		};
 	};
 
diff --git a/modules/tools/editor/neovim/plugins/config/default.nix b/modules/tools/editor/neovim/plugins/config/default.nix
index bf8b0ef..cfc54cb 100644
--- a/modules/tools/editor/neovim/plugins/config/default.nix
+++ b/modules/tools/editor/neovim/plugins/config/default.nix
@@ -1,7 +1,7 @@
 { config }:
 
 let
-	extra = if config.tools.editor.neovim.configuration == "full" then
+	fullExtra = if config.tools.editor.neovim.profile == "full" then
 ''
 ${builtins.readFile ./lsp-config.lua}
 ${builtins.readFile ./dressing.lua}
@@ -21,5 +21,5 @@ ${builtins.readFile (config.scheme {
 	template = builtins.readFile ./base16.mustache.lua;
 })}
 ${builtins.readFile ./nvim-tree.lua}
-${extra}
+${fullExtra}
 ''
diff --git a/modules/tools/editor/neovim/plugins/default.nix b/modules/tools/editor/neovim/plugins/default.nix
index 61c046c..7081bda 100644
--- a/modules/tools/editor/neovim/plugins/default.nix
+++ b/modules/tools/editor/neovim/plugins/default.nix
@@ -15,7 +15,7 @@
 				patchPhase = "ln -s ${config.scheme base16-vim} colors/base16-scheme.vim";
 			}))
 		]
-		(if config.tools.editor.neovim.configuration == "full" then
+		(if config.tools.editor.neovim.profile == "full" then
 			[
 				noice-nvim
 				dressing-nvim
diff --git a/modules/tools/file-manager/lf/default.nix b/modules/tools/file-manager/lf/default.nix
index 755ccd7..2fab997 100644
--- a/modules/tools/file-manager/lf/default.nix
+++ b/modules/tools/file-manager/lf/default.nix
@@ -8,9 +8,9 @@
 	config = lib.mkIf config.tools.file-manager.lf.enable {
 		tools.file-manager.default = lib.mkDefault "lf";
 		tools.file-manager.command =
-			if config.tools.file-manager.default == "lf" then
-				lib.mkForce "${pkgs.lf}/bin/lf"
-			else "";
+			lib.mkIf
+				(config.tools.file-manager.default == "lf")
+				"${pkgs.lf}/bin/lf";
 
 		programs.lf.enable = true;
 		programs.lf.settings = {
diff --git a/modules/tools/file-manager/nnn/default.nix b/modules/tools/file-manager/nnn/default.nix
index 7426153..a41096c 100644
--- a/modules/tools/file-manager/nnn/default.nix
+++ b/modules/tools/file-manager/nnn/default.nix
@@ -11,9 +11,9 @@
 	in lib.mkIf config.tools.file-manager.nnn.enable {
 		tools.file-manager.default = lib.mkDefault "nnn";
 		tools.file-manager.command =
-			if config.tools.file-manager.default == "nnn" then
-				lib.mkForce "${nnnWithNerdIcons}/bin/nnn -H -d"
-			else "";
+			lib.mkIf
+				(config.tools.file-manager.default == "nnn")
+				"${nnnWithNerdIcons}/bin/nnn -H -d";
 
 		programs.nnn.enable = true;
 		programs.nnn.package = nnnWithNerdIcons;
diff --git a/modules/tools/terminal/alacritty/default.nix b/modules/tools/terminal/alacritty/default.nix
index 8f0aaf4..fa3c080 100644
--- a/modules/tools/terminal/alacritty/default.nix
+++ b/modules/tools/terminal/alacritty/default.nix
@@ -9,9 +9,9 @@
 		programs.alacritty.enable = true;
 		tools.terminal.default = lib.mkDefault "alacritty";
 		tools.terminal.command =
-			if config.tools.terminal.default == "alacritty" then
-				lib.mkForce "${pkgs.alacritty}/bin/alacritty"
-			else "";
+			lib.mkIf
+				(config.tools.terminal.default == "alacritty")
+				"${pkgs.alacritty}/bin/alacritty";
 
 		programs.alacritty.settings = {
 			window = {
diff --git a/modules/tools/terminal/kitty/default.nix b/modules/tools/terminal/kitty/default.nix
index 5508feb..0cb49d8 100644
--- a/modules/tools/terminal/kitty/default.nix
+++ b/modules/tools/terminal/kitty/default.nix
@@ -15,9 +15,9 @@
 		programs.kitty.enable = true;
 		tools.terminal.default = lib.mkDefault "kitty";
 		tools.terminal.command =
-			if config.tools.terminal.default == "kitty" then
-				lib.mkForce "${pkgs.kitty}/bin/kitty"
-			else "";
+			lib.mkIf
+				(config.tools.terminal.default == "kitty")
+				"${pkgs.kitty}/bin/kitty";
 
 		programs.kitty.settings = with config.scheme.withHashtag; {
 			window_padding_width = config.desktop.window-manager.gap;