Merge branch 'nixbook/master' into zenix/master

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 = {

lib/nixvim.nix

@@ -92,11 +92,13 @@
         diagnostic = {
           "<leader>e" = "open_float";
           "<leader>ca" = "code_action";
+          "<C-.>" = "code_action";
           "<leader>cr" = "rename";
           "gd" = "definition";
         };
         diagnostic = {
           "<leader>ch" = "open_float";
+          "<C-e>" = "open_float";
         };
       };
     };

nixos/default.nix

@@ -101,8 +101,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
@@ -116,6 +117,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
@@ -126,6 +128,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
   '';
 

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;