about summary refs log tree commit diff
path: root/modules/user
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-04-23 22:03:34 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-04-23 23:08:05 +0200
commitb3d9a07086cb81e53e20837c96a3153453b0a123 (patch)
treee6c496d73203465d2ec4265d3200bf32f56362b3 /modules/user
parent145a8be2b22a3a0459a46e70e8b5d8f4ecc701aa (diff)
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>
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/aszlig/profiles/workstation/lazy-packages.nix6
-rw-r--r--modules/user/aszlig/profiles/workstation/packages.nix8
-rw-r--r--modules/user/aszlig/services/i3/default.nix2
-rw-r--r--modules/user/aszlig/services/vlock/default.nix2
4 files changed, 9 insertions, 9 deletions
diff --git a/modules/user/aszlig/profiles/workstation/lazy-packages.nix b/modules/user/aszlig/profiles/workstation/lazy-packages.nix
index 568e0a9f..1a4a9404 100644
--- a/modules/user/aszlig/profiles/workstation/lazy-packages.nix
+++ b/modules/user/aszlig/profiles/workstation/lazy-packages.nix
@@ -1,5 +1,5 @@
 pkgs: with pkgs; [
-  vuizvui.aacolorize
+  vuizvui.aszlig.aacolorize
   aqbanking
   erlang
   fbida
@@ -24,7 +24,7 @@ pkgs: with pkgs; [
   picard
   rtmpdump
   rtorrent
-  vuizvui.santander
-  vuizvui.tomahawk
+  vuizvui.aszlig.santander
+  vuizvui.aszlig.tomahawk
   uqm
 ]
diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix
index 7f5411b1..da56177b 100644
--- a/modules/user/aszlig/profiles/workstation/packages.nix
+++ b/modules/user/aszlig/profiles/workstation/packages.nix
@@ -5,7 +5,7 @@ pkgs: with pkgs; [
   ascii
   aspellDicts.de
   aspellDicts.en
-  vuizvui.axbo
+  vuizvui.aszlig.axbo
   bc
   beets
   chromium
@@ -16,7 +16,7 @@ pkgs: with pkgs; [
   flac
   gdb
   ghostscript
-  vuizvui.git-detach
+  vuizvui.aszlig.git-detach
   glxinfo
   gnumake
   gnupg1compat
@@ -37,7 +37,7 @@ pkgs: with pkgs; [
   netrw
   nix-prefetch-scripts
   nix-repl
-  vuizvui.nixops
+  vuizvui.aszlig.nixops
   nmap
   openssh
   openssl
@@ -45,7 +45,7 @@ pkgs: with pkgs; [
   pavucontrol
   posix_man_pages
   pulseaudioLight
-  vuizvui.pvolctrl
+  vuizvui.aszlig.pvolctrl
   pass
   python
   python3
diff --git a/modules/user/aszlig/services/i3/default.nix b/modules/user/aszlig/services/i3/default.nix
index 1f913f64..9000efb3 100644
--- a/modules/user/aszlig/services/i3/default.nix
+++ b/modules/user/aszlig/services/i3/default.nix
@@ -115,7 +115,7 @@ in
         src = ./i3.conf;
 
         inherit (pkgs) dmenu xterm;
-        inherit (pkgs.vuizvui) pvolctrl;
+        inherit (pkgs.vuizvui.aszlig) pvolctrl;
         inherit (pkgs.xorg) xsetroot;
         inherit wsConfig barConfig;
 
diff --git a/modules/user/aszlig/services/vlock/default.nix b/modules/user/aszlig/services/vlock/default.nix
index f750ccf7..2eced029 100644
--- a/modules/user/aszlig/services/vlock/default.nix
+++ b/modules/user/aszlig/services/vlock/default.nix
@@ -5,7 +5,7 @@ let
 
   messageFile = pkgs.runCommand "message.cat" {} ''
     echo -en '\e[H\e[2J\e[?25l' > "$out"
-    "${pkgs.vuizvui.aacolorize}/bin/aacolorize" \
+    "${pkgs.vuizvui.aszlig.aacolorize}/bin/aacolorize" \
       "${./message.cat}" "${./message.colmap}" \
       >> "$out"
   '';