users: misc fixes

users/rouven/modules/git/default.nix

@@ -17,7 +17,8 @@
     extraConfig = {
       merge.conflictStyle = "diff3";
       diff.colorMoved = "default";
-      user.signingkey = "B95E8FE6B11C4D09";
+      user.signingkey = "~/.ssh/git.pub";
+      gpg.format = "ssh";
       pull.rebase = false;
       init.defaultBranch = "main";
       commit.gpgsign = true;

users/rouven/modules/packages.nix

@@ -5,7 +5,6 @@
     # essentials
     htop-vim
     lsof
-    postgresql
 
     zip
     unzip
@@ -15,6 +14,7 @@
     glab
     tio
     tcpdump
+    openconnect
 
     # graphics
     (zathura.override { plugins = [ zathuraPkgs.zathura_pdf_mupdf ]; })
@@ -53,6 +53,7 @@
     typst
     hut
     wine
+    electrum
     # ansible
     ansible-lint
     (python3.withPackages (ps: [
@@ -83,14 +84,12 @@
     rustfmt
     clippy
     gcc
-    nodejs_20
     gnumake
     go
     pre-commit
 
     # fancy tools
     just
-    himalaya
     # strace but with colors
     # (strace.overrideAttrs (_: {
     #   patches = [

users/rouven/modules/wayland/river.nix

@@ -44,7 +44,7 @@
           };
           "None" = builtins.mapAttrs (_key: bind: "spawn \"" + bind + "\"") {
             Print = "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
-            XF86Launch2 = "${pkgs.sway-contrib.grimshot}/bin/grimshot save area - | ${pkgs.swappy}/bin/swappy -f -";
+            XF86SelectiveScreenshot = "${pkgs.sway-contrib.grimshot}/bin/grimshot save area - | ${pkgs.swappy}/bin/swappy -f -";
             XF86MonBrightnessUp = "${pkgs.light}/bin/light -A 10";
             XF86MonBrightnessDown = "${pkgs.light}/bin/light -U 10";
             XF86AudioMute = "${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";