From 4f532a91e6e8b1a31873522bdf7072a25beaeb63 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 20 Mar 2022 14:58:40 +0100
Subject: [PATCH] update nixos

---
 basic-tools.nix | 4 ++--
 common-gui.nix  | 2 +-
 common-sw.nix   | 2 +-
 flake.lock      | 6 +++---
 gnome3.nix      | 2 +-
 i3.nix          | 8 ++++----
 large-sw.nix    | 2 +-
 sway.nix        | 8 ++++----
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/basic-tools.nix b/basic-tools.nix
index 37581be..8454b52 100644
--- a/basic-tools.nix
+++ b/basic-tools.nix
@@ -26,7 +26,7 @@
     lua
     perl
     gdb
-    bind nmap tcpdump telnet
+    bind nmap tcpdump (pkgs.inetutils or telnet)
     usbutils
     dstat
     which
@@ -37,7 +37,7 @@
     links2
     ctags
     nix-prefetch-scripts
-    (pkgs.wireguard or pkgs.hello)
+    (pkgs.wireguard-tools or pkgs.wireguard or pkgs.hello)
     jq
     #b2sum
     strace
diff --git a/common-gui.nix b/common-gui.nix
index f32bb21..10f7724 100644
--- a/common-gui.nix
+++ b/common-gui.nix
@@ -28,7 +28,7 @@
       noto-fonts-emoji
       noto-fonts-cjk
 
-      cantarell_fonts # from gnome3 module
+      cantarell-fonts # from gnome3 module
 
       merriweather
       merriweather-sans
diff --git a/common-sw.nix b/common-sw.nix
index 63d3d39..6b3f70c 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -34,7 +34,7 @@
     ripgrep
     imagemagick
     mercurial
-    manpages
+    (pkgs.man-pages or manpages)
 
     dfeet
 
diff --git a/flake.lock b/flake.lock
index f3bfbb7..1000f78 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1643805626,
-        "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=",
+        "lastModified": 1647297614,
+        "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb",
+        "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58",
         "type": "github"
       },
       "original": {
diff --git a/gnome3.nix b/gnome3.nix
index 9c0f85f..8e2e85a 100644
--- a/gnome3.nix
+++ b/gnome3.nix
@@ -35,7 +35,7 @@
       noto-fonts-emoji
       noto-fonts-cjk
 
-      cantarell_fonts # from gnome3 module
+      cantarell-fonts # from gnome3 module
 
       merriweather
       merriweather-sans
diff --git a/i3.nix b/i3.nix
index ccaa2f5..4ae289b 100644
--- a/i3.nix
+++ b/i3.nix
@@ -30,12 +30,12 @@
     xorg.xev
 
     # gnome3 core packages
-    desktop_file_utils shared_mime_info
+    desktop-file-utils shared-mime-info
     glib gtk3
-    glib_networking gvfs dconf
+    glib-networking gvfs dconf
     gnome3.gnome-settings-daemon
-    gnome_themes_standard gnome3.adwaita-icon-theme
-    hicolor_icon_theme
+    gnome-themes-extra gnome3.adwaita-icon-theme
+    hicolor-icon-theme
   ];
 
   services.xserver = {
diff --git a/large-sw.nix b/large-sw.nix
index 0c38e76..678e56d 100644
--- a/large-sw.nix
+++ b/large-sw.nix
@@ -2,7 +2,7 @@
 
 {
   environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
-    idea.idea-community
+    jetbrains.idea-community
     # idea.clion
     texlive.combined.scheme-full biber
     gimp
diff --git a/sway.nix b/sway.nix
index 11421e3..6c02090 100644
--- a/sway.nix
+++ b/sway.nix
@@ -25,11 +25,11 @@
     xdg_utils # for xdg-open
 
     # gnome3 core packages
-    desktop_file_utils shared_mime_info
+    desktop-file-utils shared-mime-info
     glib gtk3
-    glib_networking gvfs dconf
-    gnome_themes_standard defaultIconTheme
-    hicolor_icon_theme
+    glib-networking gvfs dconf
+    gnome-themes-extra defaultIconTheme
+    hicolor-icon-theme
 
     # for QT_QPA_PLATFORM=wayland
     qt5.qtwayland