users: misc fixes

This commit is contained in:
Rouven Seifert 2025-05-09 14:29:18 +02:00
parent 017bd33619
commit 6e72d4154f
Signed by: rouven.seifert
SSH key fingerprint: SHA256:WedRxwyCvqwDG6cd16qf/fizYDK1pvN4p5bawXlnKk0
3 changed files with 5 additions and 5 deletions

View file

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

View file

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

View file

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