Merge remote-tracking branch 'origin/nixos' into nixos

modules/profiles/base.nix

@@ -62,6 +62,21 @@ in
       fish.enable = true;
       git.enable = true;
       gpg.enable = true;
+      navi.enable = true;
+      tmux.enable = true;
+      tmux.keybinds = {
+        prefix = {
+          "-" = "split-window -v";
+          "|" = "split-window -h";
+          "C-l" = "send-keys C-l";
+          "R" = "source-file $XDG_CONFIG_HOME/tmux/tmux.conf \\; display-message 'Reloaded tmux.conf'";
+        };
+        copy-mode-vi = {
+          "v" = "send -X begin-selection";
+          "V" = "send -X select-line";
+          "C-v" = "send -X rectangle-toggle";
+        };
+      };
     };
   };
 
@@ -98,8 +113,8 @@ in
     exa
     gparted
     neofetch
+    reptyr
     ripgrep
-    tmux
     up
     viu
     wget
@@ -143,7 +158,6 @@ in
         ];
       };
       zoxide.enable = true;
-      navi.enable = true;
     };
     home = {
       username = "moritz";

modules/profiles/desktop.nix

@@ -48,7 +48,6 @@ with lib; {
     pavucontrol
     stable.libreoffice # HACK to fix build error
     stable.signal-desktop
-    synology-drive-client
     texlive.combined.scheme-full
     thunderbird
     vlc

modules/profiles/personal.nix

@@ -3,7 +3,10 @@
 with lib;
 {
   my = {
-    services.openconnect.enable = true;
+    services = {
+      openconnect.enable = true;
+      synology-drive.enable = true;
+    };
     programs = {
       ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
       git.signing = mkDefault true;