From b3d9a07086cb81e53e20837c96a3153453b0a123 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Apr 2017 22:03:34 +0200
Subject: pkgs: Move all of my packages into pkgs/aszlig

This already has started in e0abe1dbbda54c1f048b5d38df05e1a3289216a6
with @Profpatsch putting his packages into its own namespace, so let's
continue on that and move my crap into my own namespace as well.

The only difference in my approach is that I'm now also using a new
function called callPackageScope, which declutters pkgs/default.nix a
bit and moves the individual callPackage invocations into
aszlig/default.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/aszlig/kzerza.nix          | 2 +-
 machines/aszlig/managed/brawndo.nix | 4 ++--
 machines/aszlig/managed/tyree.nix   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'machines')

diff --git a/machines/aszlig/kzerza.nix b/machines/aszlig/kzerza.nix
index 08462ade..98b8867a 100644
--- a/machines/aszlig/kzerza.nix
+++ b/machines/aszlig/kzerza.nix
@@ -52,7 +52,7 @@ in {
     preStart = "${pkgs.kbd}/bin/chvt 7";
     serviceConfig = {
       Type = "idle";
-      ExecStart = "${pkgs.vuizvui.grandpa}/bin/grandpa";
+      ExecStart = "${pkgs.vuizvui.aszlig.grandpa}/bin/grandpa";
       ExecStopPost = "${pkgs.systemd}/bin/systemctl poweroff";
       Restart = "on-failure";
       StandardInput = "tty";
diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix
index 9042d8dd..61e7925b 100644
--- a/machines/aszlig/managed/brawndo.nix
+++ b/machines/aszlig/managed/brawndo.nix
@@ -56,7 +56,7 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
-    vuizvui.axbo
+    vuizvui.aszlig.axbo
     chromium
     file
     gajim
@@ -75,7 +75,7 @@ in {
     unfreePkgs.steam
     unfreeAndNonDistributablePkgs.skype
     thunderbird
-    vuizvui.tomahawk
+    vuizvui.aszlig.tomahawk
     wine
     xpdf
     youtubeDL
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index ecc93217..7b14628c 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -10,7 +10,7 @@
   environment.systemPackages = with pkgs; [
     calibre cdparanoia chromium figlet gajim gimp htop inkscape thunderbird
     kdeApplications.gwenview kdeApplications.okular krita libreoffice mosh mpv
-    pciutils vlc vuizvui.tomahawk wget wine youtubeDL
+    pciutils vlc vuizvui.aszlig.tomahawk wget wine youtubeDL
     unfreeAndNonDistributablePkgs.skype
   ];
 
-- 
cgit 1.4.1