From c52c48366eae0b06aa51a3f6d2cc85b34ba680c9 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 19 Oct 2015 13:57:42 +0200
Subject: l 2: rename desktop-base.nix to baseX.nix

---
 lass/1systems/mors.nix         |  2 +-
 lass/1systems/uriel.nix        |  2 +-
 lass/2configs/baseX.nix        | 72 ++++++++++++++++++++++++++++++++++++++++++
 lass/2configs/desktop-base.nix | 72 ------------------------------------------
 4 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100644 lass/2configs/baseX.nix
 delete mode 100644 lass/2configs/desktop-base.nix

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 05efea472..a21518e14 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../2configs/desktop-base.nix
+    ../2configs/baseX.nix
     ../2configs/programs.nix
     ../2configs/bitcoin.nix
     ../2configs/browsers.nix
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 2b36912e5..d18559779 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -3,7 +3,7 @@
 with builtins;
 {
   imports = [
-    ../2configs/desktop-base.nix
+    ../2configs/baseX.nix
     ../2configs/browsers.nix
     ../2configs/games.nix
     ../2configs/pass.nix
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
new file mode 100644
index 000000000..1f5c3de55
--- /dev/null
+++ b/lass/2configs/baseX.nix
@@ -0,0 +1,72 @@
+{ config, pkgs, ... }:
+
+let
+  mainUser = config.users.extraUsers.mainUser;
+in {
+  imports = [
+    ./base.nix
+    ./urxvt.nix
+  ];
+
+  time.timeZone = "Europe/Berlin";
+
+  virtualisation.libvirtd.enable = true;
+
+  hardware.pulseaudio = {
+    enable = true;
+    systemWide = true;
+  };
+
+  programs.ssh.startAgent = false;
+
+  security.setuidPrograms = [ "slock" ];
+
+  services.printing = {
+    enable = true;
+    drivers = [ pkgs.foomatic_filters ];
+  };
+
+  environment.systemPackages = with pkgs; [
+
+    powertop
+    sxiv
+    much
+    push
+
+  #window manager stuff
+    haskellPackages.xmobar
+    haskellPackages.yeganesh
+    dmenu2
+    xlibs.fontschumachermisc
+  ];
+
+  fonts.fonts = [
+    pkgs.xlibs.fontschumachermisc
+  ];
+
+  services.xserver = {
+    enable = true;
+
+    windowManager.xmonad.extraPackages = hspkgs: with hspkgs; [
+      X11-xshape
+    ];
+    windowManager.xmonad.enable = true;
+    windowManager.xmonad.enableContribAndExtras = true;
+    windowManager.default = "xmonad";
+    desktopManager.default = "none";
+    desktopManager.xterm.enable = false;
+    displayManager.slim.enable = true;
+    displayManager.auto.enable = true;
+    displayManager.auto.user = mainUser.name;
+
+    layout = "us";
+    xkbModel = "evdev";
+    xkbVariant = "altgr-intl";
+    xkbOptions = "caps:backspace";
+  };
+
+  services.logind.extraConfig = ''
+    HandleLidSwitch=ignore
+  '';
+
+}
diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix
deleted file mode 100644
index 1f5c3de55..000000000
--- a/lass/2configs/desktop-base.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  mainUser = config.users.extraUsers.mainUser;
-in {
-  imports = [
-    ./base.nix
-    ./urxvt.nix
-  ];
-
-  time.timeZone = "Europe/Berlin";
-
-  virtualisation.libvirtd.enable = true;
-
-  hardware.pulseaudio = {
-    enable = true;
-    systemWide = true;
-  };
-
-  programs.ssh.startAgent = false;
-
-  security.setuidPrograms = [ "slock" ];
-
-  services.printing = {
-    enable = true;
-    drivers = [ pkgs.foomatic_filters ];
-  };
-
-  environment.systemPackages = with pkgs; [
-
-    powertop
-    sxiv
-    much
-    push
-
-  #window manager stuff
-    haskellPackages.xmobar
-    haskellPackages.yeganesh
-    dmenu2
-    xlibs.fontschumachermisc
-  ];
-
-  fonts.fonts = [
-    pkgs.xlibs.fontschumachermisc
-  ];
-
-  services.xserver = {
-    enable = true;
-
-    windowManager.xmonad.extraPackages = hspkgs: with hspkgs; [
-      X11-xshape
-    ];
-    windowManager.xmonad.enable = true;
-    windowManager.xmonad.enableContribAndExtras = true;
-    windowManager.default = "xmonad";
-    desktopManager.default = "none";
-    desktopManager.xterm.enable = false;
-    displayManager.slim.enable = true;
-    displayManager.auto.enable = true;
-    displayManager.auto.user = mainUser.name;
-
-    layout = "us";
-    xkbModel = "evdev";
-    xkbVariant = "altgr-intl";
-    xkbOptions = "caps:backspace";
-  };
-
-  services.logind.extraConfig = ''
-    HandleLidSwitch=ignore
-  '';
-
-}
-- 
cgit v1.2.3