commit a5f278ca6a3189d7102719dd2bbb2c04f8ca3cb3
parent 46f99a1cbfd3ddf2bf6e73b1ca0dd2b5d42b053f
Author: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 14 Sep 2018 17:41:01 +0200
Fix sbr.overlay and remove media.nix…
… something fishy is going one with mpv..
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/desktop.nix b/desktop.nix
@@ -1,7 +1,7 @@
{ pkgs, prefix, ... }:
{
- imports = [ ./fish.nix ./ssh.nix ./i3.nix ./media.nix ./base.nix ];
+ imports = [ ./fish.nix ./ssh.nix ./i3.nix ./base.nix ];
home.keyboard = {
layout = "fr(bepo),fr";
variant = "oss";
diff --git a/media.nix b/media.nix
@@ -1,7 +0,0 @@
-{ pkgs, prefix, ... }:
-
-{
- home.packages = with pkgs; [
- mpv
- ];
-}
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -1,21 +1,21 @@
self: super:
{
ape = import ../pkgs/ape {
- inherit (super) stdenv lib buildGoPackage fetchFromGitHub;
+ inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
};
dobi = import ../pkgs/dobi {
- inherit (super) stdenv lib buildGoPackage fetchFromGitHub;
+ inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
};
scripts = import ../pkgs/scripts {
- inherit (super) stdenv;
+ inherit (self) stdenv;
};
envbox = import ../pkgs/envbox {
- inherit (super) stdenv lib buildGoPackage fetchFromGitHub;
+ inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
};
prm = import ../pkgs/prm {
- inherit (super) stdenv lib buildGoPackage fetchgit;
+ inherit (self) stdenv lib buildGoPackage fetchgit;
};
tmux-tpm = import ../pkgs/tmux-tpm {
- inherit (super) stdenv lib fetchFromGitHub;
+ inherit (self) stdenv lib fetchFromGitHub;
};
}