diff options
author | jeschli <jeschli@gmail.com> | 2019-04-02 19:38:35 +0200 |
---|---|---|
committer | jeschli <jeschli@gmail.com> | 2019-04-02 19:38:35 +0200 |
commit | f8b88080d5bb27e4a6b35b26d6036de40517ba57 (patch) | |
tree | f8a077997ca889950daa0cb5ec11cc486f420bbe | |
parent | 17712c90772d68f174f579e570fa23a8fa674245 (diff) | |
parent | 6654f03b09b7b80e3ee6339c92e6172579349744 (diff) |
:Merge branch 'master' of prism.r:stockholm
119 files changed, 2052 insertions, 1251 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 7ac4cc2c0..b9bb021b8 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -103,7 +103,9 @@ in gotools # rust cargo - rustc + rustracer + rustup + vscode # orga tools taskwarrior # xorg @@ -143,19 +145,11 @@ in ''; } ]; -# xmonad = { -# enable = true; -# enableContribAndExtras = true; -# extraPackages = haskellPackages: [ -# haskellPackages.xmonad-contrib -# haskellPackages.xmonad-extras -# haskellPackages.xmonad -# ]; -# } - }; }; + services.xserver.windowManager.i3.enable = true; + users.extraUsers.jeschli = { # TODO: define as krebs.users isNormalUser = true; extraGroups = ["docker" "vboxusers" "audio"]; diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index ff6b539ba..4d90ae3d5 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -61,7 +61,7 @@ let ]; hooks.PRIVMSG = [ { - pattern = "^bier bal(ance)*$"; + pattern = "^bier bal(an(ce)?)?$"; activate = "match"; command = { env = { @@ -134,6 +134,7 @@ in { }; r = { nick = "reaktor2|krebs"; + sendDelaySec = null; plugins = [ { plugin = "register"; diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 9303a81fb..567c077eb 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix |