Remove unneeded packages from unstable

This commit is contained in:
Simon Bruder 2021-12-01 18:24:04 +01:00
parent f17dac8f50
commit a9817baee9
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
5 changed files with 10 additions and 10 deletions

View file

@ -119,7 +119,7 @@ in
NetworkNamespacePath = "/run/netns/aria2"; NetworkNamespacePath = "/run/netns/aria2";
Restart = "always"; 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"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
User = "aria2"; User = "aria2";
Group = "aria2"; Group = "aria2";

View file

@ -8,7 +8,7 @@ lib.mkIf config.sbruder.gui.enable {
enable = true; enable = true;
drivers = with pkgs; [ drivers = with pkgs; [
gutenprint 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 # in Kyocera terms, EU means duplex enabled by default
region = "EU"; region = "EU";
}); });

View file

@ -25,7 +25,7 @@ lib.mkIf config.sbruder.gui.enable {
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
unstable.helvum # patch panel helvum # patch panel
pavucontrol pavucontrol
pulseaudio # pacmd and pactl pulseaudio # pacmd and pactl
]; ];

View file

@ -5,7 +5,7 @@
lib.mkIf nixosConfig.sbruder.gui.enable { lib.mkIf nixosConfig.sbruder.gui.enable {
services.mpd = { services.mpd = {
enable = true; enable = true;
package = pkgs.unstable.mpd; package = pkgs.mpd;
musicDirectory = "~/Music"; musicDirectory = "~/Music";
network.listenAddress = "${config.services.mpd.dataDir}/socket"; network.listenAddress = "${config.services.mpd.dataDir}/socket";
extraConfig = '' extraConfig = ''

View file

@ -1,6 +1,6 @@
{ config, lib, nixosConfig, pkgs, ... }: { config, lib, nixosConfig, pkgs, ... }:
let let
rainbow_csv = pkgs.unstable.vimUtils.buildVimPluginFrom2Nix rec { rainbow_csv = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
name = "rainbow_csv"; name = "rainbow_csv";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mechatroner"; owner = "mechatroner";
@ -11,7 +11,7 @@ let
meta.license = lib.licenses.mit; meta.license = lib.licenses.mit;
}; };
vim-openscad = pkgs.unstable.vimUtils.buildVimPluginFrom2Nix rec { vim-openscad = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
name = "vim-openscad"; name = "vim-openscad";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "sirtaj"; owner = "sirtaj";
@ -22,7 +22,7 @@ let
meta.license = lib.licenses.publicDomain; meta.license = lib.licenses.publicDomain;
}; };
Vim-Jinja2-Syntax = pkgs.unstable.vimUtils.buildVimPluginFrom2Nix rec { Vim-Jinja2-Syntax = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
name = "Vim-Jinja2-Syntax"; name = "Vim-Jinja2-Syntax";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "Glench"; owner = "Glench";
@ -37,7 +37,7 @@ in
{ {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = pkgs.unstable.neovim-unwrapped; package = pkgs.neovim-unwrapped;
vimAlias = true; vimAlias = true;
extraConfig = '' extraConfig = ''
lua require('init') lua require('init')
@ -50,7 +50,7 @@ in
rnix-lsp rnix-lsp
rust-analyzer rust-analyzer
# very ugly, but required to make non-yapf/autopep8 formatters work # very ugly, but required to make non-yapf/autopep8 formatters work
((unstable.python3.override { ((python3.override {
packageOverrides = _: prev: { packageOverrides = _: prev: {
python-lsp-server = prev.python-lsp-server.override { python-lsp-server = prev.python-lsp-server.override {
withAutopep8 = false; withAutopep8 = false;
@ -64,7 +64,7 @@ in
python-lsp-server python-lsp-server
])) ]))
]); ]);
plugins = with pkgs.unstable.vimPlugins; [ plugins = with pkgs.vimPlugins; [
Vim-Jinja2-Syntax Vim-Jinja2-Syntax
cmp-buffer cmp-buffer
cmp-nvim-lsp cmp-nvim-lsp