Many very minor changes.

9 files changed, 36 insertions, 8 deletions

diff --git a/modules/desktop/display-server/x11/default.nix b/modules/desktop/display-server/x11/default.nix
index b589c35..f1fd52a 100644
--- a/modules/desktop/display-server/x11/default.nix
+++ b/modules/desktop/display-server/x11/default.nix
@@ -2,6 +2,7 @@
 
 {
 	imports = [
+		./xclip
 		./xinit
 	];
 }
diff --git a/modules/desktop/display-server/x11/xclip/default.nix b/modules/desktop/display-server/x11/xclip/default.nix
new file mode 100644
index 0000000..7c97d60
--- /dev/null
+++ b/modules/desktop/display-server/x11/xclip/default.nix
@@ -0,0 +1,13 @@
+{ lib, config, pkgs, ... }:
+
+{
+	options.desktop.display-server.x11.xclip = {
+		enable = lib.mkEnableOption "Enables xclip.";
+	};
+
+	config = lib.mkIf config.desktop.display-server.x11.xclip.enable {
+		home.packages = with pkgs; [
+			xclip
+		];
+	};
+}
diff --git a/modules/desktop/display-server/x11/xinit/default.nix b/modules/desktop/display-server/x11/xinit/default.nix
index 7078ca2..6e82e2c 100644
--- a/modules/desktop/display-server/x11/xinit/default.nix
+++ b/modules/desktop/display-server/x11/xinit/default.nix
@@ -19,7 +19,7 @@ ${if config.desktop.status-bar.polybar.enable then
 	config.desktop.status-bar.polybar.command
 else ""}
 ${if config.desktop.window-manager.sxhkd.enable then "sxhkd &" else ""}
-exec ${config.desktop.window-manager.default}
+exec ${config.desktop.window-manager.command}
 '';
 		};
 	};
diff --git a/modules/desktop/window-manager/bspwm/default.nix b/modules/desktop/window-manager/bspwm/default.nix
index c69a54b..e275135 100644
--- a/modules/desktop/window-manager/bspwm/default.nix
+++ b/modules/desktop/window-manager/bspwm/default.nix
@@ -6,6 +6,13 @@
 	};
 
 	config = lib.mkIf config.desktop.window-manager.bspwm.enable {
+		assertions = [
+			{
+				assertion = config.desktop.window-manager.sxhkd.enable;
+				message ="Module desktop.window-manager.bspwm requires desktop.window-manager.sxhkd module to be enabled.";
+			}
+		];
+
 		desktop.window-manager.default = lib.mkDefault "bspwm";
 		desktop.window-manager.command =
 			if config.desktop.window-manager.default == "bspwm" then
diff --git a/modules/desktop/window-manager/sxhkd/default.nix b/modules/desktop/window-manager/sxhkd/default.nix
index f4678c3..63a1cf5 100644
--- a/modules/desktop/window-manager/sxhkd/default.nix
+++ b/modules/desktop/window-manager/sxhkd/default.nix
@@ -7,7 +7,6 @@
 
 	config = lib.mkIf config.desktop.window-manager.sxhkd.enable {
 		services.sxhkd.enable = true;
-
 		services.sxhkd.keybindings =
 		let
 			modKey = "alt";
@@ -27,7 +26,7 @@
 					(pkgs.writeShellScript "keybindings.sh" (builtins.readFile ./scripts/keybindings.sh)))
 
 				(createKeybinding
-					"space"
+					"r"
 					"Application launcher."
 					config.desktop.application-launcher.command)
 
diff --git a/modules/tools/editor/neovim/config/options.lua b/modules/tools/editor/neovim/config/options.lua
index bd475c7..fc0b04c 100644
--- a/modules/tools/editor/neovim/config/options.lua
+++ b/modules/tools/editor/neovim/config/options.lua
@@ -12,8 +12,8 @@ vim.o.laststatus = 3;
 vim.o.signcolumn = "auto";
 vim.opt.fillchars = { eob = " " };
 
-vim.o.tabstop = 2;
-vim.o.shiftwidth = 2;
+vim.o.tabstop = 3;
+vim.o.shiftwidth = 0;
 vim.o.expandtab = false;
 
 vim.o.updatetime = 300;
@@ -25,8 +25,8 @@ vim.api.nvim_create_autocmd("FileType", {
 	pattern = "*",
 	callback = function()
 		vim.bo.expandtab = false;
-		vim.bo.tabstop = 2;
-		vim.bo.shiftwidth = 2;
+		vim.bo.tabstop = 3;
+		vim.bo.shiftwidth = 0;
 	end,
 });
 
diff --git a/modules/tools/editor/neovim/plugins/config/bufferline.lua b/modules/tools/editor/neovim/plugins/config/bufferline.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/modules/tools/editor/neovim/plugins/config/bufferline.lua
diff --git a/modules/tools/editor/neovim/plugins/config/lsp-config.lua b/modules/tools/editor/neovim/plugins/config/lsp-config.lua
index d440c67..cca4116 100644
--- a/modules/tools/editor/neovim/plugins/config/lsp-config.lua
+++ b/modules/tools/editor/neovim/plugins/config/lsp-config.lua
@@ -60,6 +60,13 @@ vim.api.nvim_create_autocmd("FileType", {
 	end,
 });
 
+-- Show diagnostics in a floating window when hovering over the line
+vim.api.nvim_create_autocmd("CursorHold", {
+	callback = function()
+		vim.diagnostic.open_float(nil, { focusable = false })
+	end,
+})
+
 local lsp_keymap_opts = { noremap = true, silent = true };
 
 vim.keymap.set("n", "<leader>d", vim.lsp.buf.definition, lsp_keymap_opts);
diff --git a/modules/tools/editor/neovim/plugins/default.nix b/modules/tools/editor/neovim/plugins/default.nix
index 7081bda..948bdf7 100644
--- a/modules/tools/editor/neovim/plugins/default.nix
+++ b/modules/tools/editor/neovim/plugins/default.nix
@@ -11,6 +11,7 @@
 			nvim-web-devicons
 			nvim-tree-lua
 			which-key-nvim
+			bufferline-nvim
 			(base16-vim.overrideAttrs (old: {
 				patchPhase = "ln -s ${config.scheme base16-vim} colors/base16-scheme.vim";
 			}))
@@ -21,7 +22,7 @@
 				dressing-nvim
 				nvim-lspconfig
 			]
-		else null)
+		else [])
 	];
 
 	requirements = with pkgs; [