diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-08 18:08:51 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-08 18:08:51 +0100 |
| commit | 3a9cbcdcd749138168ee41d1f010bbf206a11667 (patch) | |
| tree | 0d8c14df30471e86555affd31606c9c72ca4c6ef | |
| parent | d83489feb1005dae7161909fcd0bf81a37e1ca41 (diff) | |
| parent | 273d9c6c9c9d2419dc3f3d773b4ce8d2fa4601b4 (diff) | |
Merge branch 'master' of pnp:stockholm
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/printer.nix | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 8624cb2d1..977289470 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -16,11 +16,13 @@ ../2configs/zsh-user.nix # applications + ../2configs/exim-retiolum.nix ../2configs/mail-client.nix + ../2configs/printer.nix #../2configs/virtualization.nix ../2configs/virtualization.nix - #../2configs/virtualization-virtualbox.nix + ../2configs/virtualization-virtualbox.nix ../2configs/wwan.nix # services @@ -34,6 +36,7 @@ # ../2configs/mediawiki.nix #../2configs/wordpress.nix ]; + nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; #krebs.Reaktor.enable = true; #krebs.Reaktor.nickname = "makefu|r"; @@ -43,6 +46,7 @@ get virtmanager gnome3.dconf + krebspaste ]; services.logind.extraConfig = "HandleLidSwitch=ignore"; diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix new file mode 100644 index 000000000..35ad54bd9 --- /dev/null +++ b/makefu/2configs/printer.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +{ + services.printing = { + enable = true; + drivers = [ + pkgs.samsungUnifiedLinuxDriver + ]; + }; +} |