From 017d0672aaa6ff6d05f5bce4f7f7bdc19f679b26 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 12 Oct 2022 09:28:02 +0200
Subject: Banish unstable overlay

---
 user/settings/base.nix            | 76 +++++++++++++++++++++------------------
 user/settings/darwin.nix          |  2 +-
 user/settings/development/web.nix |  2 +-
 user/settings/gaming.nix          |  7 ++--
 user/settings/nixpkgs.nix         |  2 --
 user/settings/satoshipay.nix      |  6 ++--
 user/settings/user-interface.nix  |  2 +-
 7 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/user/settings/base.nix b/user/settings/base.nix
index eb40ec4a..252d113f 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -46,40 +46,46 @@
       XDG_DATA_HOME = "${HOME}/.local/share";
     };
 
-  programs.zsh.shellAliases = {
-    make = "${pkgs.remake}/bin/remake";
-  };
-  programs.htop = {
-    enable = true;
-    settings = {
-      header_margin = 0;
-      tree_view = 1;
-      hide_kernel_threads = 1;
-      hide_userland_threads = 1;
+    programs.zsh.shellAliases = {
+      make = "${pkgs.remake}/bin/remake";
     };
-  };
-  home.packages = with pkgs; [
-    pv
-    fd
-    sd
-    entr
-    ripgrep
-    iftop
-    nmap
-    moreutils
-    mtr
-    tree
-    abduco
-    dvtm
-    unstable.vimv
-  ] ++ (
-  if !stdenv.isDarwin
-  then [
-    file
-    ldns
-    lsof
-    unar
-    zip
-  ] else [
-  ]);
+    programs.htop = {
+      enable = true;
+      settings = {
+        header_margin = 0;
+        tree_view = 1;
+        hide_kernel_threads = 1;
+        hide_userland_threads = 1;
+      };
+    };
+    home.packages = with pkgs;
+    [
+      pv
+      fd
+      sd
+      entr
+      ripgrep
+      iftop
+      nmap
+      moreutils
+      mtr
+      tree
+      abduco
+      dvtm
+      vimv
+    ] ++
+    (
+      if !stdenv.isDarwin
+      then
+      [
+        file
+        ldns
+        lsof
+        unar
+        zip
+      ]
+      else
+      [
+      ]
+    );
 }
diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix
index 757c25e1..ab7afe15 100644
--- a/user/settings/darwin.nix
+++ b/user/settings/darwin.nix
@@ -39,7 +39,7 @@
       darwin-zsh-completions
   ];
 
-  programs.emacs.package = pkgs.unstable.emacsMacport;
+  programs.emacs.package = pkgs.emacsMacport;
 
   home.file.".hushlogin".text = "";
 
diff --git a/user/settings/development/web.nix b/user/settings/development/web.nix
index de30f8e7..f8b74adc 100644
--- a/user/settings/development/web.nix
+++ b/user/settings/development/web.nix
@@ -5,6 +5,6 @@
     vscode-html-languageserver-bin
     csslint
   ] ++ [
-    pkgs.unstable.nodePackages.stylelint
+    pkgs.nodePackages.stylelint
   ];
 }
diff --git a/user/settings/gaming.nix b/user/settings/gaming.nix
index c328b1ba..9f0fa510 100644
--- a/user/settings/gaming.nix
+++ b/user/settings/gaming.nix
@@ -1,15 +1,12 @@
 { config, pkgs, ... }:
 
-let
-  unstablePkgs = import <nixos-unstable> {};
-in
 {
-  home.packages = with unstablePkgs; [
+  home.packages = with pkgs; [
     steam
     wineWowPackages.stable
     # winetricks
 
-    pkgs.lutris
+    lutris
     discord
   ];
 }
diff --git a/user/settings/nixpkgs.nix b/user/settings/nixpkgs.nix
index 89a40a79..9f939c33 100644
--- a/user/settings/nixpkgs.nix
+++ b/user/settings/nixpkgs.nix
@@ -3,7 +3,6 @@
 let
   inherit (pkgs) stdenv;
   stableConfig = config.nixpkgs.config;
-  unstablePkgs = if stdenv.isDarwin then import <nixpkgs-unstable> { config = stableConfig; } else import <nixos-unstable> {};
 in
 {
   imports = [
@@ -13,7 +12,6 @@ in
     (self: super: {
       firefox-bin-unwrapped = super.firefox-bin-unwrapped.override { systemLocale = "en-GB"; };
       firefox-devedition-bin-unwrapped = super.firefox-devedition-bin-unwrapped.override { systemLocale = "en-GB"; };
-      unstable = unstablePkgs;
     })
   ];
 }
diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix
index 3812c73c..6a1f738f 100644
--- a/user/settings/satoshipay.nix
+++ b/user/settings/satoshipay.nix
@@ -16,7 +16,7 @@ in
     KUBECTX_IGNORE_FZF = "1";
   };
   home.packages = with pkgs; ([
-    unstable.caddy
+    caddy
     openssl
     mongodb-tools
     pgcli
@@ -37,9 +37,9 @@ in
     helmfile
   ] ++ (lib.optionals (!stdenv.isDarwin)
   [
-    unstable.docker-compose
+    docker-compose
 
-    unstable.ripcord
+    ripcord
     robo3t
   ]));
 
diff --git a/user/settings/user-interface.nix b/user/settings/user-interface.nix
index 2eb0632c..f0e4c798 100644
--- a/user/settings/user-interface.nix
+++ b/user/settings/user-interface.nix
@@ -19,7 +19,7 @@ in
   };
   home.packages = with pkgs; [
     librewolf
-    unstable.logseq
+    logseq
   ] ++ lib.optionals (!stdenv.isDarwin) (with pkgs; [
     falkon
     mu
-- 
cgit 1.4.1