From 4e744af2dbaf6e60bafb5f977bc7ed68d593d676 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Mon, 4 Nov 2019 09:56:22 +0100
Subject: [PATCH] switch to nixos-unstable as main channel

---
 home-pc.nix            |  5 -----
 home/common/dotnet.nix |  3 ---
 home/felschr-work.nix  |  5 -----
 home/felschr.nix       | 13 ++++---------
 install.sh             |  4 ++--
 work-pc.nix            |  5 -----
 6 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/home-pc.nix b/home-pc.nix
index 32c8da6..c5f0981 100644
--- a/home-pc.nix
+++ b/home-pc.nix
@@ -1,10 +1,5 @@
 { config, pkgs, ... }:
 
-let
-  unstable = import <nixos-unstable> {
-    config = removeAttrs config.nixpkgs.config [ "packageOverrides" ];
-  };
-in
 {
   imports = [
     ./hardware-configuration.nix
diff --git a/home/common/dotnet.nix b/home/common/dotnet.nix
index c0be494..478cc7f 100644
--- a/home/common/dotnet.nix
+++ b/home/common/dotnet.nix
@@ -2,9 +2,6 @@
 
 with pkgs;
 let
-  unstable = import <nixos-unstable> {
-    config = removeAttrs config.nixpkgs.config [ "packageOverrides" ];
-  };
   dotnet-sdk_3 = pkgs.callPackage (import (pkgs.fetchFromGitHub {
     name = "nixos-pr-dotnet-sdk_3";
     owner = "juselius";
diff --git a/home/felschr-work.nix b/home/felschr-work.nix
index cab3712..33bb5e0 100644
--- a/home/felschr-work.nix
+++ b/home/felschr-work.nix
@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
 with pkgs;
-let
-  unstable = import <nixos-unstable> {
-    config = removeAttrs config.nixpkgs.config [ "packageOverrides" ];
-  };
-in
 {
   imports = [
     ./common/sh.nix
diff --git a/home/felschr.nix b/home/felschr.nix
index d2a4b2f..4701717 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
 with pkgs;
-let
-  unstable = import <nixos-unstable> {
-    config = removeAttrs config.nixpkgs.config [ "packageOverrides" ];
-  };
-in
 {
   imports = [
     ./common/sh.nix
@@ -45,12 +40,12 @@ in
     haskellPackages.ghc
 
     # gaming
-    unstable.steam
-    unstable.linux-steam-integration
-    unstable.lutris
+    steam
+    linux-steam-integration
+    lutris
 
     # other
-    unstable.ledger-live-desktop
+    ledger-live-desktop
   ];
 
   home.stateVersion = "19.09";
diff --git a/install.sh b/install.sh
index 4d60475..077ffa7 100755
--- a/install.sh
+++ b/install.sh
@@ -19,8 +19,8 @@ ln -s $CONFIG configuration.nix
 nixos-generate-config --root /mnt
 
 # add nixos-unstable and home-manager channels
-nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
-nix-channel --add https://github.com/rycee/home-manager/archive/release-19.03.tar.gz home-manager
+nix-channel --add https://nixos.org/channels/nixos-unstable nixos
+nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager
 nix-channel --update
 
 nixos-install
diff --git a/work-pc.nix b/work-pc.nix
index 4c9b2fa..f3e3aba 100644
--- a/work-pc.nix
+++ b/work-pc.nix
@@ -1,10 +1,5 @@
 { config, pkgs, ... }:
 
-let
-  unstable = import <nixos-unstable> {
-    config = removeAttrs config.nixpkgs.config [ "packageOverrides" ];
-  };
-in
 {
   imports = [
     ./hardware-configuration.nix