From e05180bbea8c20ef2fe28cec3e9fa23462742b93 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 19:47:34 +0200 Subject: l: actually import 2 default.nix --- lass/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/default.nix b/lass/default.nix index 377708c3e..b1c7c1be8 100644 --- a/lass/default.nix +++ b/lass/default.nix @@ -2,6 +2,7 @@ _: { imports = [ ../krebs + ./2configs ./3modules ./5pkgs ]; -- cgit v1.2.3 From 869090da419c73c0067ffcc36f817a05c2b97695 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 19:53:32 +0200 Subject: l 2 baseX: don't import default.nix --- lass/2configs/baseX.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index a78f52b83..2649ecab9 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -4,11 +4,8 @@ let mainUser = config.users.extraUsers.mainUser; in { imports = [ - ./default.nix - #./urxvt.nix ./xserver ./mpv.nix - #./pulse.nix ./power-action.nix ]; hardware.pulseaudio = { -- cgit v1.2.3 From c3bfd3c3b2bc04b5237b58f65c635818abbcd197 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 22:16:13 +0200 Subject: l 2 tests dummy-secrets: add torrent-authfile --- lass/2configs/tests/dummy-secrets/torrent-authfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 lass/2configs/tests/dummy-secrets/torrent-authfile diff --git a/lass/2configs/tests/dummy-secrets/torrent-authfile b/lass/2configs/tests/dummy-secrets/torrent-authfile new file mode 100644 index 000000000..93a8e1fed --- /dev/null +++ b/lass/2configs/tests/dummy-secrets/torrent-authfile @@ -0,0 +1 @@ +"xxx" -- cgit v1.2.3 From 1596df6441172822cb4a2b47c05e5b7d7a4f2d9f Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 23:07:05 +0200 Subject: k 3 rtorrent: fix tmux binary path --- krebs/3modules/rtorrent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index 3ab23ec5e..57a579bc0 100644 --- a/krebs/3modules/rtorrent.nix +++ b/krebs/3modules/rtorrent.nix @@ -223,7 +223,7 @@ let touch ${systemd-logfile} cp -f ${configFile} ${cfg.workDir}/.rtorrent.rc ''; - ExecStart = "${pkgs.tmux.bin}/bin/tmux new-session -s rt -n rtorrent -d 'PATH=/bin:/usr/bin:${makeBinPath rutorrent-deps} ${cfg.package}/bin/rtorrent'"; + ExecStart = "${pkgs.tmux}/bin/tmux new-session -s rt -n rtorrent -d 'PATH=/bin:/usr/bin:${makeBinPath rutorrent-deps} ${cfg.package}/bin/rtorrent'"; ## you can simply sudo -u rtorrent tmux a if privateTmp is set to false ## otherwise the tmux session is stored in some private folder in /tmp -- cgit v1.2.3 From 5ba1efdca4ca95bfd6001de5eef179b86b8fa0b6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 23:53:27 +0200 Subject: l 2 nixpkgs: c5cbda2 -> 9ad6040 --- lass/2configs/nixpkgs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 902af61a7..ae947b240 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -2,7 +2,7 @@ { krebs.build.source.nixpkgs.git = { - url = https://github.com/nixos/nixpkgs; - ref = "c5cbda24147de441906871238138eb7fc90282db"; + url = https://github.com/lassulus/nixpkgs; + ref = "9ad60400c2a4b964c0947bb52a84ec3f601261ef"; }; } -- cgit v1.2.3 From 046057a80f4abdec1d49a979b6f149de32a5e6e6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 29 Aug 2016 10:13:53 +0200 Subject: l 5 xmonad-lass: bigger brightness steps --- lass/5pkgs/xmonad-lass.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix index c07bd2b83..3bb88a1a2 100644 --- a/lass/5pkgs/xmonad-lass.nix +++ b/lass/5pkgs/xmonad-lass.nix @@ -114,8 +114,8 @@ myKeyMap = , ("", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-mute 0 toggle") , ("", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-source-mute 1 toggle") , ("", gridselectWorkspace gridConfig W.view) - , ("", spawn "xbacklight -steps 1 -time 1 -inc 3") - , ("", spawn "xbacklight -steps 1 -time 1 -dec 3") + , ("", spawn "xbacklight -steps 1 -time 1 -inc 10") + , ("", spawn "xbacklight -steps 1 -time 1 -dec 10") , ("M4-a", focusUrgent) , ("M4-S-r", renameWorkspace def) -- cgit v1.2.3 From c8d089d22fef5835e030906a51ff4be0ab528edb Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 29 Aug 2016 10:58:11 +0200 Subject: l 1 mors: import krebs.lib --- lass/1systems/mors.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index d3878d305..228c76e2c 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -1,5 +1,6 @@ { config, pkgs, ... }: +with config.krebs.lib; { imports = [ ../. -- cgit v1.2.3 From de849cd88c97f55a66a74a9aaca6cb6571dc25e2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 29 Aug 2016 10:58:46 +0200 Subject: l 1 mors: enable public_html --- lass/1systems/mors.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 228c76e2c..2f4299944 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -67,6 +67,16 @@ with config.krebs.lib; ''; }; } + { + krebs.nginx = { + enable = true; + servers.default.locations = [ + (nameValuePair "~ ^/~(.+?)(/.*)?\$" '' + alias /home/$1/public_html$2; + '') + ]; + }; + } ]; krebs.build.host = config.krebs.hosts.mors; -- cgit v1.2.3 From 62741d32f5d0ee57ee7e3988c512cb48cf2cfb63 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 29 Aug 2016 10:59:03 +0200 Subject: l 1 mors: add pkgs.logf --- lass/1systems/mors.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 2f4299944..1ab33e94c 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -190,6 +190,8 @@ with config.krebs.lib; urban mk_sql_pair remmina + + logf ]; #TODO: fix this shit -- cgit v1.2.3 From 3d69e1ca47f8eaff51205c4dc0c3d79e8becec21 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 31 Aug 2016 08:44:43 +0200 Subject: l 1 prism: enable public_html on port 8088 --- lass/1systems/prism.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 47e8a68b4..c7c765302 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -243,6 +243,23 @@ in { ]; }; } + { + krebs.nginx = { + enable = true; + servers.public = { + listen = [ "8088" ]; + server-names = [ "default" ]; + locations = [ + (nameValuePair "~ ^/~(.+?)(/.*)?\$" '' + alias /home/$1/public_html$2; + '') + ]; + }; + }; + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-p tcp --dport 8088"; target = "ACCEPT"; } + ]; + } ]; krebs.build.host = config.krebs.hosts.prism; -- cgit v1.2.3 From 9cccda22a1af9ba96ede7b1c0e42e327d0af5807 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 3 Sep 2016 03:00:51 +0200 Subject: l 1 mors: add exfat to pkgs --- lass/1systems/mors.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 1ab33e94c..1aa4d9b23 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -181,6 +181,8 @@ with config.krebs.lib; ''; environment.systemPackages = with pkgs; [ + exfat + acronym cac-api sshpass -- cgit v1.2.3 From c65c9e6e851945e44acf736d0317eefd02fd8a36 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 3 Sep 2016 03:01:16 +0200 Subject: l 2 privoxy: remove onion proxy --- lass/2configs/privoxy.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lass/2configs/privoxy.nix b/lass/2configs/privoxy.nix index bf5f6e206..33e8d1e46 100644 --- a/lass/2configs/privoxy.nix +++ b/lass/2configs/privoxy.nix @@ -6,9 +6,6 @@ extraConfig = '' #use polipo forward / localhost:8123 - - #route .onion through tor - forward-socks4a .onion localhost:9050 ''; }; services.polipo.enable = true; -- cgit v1.2.3 From ca035b3252b9d480f40495b189b259da6794eaa6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 3 Sep 2016 03:01:50 +0200 Subject: l 2 websites domsen: add .illucloud --- lass/2configs/websites/domsen.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index becd1a872..d5ad38c07 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -48,6 +48,9 @@ in { "ubikmedia.eu" "facts.cloud" "youthtube.xyz" + "illucloud.eu" + "illucloud.de" + "illucloud.com" "www.ubikmedia.de" "www.aldona.ubikmedia.de" "www.apanowicz.de" @@ -57,6 +60,9 @@ in { "www.ubikmedia.eu" "www.facts.cloud" "www.youthtube.xyz" + "www.illucloud.eu" + "www.illucloud.de" + "www.illucloud.com" ]) (serveWordpress [ "ubikmedia.de" @@ -67,6 +73,9 @@ in { "ubikmedia.eu" "facts.cloud" "youthtube.xyz" + "illucloud.eu" + "illucloud.de" + "illucloud.com" "www.apanowicz.de" "www.nirwanabluete.de" "www.aldonasiech.com" @@ -74,6 +83,9 @@ in { "www.ubikmedia.eu" "www.facts.cloud" "www.youthtube.xyz" + "www.illucloud.eu" + "www.illucloud.de" + "www.illucloud.com" "*.ubikmedia.de" ]) ]; -- cgit v1.2.3 From 69d537f1052a2915d802134caafc4040aae037bf Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 3 Sep 2016 18:51:17 +0200 Subject: l 2 nixpkgs: 9ad6040 -> 3fb009d --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index ae947b240..9e3fe888c 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/lassulus/nixpkgs; - ref = "9ad60400c2a4b964c0947bb52a84ec3f601261ef"; + ref = "3fb009d94e70f5d1151f4ec239a90d2de1979a74"; }; } -- cgit v1.2.3