flake: switch back entire config to unstable

Mixing stable and unstable brought me weird problems, so I'm switching
back to unstable entirely until it breaks hard enough to convince me to
go back to stable. :)

base/gui-programs.nix

@@ -3,20 +3,20 @@
   environment.systemPackages = with pkgs; [
     element-desktop
     feh
+    firefox
     gimp
     gnome.nautilus
     imagemagick
     mpv
     pavucontrol
+    slack
+    spotify
+    tdesktop
+    teams
     thunderbird
     zathura
 
     unstable.discord
-    unstable.firefox
-    unstable.slack
-    unstable.spotify
-    unstable.tdesktop
-    unstable.teams
   ];
 
   networking.networkmanager.enable = true;

flake.lock

@@ -71,27 +71,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1629271619,
-        "narHash": "sha256-by9D3OkEKk4rOzJIMbC0uP2wP3Bt81auP5xmbmPg2a8=",
+        "lastModified": 1629292755,
+        "narHash": "sha256-5xMo32NVLnloY9DveqwJO/Cab1+PbTMPqU4WMmawX5M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7bbca9877caed472c6b5866ea09302cfcdce3dbf",
+        "rev": "253aecf69ed7595aaefabde779aa6449195bebb7",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-21.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs-unstable-small": {
       "locked": {
-        "lastModified": 1629318195,
-        "narHash": "sha256-mFqoLruMu3poN6pkbegevDcGYwMVjoiyAexL+KE7DBg=",
+        "lastModified": 1629379651,
+        "narHash": "sha256-k4WWTLqz3tYvCCVt9ANm3Ac7qR/qXi1Uk6Xf9RXO8VM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7c38b03f742a657bf38e9579adeb608fc7cc5f1a",
+        "rev": "14b0f20fa1f56438b74100513c9b1f7c072cf789",
         "type": "github"
       },
       "original": {
@@ -108,7 +108,7 @@
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-unstable-small": "nixpkgs-unstable-small"
       }
     }
   },

flake.nix

@@ -5,10 +5,10 @@
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "nixos-21.05";
+      ref = "nixos-unstable";
     };
 
-    nixpkgs-unstable = {
+    nixpkgs-unstable-small = {
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
@@ -63,7 +63,7 @@
             packages = import ./pkgs { pkgs = super; };
 
             # packages accessible through pkgs.unstable.package
-            unstable = import inputs.nixpkgs-unstable {
+            unstable = import inputs.nixpkgs-unstable-small {
               inherit system;
               config.allowUnfree = true;
             };
@@ -110,10 +110,6 @@
               nixpkgs.overlays = [
                 inputs.emacs-overlay.overlay
 
-                (self: super: {
-                  steam = self.unstable.steam;
-                })
-
                 # uncomment this to build everything from scratch, fun but takes a
                 # while
                 #
@@ -140,10 +136,6 @@
             {
               nixpkgs.overlays = [
                 inputs.emacs-overlay.overlay
-
-                (self: super: {
-                  steam = self.unstable.steam;
-                })
               ] ++ shared_overlays;
             }
           ];

home/firefox.nix

@@ -10,7 +10,7 @@ in
   config = lib.mkIf cfg.enable {
     programs.firefox = {
       enable = true;
-      package = pkgs.unstable.firefox.override {
+      package = pkgs.firefox.override {
         cfg = {
           enableTridactylNative = true;
         };

hosts/boreal/home.nix

@@ -19,8 +19,8 @@
         # dev
         rustup
 
-        unstable.beancount
-        unstable.fava
+        beancount
+        fava
 
         # keyboard goodness
         chrysalis

hosts/zephyrus/home.nix

@@ -21,8 +21,8 @@
         # dev
         rustup
 
-        unstable.beancount
-        unstable.fava
+        beancount
+        fava
     ];
   };
 }

services/fava.nix

@@ -38,7 +38,7 @@ in
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         Environment = [];
-        ExecStart = "${pkgs.unstable.fava}/bin/fava -H 127.0.0.1 -p ${toString cfg.port} ${cfg.filePath}";
+        ExecStart = "${pkgs.fava}/bin/fava -H 127.0.0.1 -p ${toString cfg.port} ${cfg.filePath}";
         WorkingDirectory = cfg.home;
         User = "fava";
         Group = "fava";

services/tailscale.nix

@@ -16,12 +16,7 @@ in
   config = mkIf cfg.enable {
     services.tailscale = {
       enable = true;
-      package = pkgs.unstable.tailscale;
-    };
-
-    # FIXME: remove when upgrading to 21.11, added to module by default
-    systemd.services.tailscaled = {
-      path = [ pkgs.procps ];
+      package = pkgs.tailscale;
     };
 
     networking.firewall = {