diff options
| author | lassulus <lass@blue.r> | 2018-09-08 12:59:45 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-09-08 12:59:45 +0200 |
| commit | 8639e4008a34e5e7d68202a621ef8c95fe3087f4 (patch) | |
| tree | 730338125b0b095bd633aabeb67a832ff1b8f5b5 /makefu/2configs | |
| parent | 68bf23466fcaf91df0f11ba0828ef41fc9f694bf (diff) | |
| parent | b4c96ad61109ac59fb90546d104aaeb7ac273c84 (diff) | |
Merge remote-tracking branch 'gum/master' into test
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/bitlbee.nix | 8 | ||||
| -rw-r--r-- | makefu/2configs/default.nix | 11 |
2 files changed, 18 insertions, 1 deletions
diff --git a/makefu/2configs/bitlbee.nix b/makefu/2configs/bitlbee.nix new file mode 100644 index 000000000..17efa7113 --- /dev/null +++ b/makefu/2configs/bitlbee.nix @@ -0,0 +1,8 @@ +{pkgs, ... }: +# state: /var/lib/bitlbee +{ + services.bitlbee = { + enable = true; + libpurple_plugins = [ pkgs.telegram-purple ]; + }; +} diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 0a89d2023..6192a92a5 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -8,13 +8,16 @@ with import <stockholm/lib>; mapAttrs (_: h: { hashedPassword = h; }) (import <secrets/hashedPasswords.nix>); } - ./vim.nix + ./editor/vim.nix ./binary-cache/nixos.nix ]; boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; programs.command-not-found.enable = false; + + nix.package = pkgs.nixUnstable; + nixpkgs.config.allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name); krebs = { enable = true; @@ -158,4 +161,10 @@ with import <stockholm/lib>; "-a task,never" ]; }; + system.activationScripts.state = optionalString (config.state != []) '' + cat << EOF + This machine is burdened with state: + ${concatMapStringsSep "\n" (d: "* ${d}") config.state} + EOF + ''; } |