about summary refs log tree commit diff
path: root/machines/sternenseemann/schnurrkadse.nix
diff options
context:
space:
mode:
authorlukasepple <git@lukasepple.de>2016-06-05 02:10:54 +0200
committerlukasepple <git@lukasepple.de>2016-06-05 02:17:05 +0200
commit7f2ae29d6bc1483c0329345a42773285a58df5c2 (patch)
tree2cb74cbd6fd34d6c87cf22ee89191cba2f45c93a /machines/sternenseemann/schnurrkadse.nix
parent3f2c5735900294ddb4187492994952eea8dcd0c5 (diff)
schnurrkadse: bump
Diffstat (limited to 'machines/sternenseemann/schnurrkadse.nix')
-rw-r--r--machines/sternenseemann/schnurrkadse.nix24
1 files changed, 12 insertions, 12 deletions
diff --git a/machines/sternenseemann/schnurrkadse.nix b/machines/sternenseemann/schnurrkadse.nix
index 2aea6984..768f3620 100644
--- a/machines/sternenseemann/schnurrkadse.nix
+++ b/machines/sternenseemann/schnurrkadse.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-   mytexlive = with pkgs.texlive; combine { inherit scheme-medium minted units collection-bibtexextra ifplatform xstring doublestroke; };
+   mytexlive = with pkgs.texlive; combine { inherit scheme-medium minted units collection-bibtexextra ifplatform xstring doublestroke csquotes; };
 
 in {
   nixpkgs.config.allowUnfree = true;
@@ -51,7 +51,7 @@ in {
 
   i18n = {
     consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "de-latin1";
+    consoleKeyMap = "de";
     defaultLocale = "en_US.UTF-8";
   };
 
@@ -79,6 +79,9 @@ in {
     pavucontrol
     hostapd
     pandoc
+    unison
+    lame
+    ffmpeg
 
     # texlive, minted deps
     mytexlive
@@ -87,7 +90,7 @@ in {
     python
 
     w3m
-    chromium
+    torbrowser
     mpv
     htop
     feh
@@ -114,7 +117,7 @@ in {
   fonts.fontconfig = {
     defaultFonts = {
       monospace = [ "Inconsolata" "Source Code Pro" "DejaVu Sans Mono" ];
-      sansSerif = [ "Liberation Sans" ];
+      sansSerif = [ "Ubuntu" "Liberation Sans" "DejaVu Sans" ];
     };
     ultimate = {
       rendering = {
@@ -136,12 +139,14 @@ in {
     dejavu_fonts
     ubuntu_font_family
     inconsolata
-    tewi-font
     libertine
+    unifont
   ];
 
   services.openssh.enable = true;
 
+  services.tor.enable = true;
+
   services.printing = {
     enable = true;
     drivers = [ pkgs.gutenprint pkgs.hplip ];
@@ -152,9 +157,6 @@ in {
 
   services.tlp.enable = true;
 
-  services.syncthing.enable = true;
-  services.syncthing.user = "lukas";
-
   services.xserver = {
     enable = true;
     layout = "de";
@@ -180,8 +182,6 @@ in {
     synaptics.twoFingerScroll = false;
 
     videoDrivers = [ "intel" ];
-
-    startGnuPGAgent = true;
   };
 
   programs.fish.enable = true;
@@ -189,9 +189,9 @@ in {
   users.users.lukas = {
     isNormalUser = true;
     uid = 1000;
-    shell = "/run/current-system/sw/bin/fish";
+    shell = "${pkgs.fish}/bin/fish";
     group = "users";
-    extraGroups = [ "audio" "wheel" "networkmanager" ];
+    extraGroups = [ "audio" "wheel" "networkmanager" "uucp" ];
   };
 
   environment.etc."vte.sh" = { source = "${pkgs.gnome3.vte}/etc/profile.d/vte.sh"; };