summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-05-15 16:42:01 +0200
committertv <tv@shackspace.de>2015-05-19 23:17:20 +0200
commit1eb9c8fdd1fcbfe13f2bf67cc386a2606c9be501 (patch)
tree4ccb49428490789d56c92e5bfd06cc3575b0cb00 /modules
parent709777dd4910fef1f68685a767f679ce2cc4d3d6 (diff)
cleanup, minor changes
Diffstat (limited to 'modules')
-rw-r--r--modules/common/nixpkgs.nix2
-rw-r--r--modules/lass/binary-caches.nix4
-rw-r--r--modules/mors/default.nix17
-rw-r--r--modules/uriel/default.nix28
4 files changed, 19 insertions, 32 deletions
diff --git a/modules/common/nixpkgs.nix b/modules/common/nixpkgs.nix
index 09b88672b..9f8e70271 100644
--- a/modules/common/nixpkgs.nix
+++ b/modules/common/nixpkgs.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
with lib;
diff --git a/modules/lass/binary-caches.nix b/modules/lass/binary-caches.nix
index a4ab41588..4755b116f 100644
--- a/modules/lass/binary-caches.nix
+++ b/modules/lass/binary-caches.nix
@@ -7,7 +7,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCZSq5oLrokkh3F+MOdK5/nzVIEDvqyvfzLMNWmzsYD root@uriel"
];
nix.binaryCaches = [
- "ssh://nix@mors"
- "ssh://nix@uriel"
+ "scp://nix-ssh@mors"
+ "scp://nix-ssh@uriel"
];
}
diff --git a/modules/mors/default.nix b/modules/mors/default.nix
index 966882733..8768cd1ec 100644
--- a/modules/mors/default.nix
+++ b/modules/mors/default.nix
@@ -35,6 +35,7 @@
networking.extraHosts = ''
'';
+
nix.maxJobs = 4;
hardware.enableAllFirmware = true;
@@ -153,8 +154,8 @@
'';
};
- #TODO move into modules
users.extraUsers = {
+ #main user
mainUser = {
uid = 1337;
name = "lass";
@@ -166,20 +167,6 @@
isSystemUser = false;
extraGroups = [ "wheel" "audio" ];
};
- root = {
- #main user
- #miefda-mc-dev user
- miefda = {
- uid = 1338;
- name = "miefda";
- #isNormalUser = true;
- group = "users";
- createHome = true;
- home = "/home/miefda";
- useDefaultShell = true;
- isSystemUser = false;
- description = "miefda-minecraft-dev";
- };
};
environment.systemPackages = with pkgs; [
diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix
index 3ae389566..42e9f89a4 100644
--- a/modules/uriel/default.nix
+++ b/modules/uriel/default.nix
@@ -1,17 +1,17 @@
- { config, pkgs, ... }:
-
- {
- imports = [
- ../lass/desktop-base.nix
- ../lass/retiolum-uriel.nix
- ../lass/xserver-lass.nix
- ../lass/browsers.nix
- ../lass/programs.nix
- ../lass/games.nix
- ../tv/exim-retiolum.nix
- ../lass/pass.nix
- ../lass/vim.nix
- ../lass/urxvt.nix
+{ config, pkgs, ... }:
+
+{
+ imports = [
+ ../lass/desktop-base.nix
+ ../lass/retiolum-uriel.nix
+ ../lass/xserver-lass.nix
+ ../lass/browsers.nix
+ ../lass/programs.nix
+ ../lass/games.nix
+ ../tv/exim-retiolum.nix
+ ../lass/pass.nix
+ ../lass/vim.nix
+ ../lass/urxvt.nix
../common/nixpkgs.nix
../../secrets/uriel-pw.nix
../lass/sshkeys.nix