Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lass: move everything to user-toplevel pt. 2

Browse Source
This commit is contained in:
lassulus 2015-07-28 22:20:59 +02:00
parent ce2b97767e
commit fa175ca26e
11 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lass/1systems/cloudkrebs.nix
View File

@ -24,6 +24,7 @@
]; ];
krebs.build = { krebs.build = {
user = config.krebs.users.lass;
target = "root@cloudkrebs"; target = "root@cloudkrebs";
host = config.krebs.hosts.cloudkrebs; host = config.krebs.hosts.cloudkrebs;
deps = { deps = {

35
lass/1systems/mors.nix
View File

@ -2,27 +2,28 @@
{ {
imports = [ imports = [
../../2configs/lass/desktop-base.nix ../2configs/desktop-base.nix
../../2configs/lass/programs.nix ../2configs/programs.nix
../../2configs/lass/bitcoin.nix ../2configs/bitcoin.nix
../../2configs/lass/browsers.nix ../2configs/browsers.nix
../../2configs/lass/games.nix ../2configs/games.nix
../../2configs/lass/pass.nix ../2configs/pass.nix
../../2configs/lass/virtualbox.nix ../2configs/virtualbox.nix
../../2configs/lass/elster.nix ../2configs/elster.nix
../../2configs/lass/urxvt.nix ../2configs/urxvt.nix
../../2configs/lass/steam.nix ../2configs/steam.nix
../../2configs/lass/wine.nix ../2configs/wine.nix
../../2configs/lass/texlive.nix ../2configs/texlive.nix
../../2configs/lass/binary-caches.nix ../2configs/binary-caches.nix
../../2configs/lass/ircd.nix ../2configs/ircd.nix
../../2configs/lass/chromium-patched.nix ../2configs/chromium-patched.nix
../../2configs/lass/new-repos.nix ../2configs/new-repos.nix
#../../2configs/tv/synaptics.nix #../../2configs/tv/synaptics.nix
../../2configs/lass/retiolum.nix ../2configs/retiolum.nix
]; ];
krebs.build = { krebs.build = {
user = config.krebs.users.lass;
target = "root@mors"; target = "root@mors";
host = config.krebs.hosts.mors; host = config.krebs.hosts.mors;
deps = { deps = {

1
lass/1systems/uriel.nix
View File

@ -24,6 +24,7 @@ with builtins;
]; ];
krebs.build = { krebs.build = {
user = config.krebs.users.lass;
target = "root@uriel"; target = "root@uriel";
host = config.krebs.hosts.uriel; host = config.krebs.hosts.uriel;
deps = { deps = {

4
lass/2configs/base.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
{ {
imports = [ imports = [
../../3modules/lass/iptables.nix ../3modules/iptables.nix
../../2configs/lass/vim.nix ../2configs/vim.nix
{ {
users.extraUsers = users.extraUsers =
mapAttrs (_: h: { hashedPassword = h; }) mapAttrs (_: h: { hashedPassword = h; })

4
lass/2configs/identity.nix
View File

@ -1,7 +1,9 @@
{ config, ... }: { config, ... }:
{ {
imports = [ ../../3modules/tv/identity.nix ]; imports = [
../../tv/3modules/identity.nix
];
tv.identity = { tv.identity = {
enable = true; enable = true;
search = "retiolum"; search = "retiolum";

21
lass/2configs/mors/retiolum.nix
View File

@ -1,21 +0,0 @@
{ config, pkgs, ... }:
{
imports = [
../tv/retiolum
];
tv.retiolum = {
enable = true;
hosts = <retiolum-hosts>;
privateKeyFile = "/etc/nixos/secrets/mors.retiolum.rsa_key.priv";
connectTo = [
"fastpoke"
"gum"
"ire"
];
};
networking.firewall.allowedTCPPorts = [ 655 ];
networking.firewall.allowedUDPPorts = [ 655 ];
}

2
lass/2configs/new-repos.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with import ../../tv/lib { inherit lib pkgs; }; with import ../../tv/4lib { inherit lib pkgs; };
let let
out = { out = {

4
lass/2configs/retiolum.nix
View File

@ -2,8 +2,8 @@
{ {
imports = [ imports = [
../../3modules/lass/iptables.nix ../3modules/iptables.nix
../../tv/configs/exim-retiolum.nix ../../tv/2configs/exim-retiolum.nix
]; ];
lass.iptables = { lass.iptables = {

2
lass/2configs/sshkeys.nix
View File

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../../3modules/lass/sshkeys.nix ../3modules/sshkeys.nix
]; ];
config.sshKeys.lass.pub = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== lass@mors"; config.sshKeys.lass.pub = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== lass@mors";

4
lass/2configs/urxvt.nix
View File

@ -7,8 +7,8 @@ in
{ {
imports = [ imports = [
../../3modules/lass/urxvtd.nix ../3modules/urxvtd.nix
../../3modules/lass/xresources.nix ../3modules/xresources.nix
]; ];
services.urxvtd = { services.urxvtd = {

2
lass/3modules/xresources.nix
View File

@ -12,7 +12,7 @@ with lib;
let let
inherit (import ../../4lib/tv { inherit pkgs lib; }) shell-escape; inherit (import ../../tv/4lib { inherit pkgs lib; }) shell-escape;
inherit (pkgs) writeScript; inherit (pkgs) writeScript;
in in