diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 35e22ba..b005513 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -22,7 +22,7 @@ in { xdg.portal = { enable = true; configPackages = [pkgs.hyprland]; - extraPortals = [pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-hyprland]; + extraPortals = [pkgs.xdg-desktop-portal-gtk]; }; services.hypridle = { diff --git a/lib/nixvim.nix b/lib/nixvim.nix index 845aaa1..606d6e3 100644 --- a/lib/nixvim.nix +++ b/lib/nixvim.nix @@ -87,11 +87,13 @@ lspBuf = { "K" = "hover"; "ca" = "code_action"; + "" = "code_action"; "cr" = "rename"; "gd" = "definition"; }; diagnostic = { "ch" = "open_float"; + "" = "open_float"; }; }; }; diff --git a/nixos/default.nix b/nixos/default.nix index eb3aa89..fe091fb 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -100,8 +100,9 @@ in { programs.tmux.enable = true; programs.tmux.extraConfig = '' + set-option -sa terminal-overrides ",xterm*:Tc" + set escape-time 0 - set -g default-terminal screen bind -n M-s split-window -v bind -n M-v split-window -h @@ -115,6 +116,7 @@ in { bind -n M-> resize-pane -R 10 bind -n M-- resize-pane -D 10 bind -n M-+ resize-pane -U 10 + bind -n M-z resize-pane -Z bind -n M-u copy-mode bind -n M-p paste-buffer bind -n M-n next-window @@ -125,6 +127,12 @@ in { set -g mouse on + set -g base-index 1 + set -g pane-base-index 1 + set-window-option -g pane-base-index 1 + set-option -g renumber-windows on + + bind -n "M-`" break-pane -d bind -n "M-`" break-pane -d ''; diff --git a/nixos/workstation.nix b/nixos/workstation.nix index 2d9e181..a616009 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -11,6 +11,8 @@ "electron-27.3.11" ]; + programs.hyprland.enable = true; + # use pipewire hardware.pulseaudio.enable = false; security.rtkit.enable = true;