From 089f66a6e000b15a78e3c0b23575d1203e45be40 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jul 2017 06:17:37 +0200
Subject: modules/aszlig: Make vim module a plain package

I don't use anything that's machine specific within my Vim
configuration (and even if, we can pass it via the callPackage
arguments) so it's kinda pointless that it's a module instead of a plain
package (override).

This makes it also easier to nix-build the package without the need to
go through the module system.

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

(limited to 'machines/aszlig')

diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix
index ea592bcb..9db99f1c 100644
--- a/machines/aszlig/managed/brawndo.nix
+++ b/machines/aszlig/managed/brawndo.nix
@@ -75,6 +75,7 @@ in {
     unfreePkgs.steam
     unfreeAndNonDistributablePkgs.skype
     thunderbird
+    vuizvui.aszlig.vim
     wine
     xpdf
     youtubeDL
@@ -111,6 +112,5 @@ in {
   vuizvui.user.aszlig.profiles.managed.enable = true;
   vuizvui.user.aszlig.profiles.managed.mainUser = "dwenola";
 
-  vuizvui.user.aszlig.programs.vim.enable = true;
   vuizvui.enableGlobalNixpkgsConfig = true;
 }
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index 5305a1e6..f6651752 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -10,8 +10,9 @@
   environment.systemPackages = with pkgs; [
     calibre cdparanoia chromium figlet vuizvui.aszlig.gajim gimp htop inkscape
     thunderbird kdeApplications.kate kdeApplications.gwenview
-    kdeApplications.okular krita libreoffice mosh mpv pciutils vlc wget wine
-    youtubeDL unfreeAndNonDistributablePkgs.skype
+    kdeApplications.okular krita libreoffice mosh mpv pciutils
+    vuizvui.aszlig.vim vlc wget wine youtubeDL
+    unfreeAndNonDistributablePkgs.skype
   ];
 
   fileSystems."/boot".device = "/dev/disk/by-uuid/A0D5-269D";
@@ -81,5 +82,4 @@
   vuizvui.user.aszlig.profiles.managed.mainUser = "bla";
 
   vuizvui.hardware.t100ha.enable = true;
-  vuizvui.user.aszlig.programs.vim.enable = true;
 }
-- 
cgit 1.4.1