From c11ac8374832d5a01e0f8e8d25a723476944c9c2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 12:19:25 +0200 Subject: lass 2 desktop-base: add much --- lass/2configs/desktop-base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix index ed84edef..4e693997 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 = [ -- cgit v1.2.3 From 7820eae9b6f9a91927caf646074d5d2b79093489 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 14:50:07 +0200 Subject: lass 2 realwallpaper: update due to file move --- lass/2configs/realwallpaper.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index f1c8861e..c69cb166 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; } -- cgit v1.2.3 From f4f5633b0e0ec711202d2d56735b6b55c8c69138 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 14:52:24 +0200 Subject: lass 2 git: make echelon main git host --- lass/2configs/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 78e6f0ba..595936da 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -51,7 +51,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"; }; }; }; -- cgit v1.2.3 From 892c99706a1c997ae064e443c2162a5659b8a05e Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 8 Oct 2015 12:05:32 +0200 Subject: lass 2: add skype.nix --- lass/2configs/skype.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 lass/2configs/skype.nix (limited to 'lass/2configs') diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix new file mode 100644 index 00000000..7e4618a7 --- /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 + ''; +} -- cgit v1.2.3 From 45acff36265352e168928399957241abf4eb0dc1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:07:44 +0200 Subject: lass 2 git: add go repo --- lass/2configs/git.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs') diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 595936da..d63705ab 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 ( -- cgit v1.2.3 From d478ed4e06dbf84688bb99aa00b95e1d8b09f3b1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:09:13 +0200 Subject: lass 2 ircd: change sid and hostname --- lass/2configs/ircd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix index f71b769f..fc0aeb84 100644 --- a/lass/2configs/ircd.nix +++ b/lass/2configs/ircd.nix @@ -5,8 +5,8 @@ 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"; -- cgit v1.2.3 From 20724bfcf7cb10a6e8ebf153e46ffac3d9ebbf67 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:10:15 +0200 Subject: lass 2: add redix.nix --- lass/2configs/redis.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lass/2configs/redis.nix (limited to 'lass/2configs') diff --git a/lass/2configs/redis.nix b/lass/2configs/redis.nix new file mode 100644 index 00000000..8dd8df5c --- /dev/null +++ b/lass/2configs/redis.nix @@ -0,0 +1,8 @@ +{ config, ... }: + +{ + config.services.redis = { + enable = true; + bind = "127.0.0.1"; + }; +} -- cgit v1.2.3 From 8b42c0631e86da5e05a4659887d9c7958bf27636 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:23:45 +0200 Subject: lass 2 ircd: open port 6667 to retiolum --- lass/2configs/ircd.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass/2configs') diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix index fc0aeb84..de96ad9d 100644 --- a/lass/2configs/ircd.nix +++ b/lass/2configs/ircd.nix @@ -1,6 +1,9 @@ { config, pkgs, ... }: { + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-i retiolum -p tcp --dport 6667"; target = "ACCEPT"; } + ]; config.services.charybdis = { enable = true; config = '' -- cgit v1.2.3 From c8c2b254e5f633618b43be6b348c747e903f7577 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:24:13 +0200 Subject: lass 2: add go.nix --- lass/2configs/go.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 lass/2configs/go.nix (limited to 'lass/2configs') diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix new file mode 100644 index 00000000..30d3e6ae --- /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"; } + ]; +} -- cgit v1.2.3