Move from unstable

home/taskwarrior.nix

@@ -28,7 +28,7 @@
         Bool a -> show a
         Null -> "null"
     '';
-    inherit (import ../lib) writeHaskellScript unstable;
+    inherit (import ../lib) writeHaskellScript;
     libraries = [
       pkgs.haskellPackages.fdo-notify
       pkgs.haskellPackages.aeson

home/zsh/default.nix

@@ -18,7 +18,7 @@
         fi
 
         ${builtins.readFile ./zshrc}
-        source ${my-pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
+        source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
         source ${./p10k.zsh}
       '';
       oh-my-zsh = {

hosts/hera/weechat/default.nix

@@ -2,14 +2,13 @@
 with lib;
 let
   weechatConfig = import ../secret/weechat.nix;
-  inherit (import ../../../lib) unstable;
-  weechat = unstable.wrapWeechat unstable.weechat-unwrapped {
+  weechat = pkgs.wrapWeechat pkgs.weechat-unwrapped {
     configure = { availablePlugins, ... }: {
       plugins = builtins.attrValues (availablePlugins // {
         python = (availablePlugins.python.withPackages
-          (ps: [ unstable.weechatScripts.weechat-matrix ]));
+          (ps: [ pkgs.weechatScripts.weechat-matrix ]));
       });
-      scripts = [ unstable.weechatScripts.weechat-matrix ];
+      scripts = [ pkgs.weechatScripts.weechat-matrix ];
     };
   };
 in {

lib/test.nix

@@ -1,5 +1,4 @@
 let
-  inherit (import ../pkgs) niv;
   inherit (import ../lib)
     pkgs writeHaskellScript get-niv-path home-manager unstable haskellList;
 in rec {
@@ -38,7 +37,8 @@ in rec {
   keys = [ "default" "apollo" "hera" ];
   test-config = writeHaskellScript {
     name = "test-config";
-    bins = [ test-system-config test-home-config pkgs.git niv pkgs.git-crypt ];
+    bins =
+      [ test-system-config test-home-config pkgs.git pkgs.niv pkgs.git-crypt ];
     imports = [ "System.Directory (withCurrentDirectory)" ];
   } ''
     checkout :: IO FilePath

pkgs/default.nix

@@ -16,17 +16,15 @@ in rec {
   my-ssh-add = pkgs.writeShellScriptBin "my-ssh-add" ''
     SSH_ASKPASS=${cat-pw}/bin/cat-ssh-pw ${pkgs.openssh}/bin/ssh-add < /dev/null
   '';
-  zsh-powerlevel10k = unstable.zsh-powerlevel10k;
   ghcide = (import sources.ghcide { }).ghcide-ghc865;
   obelisk = (import sources.obelisk { }).command;
   nix-direnv = sources.nix-direnv + "/direnvrc";
-  neovim = unstable.neovim.override {
+  neovim = pkgs.neovim.override {
     vimAlias = true;
     withPython3 = true;
     withPython = false;
   };
   home-neovim = (import ./nvim) neovim;
-  niv = unstable.niv;
 
   # pkgs assumed to be present on a non nixos host
   core-system-pkgs = {
@@ -37,14 +35,13 @@ in rec {
   };
 
   extra-system-pkgs = {
-    inherit niv;
     inherit (pkgs.gitAndTools) git-annex;
     inherit (pkgs.rxvt_unicode) terminfo;
     inherit (pkgs.python3Packages) qrcode;
     inherit (pkgs)
       git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu
       tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat
-      entr libargon2 mblaze;
+      entr libargon2 mblaze niv;
   };
   gw2wrapper = writeHaskellScript {
     name = "gw2wrapper";
@@ -98,7 +95,7 @@ in rec {
             libXext
             libX11
             libudev
-            libGLU_combined
+            libGLU
             mesa_noglu.osmesa
             libdrm
             libpulseaudio
@@ -119,11 +116,12 @@ in rec {
     inherit (pkgs.gnome3) nautilus;
     inherit (pkgs.xorg) xev xbacklight;
     inherit (pkgs.gitAndTools) hub;
-    inherit (unstable) mumble;
     inherit (pkgs)
     # web
       chromium
 
+      mumble
+
       upower speedtest-cli
 
       anki
@@ -174,8 +172,7 @@ in rec {
     inherit (pkgs.gnome3) dconf;
     inherit (pkgs)
       kitty lm_sensors sway swaylock swayidle xwayland rofi dmenu xdg_utils
-      libnotify mako;
-    inherit (unstable) wofi;
+      libnotify mako wofi;
 
   };
   home-pkgs = {
@@ -185,7 +182,7 @@ in rec {
       stack ghcid;
     inherit (my-lib) ghc;
     inherit home-neovim ghcide obelisk;
-    cabal-fmt = (unBreak unstable.haskell.packages.ghc881.cabal-fmt);
+    cabal-fmt = (unBreak pkgs.haskell.packages.ghc881.cabal-fmt);
   };
   accounting-pkgs = {
     jali = pkgs.callPackage ./jali { };

pkgs/jali/default.nix

@@ -1,10 +1,10 @@
-{ aqbanking, python36Packages, fetchgit }:
+{ aqbanking, python3Packages, fetchgit }:
 let
   andir = import (builtins.fetchTarball {
     url = "https://github.com/andir/nixpkgs/archive/aqbanking.tar.gz";
     sha256 = "06m7risi68jfqgv001ip77lzz6bylvvdn5j8sn845c54zpm6qp36";
   }) { };
-in with python36Packages;
+in with python3Packages;
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "jali";

system/fonts.nix

@@ -1,6 +1,4 @@
-{ config, pkgs, lib, ... }:
-let inherit (import ../lib) unstable;
-in {
+{ config, pkgs, lib, ... }: {
   fonts = {
     fontconfig = {
       enable = true;
@@ -21,10 +19,7 @@ in {
         font-awesome # icons I guess?
         material-icons # icons in my app
         b612 # sans font
-        powerline-fonts # fonts e.g. for swaybar
-      ;
-      inherit (unstable) jetbrains-mono # code font
-      ;
+        jetbrains-mono; # code font
     };
   };
 

system/matrix-synapse.nix

@@ -2,7 +2,6 @@
 let
   hostName = "matrix.maralorn.de";
   inherit (config.m-0) hosts;
-  inherit (import ../lib) unstable;
 in {
   networking.firewall.allowedTCPPorts = [ 8448 ];
 
@@ -29,7 +28,7 @@ in {
     # Synapse
     matrix-synapse = {
       enable = true;
-      package = unstable.matrix-synapse;
+      package = pkgs.matrix-synapse;
       enable_metrics = true;
       server_name = "maralorn.de";
       public_baseurl = "https://${hostName}";

system/riot.nix

@@ -20,20 +20,13 @@ let
         "https://cloud.maralorn.de/apps/theming/image/background";
     };
   };
-  inherit (import ../lib) unstable;
 in {
   services.nginx = {
     enable = true;
     virtualHosts."riot.maralorn.de" = {
       enableACME = true;
       forceSSL = true;
-      root = unstable.riot-web;
-      locations."/config.json" = {
-        extraConfig = ''
-          default_type application/json;
-          return 200 '${builtins.toJSON riot_config}';
-        '';
-      };
+      root = pkgs.riot-web.overrideAttrs (old: { conf = riot_config; });
     };
   };