From 9bbdb5b63b693888f5a5bbb1c57a5a42928053bd Mon Sep 17 00:00:00 2001
From: Brian Picciano <me@mediocregopher.com>
Date: Fri, 14 Jun 2024 16:41:51 +0200
Subject: Upgrade everything to 24.05

---
 default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 19432d4..5018614 100644
--- a/default.nix
+++ b/default.nix
@@ -3,8 +3,6 @@
   hostConfig,
 
   pkgs ? (import ./pkgs.nix).stable {},
-  pkgs2305 ? (import ./pkgs.nix).stable2305 {},
-  pkgsEdge ? (import ./pkgs.nix).edge {},
 
 }: let
 
@@ -88,14 +86,14 @@ in rec {
       pkgs.smartmontools
 
       pkgs.gnugrep
-      pkgs.ag
+      pkgs.silver-searcher
       pkgs.gawk
       pkgs.tree
       pkgs.pv
       pkgs.less
       pkgs.tmux
       pkgs.calc
-      pkgs2305.difftastic
+      pkgs.difftastic
       pkgs.units
 
       pkgs.man
@@ -136,19 +134,19 @@ in rec {
 
       pkgs.jq
       pkgs.yq
-      pkgs2305.rsbkb
+      pkgs.rsbkb
 
       pkgs.tomb
       pkgs.udiskie
 
       pkgs.xterm # nice to have a backup
-      pkgs2305.libreoffice
+      pkgs.libreoffice
       pkgs.gimp
       pkgs.inkscape
       pkgs.vlc
       pkgs.sylpheed
       pkgs.calibre
-      pkgsEdge.lagrange
+      pkgs.lagrange
       pkgs.pavucontrol
       pkgs.xdg-utils
       pkgs.arandr
@@ -157,7 +155,7 @@ in rec {
       pkgs.wireshark
       pkgs.electrum
 
-      (pkgs2305.callPackage ./nix/bandcamp-dl.nix {})
+      (pkgs.callPackage ./nix/bandcamp-dl.nix {})
 
       bin
       ((import ./nvim) {}).nvim
-- 
cgit v1.2.3