From 31fc8e204ff13cd91aba26102ac181ed9e5877ec Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:39:48 -0500
Subject: [PATCH] use unstable nix for everything

---
 nixos/channels.sh |  4 ++++
 nixos/home.nix    | 32 ++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100755 nixos/channels.sh

diff --git a/nixos/channels.sh b/nixos/channels.sh
new file mode 100755
index 0000000..a53945a
--- /dev/null
+++ b/nixos/channels.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+doas nix-channel --add https://nixos.org/channels/nixos-unstable
+doas nix-channel --add https://nixos.org/channels/nixpkgs-unstable
diff --git a/nixos/home.nix b/nixos/home.nix
index 12cf384..47db1bd 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -2,8 +2,7 @@
 
 let
 
-  # Import unstable channel (for Neovim 0.5)
-  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
+    # Nothing
 
 in
 
@@ -16,7 +15,6 @@ in
     neovim
     gcc # for tree-sitter
     alacritty
-    # unstable.neovim
     tmux
     rsync
     ripgrep
@@ -28,6 +26,7 @@ in
     tealdeer
     _1password-gui
     discord
+    gh
   ];
 
   #programs.alacritty = {
@@ -200,17 +199,6 @@ in
     "nvim/init.lua".source = ./init.lua;
   };
 
-  # nixpkgs.overlays = [(
-  #   self: super: {
-  #     neovim = unstable.neovim;
-  #   })
-  # ];
-  nixpkgs.overlays = [
-    (import (builtins.fetchTarball {
-      url = https://github.com/nix-community/neovim-nightly-overlay/archive/master.tar.gz;
-    }))
-  ];
-
   #programs.neovim = {
   #  enable = true;
   #  # package = pkgs.neovim-nightly;
@@ -245,6 +233,22 @@ in
       core = {
         editor = "nvim";
       };
+      pager = {
+        branch = "false";
+      };
+      #credential = {
+      #  helper = "store";
+      #};
+      /* credential = { */
+      /*   "https://github.com/helper" = "!gh auth git-credential"; */
+      /* }; */
     };
   };
+
+  programs.gh = {
+    #package = nixos-unstable.gh;
+    enable = true;
+    enableGitCredentialHelper = true;
+    settings.git_protocol = "https";
+  };
 }