From d27e67743931d352e5857b605d44657668fa9013 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Tue, 4 Jun 2024 21:14:49 +0200
Subject: all: jump to nixpkgs 24.05

this does a lot of things, most of which are maintenance:
 - sources update
 - adjust newly-renamed options
 - swap some packages that were removed / renamed
 - update nomsring to newer default ghc
 - remove the deprecated lib.mdDoc from modules/*.nix
 - disable the nixpkgs mollysocket module so my own keeps evaluating
 - bundle the package definition of hikari & wlroots 0.15, which nixpkgs
   has removed as unmaintained (in fairness, they are unmaintained)
---
 home/packages-minimal.nix | 2 +-
 home/packages.nix         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'home')

diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index 3b5ede1..6738492 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -28,6 +28,6 @@
     jq html-tidy nodePackages.stylelint nodePackages.js-beautify zola
     lowdown
     # nix things
-    nixfmt niv deploy-rs.deploy-rs
+    nixfmt-rfc-style niv deploy-rs.deploy-rs
   ];
 }
diff --git a/home/packages.nix b/home/packages.nix
index 8e1c87c..ca923ca 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -25,7 +25,7 @@ in
       pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ];
     })
     # general cli utils
-    almanac libnotify grim slurp zbar.override ({ enableVideo = false; withXorg = false; })
+    almanac libnotify grim slurp (zbar.override { enableVideo = false; withXorg = false; })
     wl-clipboard showrt
     kijetesantakaluotokieni mpc_cli duf dufs progress hledger
     wineWowPackages.full sops xdg-utils exiftool
@@ -34,7 +34,7 @@ in
     # graphical utils
     kitty baobab
     # gnss things
-    gpsd galmon-full
+    gpsd # galmon-full
     # transport things
     transport_validator
     # things for emacs
@@ -66,13 +66,13 @@ in
     rust-bin.stable.latest.minimal
     rust-analyzer rustfmt
     # go
-    go gopls godef gore gocode gotests gomodifytags
+    go gopls godef gore gotests gomodifytags
     # C/C++
     clang clang-tools rtags irony-server
     # others
     julia python39 inweb
     # nix things
-    nixfmt niv
+    niv
     #haskellPackages.nix-serve-ng
     nix-doc nix-output-monitor
     direnv
-- 
cgit v1.2.3