Merged

functionally · Jul 4, 2024 · 13a3ab2 · 13a3ab2
1 parent 35372f2
commit 13a3ab2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
@@ -373,6 +373,7 @@
             mercurial
             mkpasswd
           # mpack
+            netcat-gnu
             niv
             nix-index
             nix-output-monitor
@@ -392,6 +393,7 @@
             pixz
             pdftk
             pgpdump
+            podman-tui
           # pxz
             qrencode
             remarshal

diff --git a/.nix-channels b/.nix-channels
@@ -11,8 +11,9 @@ https://nixos.org/channels/nixos-22.05 nixos-22.05
 https://nixos.org/channels/nixos-22.11 nixos-22.11
 https://nixos.org/channels/nixos-23.05 nixos-23.05
 https://nixos.org/channels/nixos-23.11 nixos-23.11
+https://nixos.org/channels/nixos-24.05 nixos-24.05
+https://nixos.org/channels/nixos-24.05 nixpkgs
 https://nixos.org/channels/nixos-unstable nixos-unstable
-https://nixos.org/channels/nixos-23.11 nixpkgs
 https://github.com/NixOS/nixpkgs/archive/1849e695b00a54cda86cb75202240d949c10c7ce.tar.gz pinned-17.03
 https://github.com/NixOS/nixpkgs/archive/b62c50ce5d3b6053f6f4afa10f2c4013ac0bfe9c.tar.gz pinned-17.09
 https://github.com/NixOS/nixpkgs/archive/e163794cded4cd1bbc06470b07698de204edb763.tar.gz pinned-18.03

diff --git a/bin/serve-postgresql-top b/bin/serve-postgresql-top
@@ -0,0 +1,4 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p postgresql_14 pgtop
+
+pgtop -u $USER -d postgres