Merge branch 'prism/master' into HEAD

7 files changed, 113 insertions, 131 deletions

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 1638264d9..32a9f66cf 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -7,9 +7,9 @@ in {
     ./mpv.nix
     ./power-action.nix
     ./copyq.nix
-    ./xresources.nix
     ./livestream.nix
     ./dns-stuff.nix
+    ./urxvt.nix
     {
       hardware.pulseaudio = {
         enable = true;
@@ -41,6 +41,11 @@ in {
           default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
         };
       };
+      config.services.xresources.resources.X = ''
+        *.font:       ${config.lass.fonts.regular}
+        *.boldFont:   ${config.lass.fonts.bold}
+        *.italicFont: ${config.lass.fonts.italic}
+      '';
     }
   ];
 
@@ -64,9 +69,11 @@ in {
     dic
     dmenu
     gi
+    git-preview
     gitAndTools.qgit
-    lm_sensors
     haskellPackages.hledger
+    lm_sensors
+    mpv-poll
     much
     ncdu
     nix-repl
@@ -74,7 +81,7 @@ in {
     pavucontrol
     powertop
     push
-    rxvt_unicode
+    rxvt_unicode_with-plugins
     screengrab
     slock
     sxiv
@@ -97,26 +104,8 @@ in {
     xlibs.fontschumachermisc
   ];
 
+  lass.xserver.enable = true;
   services.xserver = {
-    enable = true;
-
-    desktopManager.xterm.enable = false;
-    desktopManager.default = "none";
-    displayManager.lightdm.enable = true;
-    displayManager.lightdm.autoLogin = {
-      enable = true;
-      user = "lass";
-    };
-    windowManager.default = "xmonad";
-    windowManager.session = [{
-      name = "xmonad";
-      start = ''
-        ${pkgs.xorg.xhost}/bin/xhost +LOCAL:
-        ${pkgs.xmonad-lass}/bin/xmonad &
-        waitPID=$!
-      '';
-    }];
-
     layout = "us";
     xkbModel = "evdev";
     xkbVariant = "altgr-intl";
@@ -127,12 +116,7 @@ in {
     HandleLidSwitch=ignore
   '';
 
-  services.xserver.synaptics = {
-    enable = true;
-    twoFingerScroll = true;
-    accelFactor = "0.035";
-  };
-
   services.urxvtd.enable = true;
+  services.xresources.enable = true;
   lass.screenlock.enable = true;
 }
diff --git a/lass/2configs/copyq.nix b/lass/2configs/copyq.nix
index fa01a99c9..cd10313fc 100644
--- a/lass/2configs/copyq.nix
+++ b/lass/2configs/copyq.nix
@@ -21,9 +21,9 @@ let
 in {
   systemd.services.copyq = {
     wantedBy = [ "multi-user.target" ];
-    requires = [ "display-manager.service" ];
+    requires = [ "xserver.service" ];
     environment = {
-      DISPLAY = ":0";
+      DISPLAY = ":${toString config.services.xserver.display}";
     };
     path = with pkgs; [
       qt5.full
diff --git a/lass/2configs/dcso-dev.nix b/lass/2configs/dcso-dev.nix
new file mode 100644
index 000000000..b7fcc7aab
--- /dev/null
+++ b/lass/2configs/dcso-dev.nix
@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ... }:
+
+let
+  mainUser = config.users.extraUsers.mainUser;
+  inherit (import <stockholm/lib>) genid;
+
+in {
+  users.extraUsers = {
+    dev = {
+      name = "dev";
+      uid = genid "dev";
+      description = "user for collaborative development";
+      home = "/home/dev";
+      useDefaultShell = true;
+      createHome = true;
+      openssh.authorizedKeys.keys = [
+        config.krebs.users.lass.pubkey
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDhQdDQFMxXOjbC+Avx3mlcFHqQpFUk/q9sO6ATA65jCV3YzN11vhZDDv54hABVS2h8TPXs7Lu3PCvK9qouASd2h4Ie9cExUmn50G/iwgFIODsCugVYBzVt1iwaAdwz1Hb9DKYXbVXanzVJjimmrrlQNvsyZg85lcnfyedpPX5ad+4FdSP68LHqEHC18LTitldR6V4P1omaKHlOtVpDgR/72tDgbtNZDBn3EU+TPk9OLTzjc6PinPw4iIvjEfiu14APwXpFDIqT7P7SjOEFpa0v/1z7dhxIy/Z9XbqyEdUfhv3PjZR5K2C+VzR7g6jVEVR2xFId51MpLv/Un4/lalbphBEw3I90Rr8tatOJiFhyrXbaKTcLqp1sIu05OxdPkm3hzfmLIhoKxhaIlXH7WQ9sAqxL1NAQ7O+J6yT4DMnwKzvpkkJjBaGtV84Pp1cccfNRH8XXID3FkWkrUpdgXWBpyLnRq4ilUJTajkU0GSdXkq8kLL3mWg9LPRTg3dmDj61ZB/qhjM61ppwHJvDRN9WI5HruXIU6nOQjh5yE2C/JZfLcsZD4Y1UDBy5/JSZrCVT2sQjFopkkYEkRCbX7oITHOH4iyRdxZkKWLUPboFrcmBpXO+owCEhO4JZrtfFWMC6qM++nrmiZWOrdIOIvdYHWluhKR2shlkisEKQP5pUqkw== markus.hihn@dcso.de"
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1T5+2epslFARSnETdr4wdolA6ocJaD4H9tmz6BZFQKXlwIq+OMp+sSEdwYwW3Lu9+mNbBHPxVVJDWg/We9DXB0ezXPM5Bs1+FcehmkoGwkmgKaFCDt0sL+CfSnog/3wEkN21O/rQxVFqMmiJ7WUDGci6IKCFZ5ZjOsmmfHg5p3LYxU9xv33fNr2v+XauhrGbFtQ7eDz4kSywxN/aw73LN4d8em0V0UV8VPI3Qkw7MamDFwefA+K1TfK8pBzMeruU6N7HLuNkpkAp7kS+K4Zzd72aQtR37a5qMiFUbOxQ9B7iFypuPx0iu6ZwY1s/sM8t3kLmcDJ9O4FOTzlbpneet3as6iJ+Ckr/TlfKor2Tl5pWcXh2FXHoG8VUu5bYmIViJBrKihAlAQfQN0mJ9fdFTnCXVTtbYTy11s4eEVHgUlb7oSpgBnx5bnBONgApbsOX9zyoo8wz8KkZBcf1SQpkV5br8uUAHCcZtHuY6I3kKlv+8lJmgUipiYzMdTi7+dHa49gVEcEKL4ZnJ0msQkl4XT7JjKETLvumC4/TIqVuRu48wuYalkCR9OzxCsTXQ/msBJBztPdYLrEOXVb2HfzuCT+43UuMQ5rP/EoPy0TWQO9BaqfEXqvbOvWjVxj/GMvglQ2ChZTwHxwwTKB8qRVvJLnbZQwizQiSrkzjb6hRJfQ== u0_a165@localhost"
+      ];
+      packages = with pkgs; [
+        emacs25-nox
+
+        (pkgs.symlinkJoin {
+          name = "tmux";
+          paths = [
+            (pkgs.writeDashBin "tmux" ''
+              exec ${pkgs.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" ''
+                set-option -g default-terminal screen-256color
+
+                #use session instead of windows
+                bind-key c new-session
+                bind-key p switch-client -p
+                bind-key n switch-client -n
+                bind-key C-s switch-client -l
+              ''} "$@"
+            '')
+            pkgs.tmux
+          ];
+        })
+      ];
+    };
+  };
+
+  security.sudo.extraConfig = ''
+    ${mainUser.name} ALL=(dev) NOPASSWD: ALL
+  '';
+}
diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index f3ef23e67..98dbdc227 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -22,15 +22,22 @@ let
       });
     };
   in {
-    rules = with git; singleton {
-      user = with config.krebs.users; [
-        config.krebs.users."${config.networking.hostName}-repo-sync"
-        lass
-        lass-shodan
-      ];
-      repo = [ repo ];
-      perm = push ''refs/*'' [ non-fast-forward create delete merge ];
-    };
+    rules = with git; [
+      {
+        user = with config.krebs.users; [
+          config.krebs.users."${config.networking.hostName}-repo-sync"
+          lass
+          lass-shodan
+        ];
+        repo = [ repo ];
+        perm = push ''refs/*'' [ non-fast-forward create delete merge ];
+      }
+      {
+        user = attrValues config.krebs.users;
+        repo = [ repo ];
+        perm = fetch;
+      }
+    ];
     repos."${name}" = repo;
   };
 
diff --git a/lass/2configs/urxvt.nix b/lass/2configs/urxvt.nix
index 1358dde7a..ee50b3381 100644
--- a/lass/2configs/urxvt.nix
+++ b/lass/2configs/urxvt.nix
@@ -1,40 +1,32 @@
 { config, pkgs, ... }:
-
-let
-  inherit (config.users.extraUsers) mainUser;
-
-in
+with import <stockholm/lib>;
 
 {
-  imports = [
-    ../3modules/urxvtd.nix
-    ../3modules/xresources.nix
-  ];
-
-  services.urxvtd = {
-    enable = true;
-    users = [ mainUser.name ];
-    urxvtPackage = pkgs.rxvt_unicode_with-plugins;
-  };
-  services.xresources.enable = true;
+  services.urxvtd.enable = true;
+
   services.xresources.resources.urxvt = ''
-    URxvt*scrollBar:                      false
-    URxvt*urgentOnBell:                   true
-    URxvt*font:                           -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-*
-    URxvt*boldFont:                       -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-*
+    URxvt*SaveLines: 4096
+    URxvt*scrollBar:            false
+    URxvt*urgentOnBell:         true
     URxvt.perl-ext-common:      default,clipboard,url-select,keyboard-select
-    URxvt.url-select.launcher:  browser-select
+
+    ${optionalString (hasAttr "browser" config.lass)
+      "URxvt.url-select.launcher:  ${config.lass.browser.select}/bin/browser-select"
+    }
+
     URxvt.url-select.underline: true
     URxvt.keysym.M-u:           perl:url-select:select_next
     URxvt.keysym.M-Escape:      perl:keyboard-select:activate
     URxvt.keysym.M-s:           perl:keyboard-select:search
 
-    URxvt.intensityStyles: false
+    URxvt.intensityStyles:      false
 
-    URxvt*background:                     #000000
-    URxvt*foreground:                     #ffffff
+    URxvt*background:           #000000
+    URxvt*foreground:           #ffffff
 
     !change unreadable blue
-    URxvt*color4:                         #268bd2
+    URxvt*color4:               #268bd2
+
+    URxvt*color0:               #232342
   '';
 }
diff --git a/lass/2configs/wine.nix b/lass/2configs/wine.nix
index 0d2b731ca..d60b1feea 100644
--- a/lass/2configs/wine.nix
+++ b/lass/2configs/wine.nix
@@ -4,10 +4,6 @@ let
   mainUser = config.users.extraUsers.mainUser;
 
 in {
-  krebs.per-user.wine.packages = with pkgs; [
-    wine
-    #(wineFull.override { wineBuild = "wine64"; })
-  ];
   users.users= {
     wine = {
       name = "wine";
@@ -19,9 +15,27 @@ in {
         "video"
       ];
       createHome = true;
+      packages = [
+        pkgs.wine
+      ];
+    };
+    wine64 = {
+      name = "wine64";
+      description = "user for running wine in 64bit";
+      home = "/home/wine64";
+      useDefaultShell = true;
+      extraGroups = [
+        "audio"
+        "video"
+      ];
+      createHome = true;
+      packages = [
+        (pkgs.wine.override { wineBuild = "wineWow"; })
+      ];
     };
   };
   security.sudo.extraConfig = ''
     ${mainUser.name} ALL=(wine) NOPASSWD: ALL
+    ${mainUser.name} ALL=(wine64) NOPASSWD: ALL
   '';
 }
diff --git a/lass/2configs/xresources.nix b/lass/2configs/xresources.nix
deleted file mode 100644
index a3c54f3a1..000000000
--- a/lass/2configs/xresources.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ config, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-let
-
-  xresources = pkgs.writeText "Xresources" ''
-    URxvt*scrollBar: false
-    URxvt*urgentOnBell: true
-    URxvt*SaveLines: 4096
-
-    URxvt.font:       ${config.lass.fonts.regular}
-    URxvt.boldFont:   ${config.lass.fonts.bold}
-    URxvt.italicFont: ${config.lass.fonts.italic}
-
-    ! ref https://github.com/muennich/urxvt-perls
-    URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl
-    URxvt.perl-ext-common:      default,clipboard,url-select,keyboard-select
-    ${optionalString (hasAttr "browser" config.lass)
-      "URxvt.url-select.launcher:  ${config.lass.browser.select}/bin/browser-select"
-    }
-    URxvt.url-select.underline: true
-    URxvt.keysym.M-u:           perl:url-select:select_next
-    URxvt.keysym.M-Escape:      perl:keyboard-select:activate
-    URxvt.keysym.M-s:           perl:keyboard-select:search
-
-    URxvt.intensityStyles: false
-
-    URxvt*background:    #000000
-    URxvt*foreground:    #d0d7d0
-
-    URxvt*cursorColor:   #f042b0
-    URxvt*cursorColor2:  #f0b000
-    URxvt*cursorBlink:   off
-
-    URxvt*.pointerBlank: true
-    URxvt*.pointerBlankDelay: 987654321
-    URxvt*.pointerColor: #f042b0
-    URxvt*.pointerColor2: #050505
-
-    URxvt*color0:        #232342
-  '';
-
-in {
-  systemd.services.xresources = {
-    description = "xresources";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "display-manager.service" ];
-
-    environment = {
-      DISPLAY = ":0";
-    };
-
-    restartIfChanged = true;
-
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.xorg.xrdb}/bin/xrdb -merge ${xresources}";
-      Restart = "on-failure";
-      User = "lass";
-    };
-  };
-}