fix: downgrade unstable because i dont want to damage my display

https://lore.kernel.org/all/YzwooNdMECzuI5+h@intel.com/

configs/default.nix

@@ -110,11 +110,11 @@ in {
         '';
         swallow = command: "${scripts.swallow}/bin/swallow ${command}";
       in {
-        "ß" = "${pkgs.utillinux}/bin/setsid";
+        "ß" = "${pkgs.util-linux}/bin/setsid";
         cat = "${pkgs.bat}/bin/bat --style=plain";
         chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
         cp = "cp --interactive";
-        ip = "${pkgs.iproute}/bin/ip -c";
+        ip = "${pkgs.iproute2}/bin/ip -c";
         l = "ls --color=auto --time-style=long-iso --almost-all";
         ls = "ls --color=auto --time-style=long-iso";
         ll = "ls --color=auto --time-style=long-iso -l";
@@ -122,7 +122,7 @@ in {
         mv = "mv --interactive";
         nixi = "nix repl '<nixpkgs>'";
         ns = "nix-shell --run zsh";
-        o = "${pkgs.xdg_utils}/bin/xdg-open";
+        o = "${pkgs.xdg-utils}/bin/xdg-open";
         pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
         pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
         rm = "rm --interactive";

configs/flix.nix

@@ -74,7 +74,7 @@ in {
       [ -f "${cacheLocation}/${indexFilename}" ] || exit 1
 
       ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" < ${cacheLocation}/${indexFilename} \
-        | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.utillinux}/bin/setsid ${pkgs.xdg_utils}/bin/xdg-open '{}'
+        | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.util-linux}/bin/setsid ${pkgs.xdg-utils}/bin/xdg-open '{}'
     '')
   ];
 }

configs/neomutt.nix

@@ -23,7 +23,7 @@
         text/plain; $EDITOR %s ;
         text/html; ${pkgs.lynx}/bin/lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput;
         image/*; ${pkgs.nsxiv}/bin/nsxiv %s ;
-        video/*; ${pkgs.utillinux}/bin/setsid ${pkgs.mpv}/bin/mpv --quiet %s &; copiousoutput
+        video/*; ${pkgs.util-linux}/bin/setsid ${pkgs.mpv}/bin/mpv --quiet %s &; copiousoutput
         audio/*; ${pkgs.mpv}/bin/mpv %s ;
         application/pdf; ${pkgs.zathura}/bin/zathura %s ;
         application/pgp-encrypted; ${pkgs.gnupg}/bin/gpg -d '%s'; copiousoutput;

configs/neovim.nix

@@ -44,12 +44,14 @@
             vim-repeat
             vim-sensible
             vim-surround
-            (pkgs.vimUtils.buildVimPlugin {
+            (pkgs.vimUtils.buildVimPlugin rec {
-              name = "vim-dim-1.1.0";
+              pname = "vim-dim";
+              version = "1.1.0";
+              name = "${pname}-${version}";
               src = pkgs.fetchFromGitHub {
                 owner = "jeffkreeftmeijer";
-                repo = "vim-dim";
+                repo = pname;
-                rev = "1.1.0";
+                rev = version;
                 sha256 = "sha256-lyTZUgqUEEJRrzGo1FD8/t8KBioPrtB3MmGvPeEVI/g=";
               };
             })

configs/newsboat.nix

@@ -50,7 +50,7 @@
     browser ${linkhandler}
     macro , open-in-browser
     macro c set browser "${pkgs.xsel}/bin/xsel -b <<<" ; open-in-browser ; set browser ${linkhandler}
-    macro v set browser "${pkgs.utillinux}/bin/setsid -f ${pkgs.mpv}/bin/mpv" ; open-in-browser ; set browser ${linkhandler}
+    macro v set browser "${pkgs.util-linux}/bin/setsid -f ${pkgs.mpv}/bin/mpv" ; open-in-browser ; set browser ${linkhandler}
     macro y set browser "${youtube-download}" ; open-in-browser ; set browser ${linkhandler}
 
     bind-key j down

configs/packages.nix

@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
+  hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {utillinux = pkgs.util-linux;};
   worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
   menstruation = pkgs.callPackage <menstruation-backend> {};
   pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};
@@ -105,7 +105,7 @@ in {
     xsv # csv toolkit
     xmlstarlet # xml toolkit
     man-pages
-    posix_man_pages
+    man-pages-posix
     tree
     exfat # to mount windows drives
     parallel # for parallel, since moreutils shadows task spooler

flake.lock

@@ -126,11 +126,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1664538465,
+        "lastModified": 1663850217,
-        "narHash": "sha256-EnlC7dDKX7X1wlnXkB1gmn9rBZQ0J9+biVTZHw//8us=",
+        "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "10ecda252ce1b3b1d6403caeadbcc8f30d5ab796",
+        "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1662493500,
+        "lastModified": 1665037003,
-        "narHash": "sha256-EdAEKDQ6z7oinqQ28ELE3+taJ106DgmhNJt/rpqHJic=",
+        "narHash": "sha256-qUkMN5mhggnuEkQZ2N4BYqICgFAOtbBj2qF8XiuU6pk=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "51c641ac3c1100d80313696663db70c2eb3698dc",
+        "rev": "78037cf36ab0b1ec08be36509032d4427dda4edf",
         "type": "github"
       },
       "original": {

lib/default.nix

@@ -45,11 +45,11 @@ rec {
   theme = pkgs: {
     gtk = {
       name = "Adwaita-dark";
-      package = pkgs.gnome3.gnome-themes-extra;
+      package = pkgs.gnome.gnome-themes-extra;
     };
     icon = {
       name = "Adwaita";
-      package = pkgs.gnome3.adwaita-icon-theme;
+      package = pkgs.gnome.adwaita-icon-theme;
     };
     cursor = {
       name = "capitaine-cursors-white";

lib/i3status-rust.nix

@@ -8,7 +8,7 @@
 
   setsid = script:
     pkgs.writers.writeDash "setsid-command" ''
-      ${pkgs.utillinux}/bin/setsid ${script}
+      ${pkgs.util-linux}/bin/setsid ${script}
     '';
 
   accounts = import <niveum/lib/email.nix> {inherit lib;};

packages/opustags.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   cmake,
-  pkgconfig,
+  pkg-config,
   libogg,
   fetchFromGitHub,
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [libogg];
 
-  nativeBuildInputs = [cmake pkgconfig];
+  nativeBuildInputs = [cmake pkg-config];
 
   meta = with lib; {
     homepage = "https://github.com/fmang/opustags";

packages/scripts/default.nix

@@ -308,7 +308,7 @@ in
     };
 
     default-gateway = pkgs.writers.writeDashBin "default-gateway" ''
-      ${pkgs.iproute}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway'
+      ${pkgs.iproute2}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway'
     '';
 
     betacode =

packages/vimPlugins/cheat-sh.nix

@@ -2,7 +2,8 @@
   vimUtils,
   fetchFromGitHub,
 }: (vimUtils.buildVimPluginFrom2Nix {
-  name = "cheat.sh-vim";
+  pname = "cheat.sh-vim";
+  version = "826219d1";
   src = fetchFromGitHub {
     owner = "dbeniamine";
     repo = "cheat.sh-vim";

packages/vimPlugins/icalendar-vim.nix

@@ -2,7 +2,8 @@
   vimUtils,
   fetchFromGitHub,
 }: (vimUtils.buildVimPluginFrom2Nix {
-  name = "icalendar.vim";
+  pname = "icalendar.vim";
+  version = "542fff45";
   src = fetchFromGitHub {
     owner = "vim-scripts";
     repo = "icalendar.vim";

packages/vimPlugins/jq-vim.nix

@@ -3,7 +3,8 @@
   fetchFromGitHub,
 }:
 vimUtils.buildVimPluginFrom2Nix {
-  name = "jq.vim";
+  pname = "jq.vim";
+  version = "5baf8ed1";
   src = fetchFromGitHub {
     owner = "vito-c";
     repo = "jq.vim";

packages/vimPlugins/vim-256noir.nix

@@ -3,7 +3,8 @@
   fetchFromGitHub,
 }:
 vimUtils.buildVimPluginFrom2Nix {
-  name = "vim-256noir";
+  pname = "vim-256noir";
+  version = "e8668a18";
   src = fetchFromGitHub {
     owner = "andreasvc";
     repo = "vim-256noir";

packages/vimPlugins/vim-colors-paramount.nix

@@ -3,7 +3,8 @@
   fetchFromGitHub,
 }:
 vimUtils.buildVimPluginFrom2Nix rec {
-  name = "vim-colors-paramount";
+  pname = "vim-colors-paramount";
+  version = "a5601d36";
   src = fetchFromGitHub {
     owner = "owickstrom";
     repo = "vim-colors-paramount";

packages/vimPlugins/vim-fetch.nix

@@ -2,7 +2,8 @@
   vimUtils,
   fetchFromGitHub,
 }: (vimUtils.buildVimPluginFrom2Nix rec {
-  name = "vim-fetch";
+  pname = "vim-fetch";
+  version = "76c08586";
   src = fetchFromGitHub {
     owner = "wsdjeg";
     repo = "vim-fetch";

packages/vimPlugins/vim-fsharp.nix

@@ -3,7 +3,8 @@
   fetchFromGitHub,
 }:
 vimUtils.buildVimPluginFrom2Nix {
-  name = "vim-fsharp";
+  pname = "vim-fsharp";
+  version = "627db7d7";
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "vim-fsharp";

packages/vimPlugins/vim-mail.nix

@@ -3,7 +3,8 @@
   fetchFromGitHub,
 }:
 vimUtils.buildVimPluginFrom2Nix {
-  name = "vim-mail";
+  pname = "vim-mail";
+  version = "acdbb5bd";
   src = fetchFromGitHub {
     owner = "dbeniamine";
     repo = "vim-mail";

packages/vimPlugins/vim-reason-plus.nix

@@ -2,7 +2,8 @@
   vimUtils,
   fetchFromGitHub,
 }: (vimUtils.buildVimPluginFrom2Nix {
-  name = "vim-reason-plus";
+  pname = "vim-reason-plus";
+  version = "c11a2940";
   src = fetchFromGitHub {
     owner = "reasonml-editor";
     repo = "vim-reason-plus";

systems/ful/configuration.nix

@@ -45,4 +45,7 @@ in {
   users.users.root.passwordFile = toString <system-secrets/root.password>;
 
   environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
+
+  # since 22.05 timeout fails?
+  systemd.services.systemd-networkd-wait-online.enable = false;
 }