update nixos

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

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

common-sw.nix

@@ -34,7 +34,7 @@
     ripgrep
     imagemagick
     mercurial
-    manpages
+    (pkgs.man-pages or manpages)
 
     dfeet
 

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": {

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

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 = {

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

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