From 661356a198f5d17e5098002f919dac9c7aeba380 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Tue, 3 Jun 2025 22:20:23 +0100 Subject: [PATCH] fixed workspace keybind, nvf uses system clipboard had to do the system clipboard thing so i could share my solution to the workspace thing lmao, good to get the motivation also installed vim sleuth which sets the relevant tab options to use the correct indentation style depending on existing code and swap to autocomplete when it doesnt make sense to press tab, its great --- home-manager/home.nix | 2 +- home-manager/hyprland.nix | 16 ++++++++-------- home-manager/nvf.nix | 11 +++++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 580f153..461ba21 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -30,7 +30,7 @@ services.gnome-keyring.enable = true; # used for nextcloud-client home.sessionVariables = { - DEFAULT_BROWSER = "${lib.getExe pkgs.floorp}"; + DEFAULT_BROWSER = "${lib.getExe pkgs.firefox}"; # even though im using floorp this still works, and pkgs.floorp doesnt # Allow XWayland apps to not be weird after turning off xwayland scaling in hyprland.conf GDK_SCALE = 1; XCURSOR_SIZE = 24; diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index dacec29..77eb492 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -78,16 +78,16 @@ "$mod, x, killactive" "$mod, tab, togglefloating" - # Workspace swipe but with $mod+scroll - "$mod, mouse_up, workspace, m+1" + # workspace swipe but with $mod+scroll + "$mod, mouse_up, workspace, r+1" "$mod, left, workspace, m-1" "$mod, mouse_down, workspace, m-1" - "$mod, right, workspace, m+1" - # Send window to next workspace - "$mod SHIFT, mouse_up, movetoworkspace, m+1" - "$mod SHIFT, left, movetoworkspace, m-1" - "$mod SHIFT, mouse_down, movetoworkspace, m-1" - "$mod SHIFT, right, movetoworkspace, m+1" + "$mod, right, workspace, r+1" + # send window to workspace + "$mod shift, mouse_up, movetoworkspace, r+1" + "$mod shift, left, movetoworkspace, m-1" + "$mod shift, mouse_down, movetoworkspace, m-1" + "$mod shift, right, movetoworkspace, r+1" ]; # Prevent xwayland apps from looking pixellated, cursor scaling to compensate for this is defined in home.nix diff --git a/home-manager/nvf.nix b/home-manager/nvf.nix index 7e848bd..41c077b 100644 --- a/home-manager/nvf.nix +++ b/home-manager/nvf.nix @@ -17,11 +17,14 @@ viAlias = true; vimAlias = true; - lsp = { - enable = true; - }; + lsp.enable = true; globals.mapleader = " "; - utility.sleuth.enable = true; + utility.sleuth.enable = true; # makes vim use consistent indentations style + clipboard = { + enable = true; + providers.wl-copy.enable = true; + registers = "unnamedplus"; # uses system clipboard + }; languages = { enableDAP = true; enableExtraDiagnostics = true;