From bb702918cb74541687aa013c84fcf9749c039610 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sat, 4 Mar 2023 17:29:13 +0100
Subject: home: a couple more packages

---
 flake.nix                 | 2 +-
 home/packages-minimal.nix | 2 +-
 home/packages.nix         | 4 +++-
 pkgs/galmon.nix           | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 989c4cb..c355804 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,7 +95,7 @@
 
     homeConfigurations =
       let home = root: inputs.home-manager.lib.homeManagerConfiguration rec {
-            pkgs = nixpkgs.legacyPackages.x86_64-linux;
+            pkgs = nixpkgs;
             modules = [ root ];
             extraSpecialArgs = {
               inherit inputs;
diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index 514ae41..5dbc7a2 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -13,7 +13,7 @@
     pandoc
     # general cli utils
     tree dnsutils inetutils pijul bat age libsecret gping bottom dogdns
-    cifs-utils jekyll fzf ripgrep fd bandwhich exa dive
+    cifs-utils jekyll fzf ripgrep fd sd bandwhich exa dive
     ripgrep python39Packages.isort shellcheck graphviz
     zip unzip acpi sfz viu
     yt-dlp weechat hexyl bottom lm_sensors
diff --git a/home/packages.nix b/home/packages.nix
index 007f6aa..64bbf48 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -33,9 +33,11 @@ in
     poppler_utils
     # general cli utils
     extras.almanac libnotify grim slurp wl-clipboard extras.showrt
-    extras.kijetesantakaluotokieni mpc_cli duf dufs progress
+    extras.kijetesantakaluotokieni mpc_cli duf dufs progress hledger
     # graphical utils
     kitty baobab
+    # gnss things
+    gpsd galmon-full
     # things for emacs
     sqlite brightnessctl scrot playerctl tlp
     # haskell & co
diff --git a/pkgs/galmon.nix b/pkgs/galmon.nix
index 7af18da..0316482 100644
--- a/pkgs/galmon.nix
+++ b/pkgs/galmon.nix
@@ -42,6 +42,8 @@ stdenv.mkDerivation {
   installPhase = ''
     mkdir -p $out/bin
     mv ${core} ${noncore} $out/bin
+    # avoid collision with gpsd's ubxtool
+    mv $out/bin/ubxtool $out/bin/galmon-ubxtool
     ${lib.optionalString buildAll "cp -r html $out/"}
   '';
 }
-- 
cgit v1.2.3