Merge branch 'master' of pnp:stockholm

This commit is contained in:
makefu 2015-12-08 18:08:51 +01:00
commit 3a9cbcdcd7
2 changed files with 15 additions and 1 deletions

View File

@ -16,11 +16,13 @@
../2configs/zsh-user.nix ../2configs/zsh-user.nix
# applications # applications
../2configs/exim-retiolum.nix ../2configs/exim-retiolum.nix
../2configs/mail-client.nix ../2configs/mail-client.nix
../2configs/printer.nix
#../2configs/virtualization.nix #../2configs/virtualization.nix
../2configs/virtualization.nix ../2configs/virtualization.nix
#../2configs/virtualization-virtualbox.nix ../2configs/virtualization-virtualbox.nix
../2configs/wwan.nix ../2configs/wwan.nix
# services # services
@ -34,6 +36,7 @@
# ../2configs/mediawiki.nix # ../2configs/mediawiki.nix
#../2configs/wordpress.nix #../2configs/wordpress.nix
]; ];
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
#krebs.Reaktor.enable = true; #krebs.Reaktor.enable = true;
#krebs.Reaktor.nickname = "makefu|r"; #krebs.Reaktor.nickname = "makefu|r";
@ -43,6 +46,7 @@
get get
virtmanager virtmanager
gnome3.dconf gnome3.dconf
krebspaste
]; ];
services.logind.extraConfig = "HandleLidSwitch=ignore"; services.logind.extraConfig = "HandleLidSwitch=ignore";

View File

@ -0,0 +1,10 @@
{ pkgs, ... }:
{
services.printing = {
enable = true;
drivers = [
pkgs.samsungUnifiedLinuxDriver
];
};
}