From a9817baee9cfd42369b735c4912ef4f0395993b8 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Wed, 1 Dec 2021 18:24:04 +0100
Subject: [PATCH] Remove unneeded packages from unstable

---
 machines/fuuko/services/torrent.nix    |  2 +-
 modules/cups.nix                       |  2 +-
 modules/pipewire.nix                   |  2 +-
 users/simon/modules/mpd.nix            |  2 +-
 users/simon/modules/neovim/default.nix | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/machines/fuuko/services/torrent.nix b/machines/fuuko/services/torrent.nix
index ab2b4b2..4c482de 100644
--- a/machines/fuuko/services/torrent.nix
+++ b/machines/fuuko/services/torrent.nix
@@ -119,7 +119,7 @@ in
       NetworkNamespacePath = "/run/netns/aria2";
 
       Restart = "always";
-      ExecStart = "${pkgs.unstable.aria2}/bin/aria2c --conf-path=${configFile}";
+      ExecStart = "${pkgs.aria2}/bin/aria2c --conf-path=${configFile}";
       ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       User = "aria2";
       Group = "aria2";
diff --git a/modules/cups.nix b/modules/cups.nix
index a852cc6..fc631c9 100644
--- a/modules/cups.nix
+++ b/modules/cups.nix
@@ -8,7 +8,7 @@ lib.mkIf config.sbruder.gui.enable {
       enable = true;
       drivers = with pkgs; [
         gutenprint
-      ] ++ lib.optional config.sbruder.unfree.allowSoftware (unstable.cups-kyocera-ecosys-m552x-p502x.override {
+      ] ++ lib.optional config.sbruder.unfree.allowSoftware (cups-kyocera-ecosys-m552x-p502x.override {
         # in Kyocera terms, EU means duplex enabled by default
         region = "EU";
       });
diff --git a/modules/pipewire.nix b/modules/pipewire.nix
index 4865f15..b51266e 100644
--- a/modules/pipewire.nix
+++ b/modules/pipewire.nix
@@ -25,7 +25,7 @@ lib.mkIf config.sbruder.gui.enable {
   };
 
   environment.systemPackages = with pkgs; [
-    unstable.helvum # patch panel
+    helvum # patch panel
     pavucontrol
     pulseaudio # pacmd and pactl
   ];
diff --git a/users/simon/modules/mpd.nix b/users/simon/modules/mpd.nix
index 93a67db..d4a4ac7 100644
--- a/users/simon/modules/mpd.nix
+++ b/users/simon/modules/mpd.nix
@@ -5,7 +5,7 @@
 lib.mkIf nixosConfig.sbruder.gui.enable {
   services.mpd = {
     enable = true;
-    package = pkgs.unstable.mpd;
+    package = pkgs.mpd;
     musicDirectory = "~/Music";
     network.listenAddress = "${config.services.mpd.dataDir}/socket";
     extraConfig = ''
diff --git a/users/simon/modules/neovim/default.nix b/users/simon/modules/neovim/default.nix
index 640a9f4..75397d8 100644
--- a/users/simon/modules/neovim/default.nix
+++ b/users/simon/modules/neovim/default.nix
@@ -1,6 +1,6 @@
 { config, lib, nixosConfig, pkgs, ... }:
 let
-  rainbow_csv = pkgs.unstable.vimUtils.buildVimPluginFrom2Nix rec {
+  rainbow_csv = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
     name = "rainbow_csv";
     src = pkgs.fetchFromGitHub {
       owner = "mechatroner";
@@ -11,7 +11,7 @@ let
 
     meta.license = lib.licenses.mit;
   };
-  vim-openscad = pkgs.unstable.vimUtils.buildVimPluginFrom2Nix rec {
+  vim-openscad = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
     name = "vim-openscad";
     src = pkgs.fetchFromGitHub {
       owner = "sirtaj";
@@ -22,7 +22,7 @@ let
 
     meta.license = lib.licenses.publicDomain;
   };
-  Vim-Jinja2-Syntax = pkgs.unstable.vimUtils.buildVimPluginFrom2Nix rec {
+  Vim-Jinja2-Syntax = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
     name = "Vim-Jinja2-Syntax";
     src = pkgs.fetchFromGitHub {
       owner = "Glench";
@@ -37,7 +37,7 @@ in
 {
   programs.neovim = {
     enable = true;
-    package = pkgs.unstable.neovim-unwrapped;
+    package = pkgs.neovim-unwrapped;
     vimAlias = true;
     extraConfig = ''
       lua require('init')
@@ -50,7 +50,7 @@ in
       rnix-lsp
       rust-analyzer
       # very ugly, but required to make non-yapf/autopep8 formatters work
-      ((unstable.python3.override {
+      ((python3.override {
         packageOverrides = _: prev: {
           python-lsp-server = prev.python-lsp-server.override {
             withAutopep8 = false;
@@ -64,7 +64,7 @@ in
         python-lsp-server
       ]))
     ]);
-    plugins = with pkgs.unstable.vimPlugins; [
+    plugins = with pkgs.vimPlugins; [
       Vim-Jinja2-Syntax
       cmp-buffer
       cmp-nvim-lsp