summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/desktop-base.nix4
-rw-r--r--lass/2configs/git.nix3
-rw-r--r--lass/2configs/go.nix16
-rw-r--r--lass/2configs/ircd.nix7
-rw-r--r--lass/2configs/realwallpaper.nix6
-rw-r--r--lass/2configs/redis.nix8
-rw-r--r--lass/2configs/skype.nix30
7 files changed, 64 insertions, 10 deletions
diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix
index ed84edefa..4e693997d 100644
--- a/lass/2configs/desktop-base.nix
+++ b/lass/2configs/desktop-base.nix
@@ -28,14 +28,14 @@ in {
environment.systemPackages = with pkgs; [
powertop
+ sxiv
+ much
#window manager stuff
haskellPackages.xmobar
haskellPackages.yeganesh
dmenu2
xlibs.fontschumachermisc
-
- sxiv
];
fonts.fonts = [
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 78e6f0baa..d63705ab6 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -31,6 +31,7 @@ let
};
wai-middleware-time = {};
web-routes-wai-custom = {};
+ go = {};
};
restricted-repos = mapAttrs make-restricted-repo (
@@ -51,7 +52,7 @@ let
nick = config.krebs.build.host.name;
channel = "#retiolum";
server = "cd.retiolum";
- verbose = config.krebs.build.host.name == "cloudkrebs";
+ verbose = config.krebs.build.host.name == "echelon";
};
};
};
diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix
new file mode 100644
index 000000000..30d3e6ae5
--- /dev/null
+++ b/lass/2configs/go.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{
+ imports = [
+ ../3modules/go.nix
+ ];
+ environment.systemPackages = [
+ pkgs.go
+ ];
+ lass.go = {
+ enable = true;
+ };
+ krebs.iptables.tables.filter.INPUT.rules = [
+ { predicate = "-i retiolum -p tcp --dport 1337"; target = "ACCEPT"; }
+ ];
+}
diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix
index f71b769fd..de96ad9d6 100644
--- a/lass/2configs/ircd.nix
+++ b/lass/2configs/ircd.nix
@@ -1,12 +1,15 @@
{ config, pkgs, ... }:
{
+ krebs.iptables.tables.filter.INPUT.rules = [
+ { predicate = "-i retiolum -p tcp --dport 6667"; target = "ACCEPT"; }
+ ];
config.services.charybdis = {
enable = true;
config = ''
serverinfo {
- name = "ire.irc.retiolum";
- sid = "4z3";
+ name = "${config.krebs.build.host.name}.irc.retiolum";
+ sid = "1as";
description = "miep!";
network_name = "irc.retiolum";
network_desc = "Retiolum IRC Network";
diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix
index f1c8861e1..c69cb1660 100644
--- a/lass/2configs/realwallpaper.nix
+++ b/lass/2configs/realwallpaper.nix
@@ -1,9 +1,5 @@
{ config, ... }:
{
- imports = [
- ../3modules/realwallpaper.nix
- ];
-
- lass.realwallpaper.enable = true;
+ krebs.realwallpaper.enable = true;
}
diff --git a/lass/2configs/redis.nix b/lass/2configs/redis.nix
new file mode 100644
index 000000000..8dd8df5c3
--- /dev/null
+++ b/lass/2configs/redis.nix
@@ -0,0 +1,8 @@
+{ config, ... }:
+
+{
+ config.services.redis = {
+ enable = true;
+ bind = "127.0.0.1";
+ };
+}
diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix
new file mode 100644
index 000000000..7e4618a7b
--- /dev/null
+++ b/lass/2configs/skype.nix
@@ -0,0 +1,30 @@
+{ config, pkgs, ... }:
+
+let
+ mainUser = config.users.extraUsers.mainUser;
+
+in {
+ imports = [
+ ../3modules/per-user.nix
+ ];
+
+ users.extraUsers = {
+ skype = {
+ name = "skype";
+ uid = 2259819492; #genid skype
+ description = "user for running skype";
+ home = "/home/skype";
+ useDefaultShell = true;
+ extraGroups = [ "audio" "video" ];
+ createHome = true;
+ };
+ };
+
+ lass.per-user.skype.packages = [
+ pkgs.skype
+ ];
+
+ security.sudo.extraConfig = ''
+ ${mainUser.name} ALL=(skype) NOPASSWD: ALL
+ '';
+}