Merge remote-tracking branch 'origin/master'

9 files changed, 27 insertions, 107 deletions

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 7d04827f0..95aac2d18 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -8,7 +8,6 @@ in {
     ./mpv.nix
     ./power-action.nix
     ./copyq.nix
-    ./livestream.nix
     ./urxvt.nix
     ./network-manager.nix
     {
@@ -58,30 +57,18 @@ in {
   programs.ssh.startAgent = true;
   services.openssh.forwardX11 = true;
 
-  services.printing = {
-    enable = true;
-    drivers = [
-      pkgs.foomatic_filters
-      pkgs.gutenprint
-    ];
-  };
-
   environment.systemPackages = with pkgs; [
     acpi
     ag
-    bank
     cabal2nix
     cholerab
     dic
     dmenu
     font-size
-    gi
     gitAndTools.qgit
     git-preview
     gnome3.dconf
     lm_sensors
-    mpv-poll
-    much
     ncdu
     nix-index
     nix-repl
@@ -90,18 +77,14 @@ in {
     powertop
     push
     rxvt_unicode_with-plugins
-    slock
     sxiv
     taskwarrior
     termite
-    timewarrior
     xclip
     xephyrify
     xorg.xbacklight
     xorg.xhost
     xsel
-    youtube-tools
-    yt-next
     zathura
   ];
 
@@ -112,7 +95,6 @@ in {
     xlibs.fontschumachermisc
   ];
 
-  #lass.xserver.enable = true;
   services.xserver = {
     enable = true;
     layout = "us";
diff --git a/lass/2configs/blue.nix b/lass/2configs/blue.nix
index 363705edc..16c63ff38 100644
--- a/lass/2configs/blue.nix
+++ b/lass/2configs/blue.nix
@@ -12,6 +12,7 @@ with (import <stockholm/lib>);
   environment.systemPackages = with pkgs; [
     ag
     nmap
+    git-preview
   ];
 
   services.tor.enable = true;
diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 272169e92..425e0ee13 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -29,7 +29,7 @@ let
       environment.systemPackages = [
         config.lass.xjail-bins.${name}
         (pkgs.writeDashBin "cx-${name}" ''
-          DISPLAY=:${toString (genid_signed name)} ${pkgs.xclip}/bin/xclip -o | DISPLAY=:0 ${pkgs.xclip}/bin/xclip
+          DISPLAY=:${toString (genid_uint31 name)} ${pkgs.xclip}/bin/xclip -o | DISPLAY=:0 ${pkgs.xclip}/bin/xclip
         '')
       ];
       lass.browser.paths.${name} = {
@@ -66,6 +66,7 @@ in {
     extensions = [
       "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
       "dbepggeogbaibhgnhhndojpepiihcmeb" # vimium
+      "liloimnbhkghhdhlamdjipkmadhpcjmn" # krebsgold
     ];
   };
 
diff --git a/lass/2configs/ciko.nix b/lass/2configs/ciko.nix
index 56c9a286c..b08cf9307 100644
--- a/lass/2configs/ciko.nix
+++ b/lass/2configs/ciko.nix
@@ -2,7 +2,7 @@
 with import <stockholm/lib>;
 {
   users.users.ciko = {
-    uid = genid_signed "ciko";
+    uid = genid_uint31 "ciko";
     description = "acc for ciko";
     home = "/home/ciko";
     useDefaultShell = true;
diff --git a/lass/2configs/dcso-dev.nix b/lass/2configs/dcso-dev.nix
deleted file mode 100644
index 4d8d308fb..000000000
--- a/lass/2configs/dcso-dev.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  mainUser = config.users.extraUsers.mainUser;
-  inherit (import <stockholm/lib>) genid;
-
-in {
-  users.extraUsers = {
-    dev = {
-      name = "dev";
-      uid = genid "dev";
-      extraGroups = [ "docker" "vboxusers" ];
-      description = "user for collaborative development";
-      home = "/home/dev";
-      useDefaultShell = true;
-      createHome = true;
-      openssh.authorizedKeys.keys = [
-        config.krebs.users.lass.pubkey
-        config.krebs.users.lass-android.pubkey
-        config.krebs.users.lass-mors.pubkey
-        config.krebs.users.jeschli-bln.pubkey
-        config.krebs.users.jeschli-brauerei.pubkey
-        "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"
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCjtdqRxD0+UU7O8xogSqAQYd/Hrc79CTTKnvbhKy7jp2TVfxQpl81ndSH6DN6Cz90mu65C+DFGq43YtKTPqXmTn1+2wru71C2UOl6ZR0tmU7UELkRt4SJuFQLEgQCt3BWvXJPye6cKRRIlb+XZHWyVyCDxHo9EYO2GWI1wIP8mHMltKj65mobHY+R0CJNhhwlFURzTto8C30ejfVg2OW81qkNWqYtpdC9txLUlQ9/LBVKrafHGprmcBEp9qtecVgx8kxHpS7cuQNYoFcfljug4IyFO+uBfdbKqnGM5mra3huNhX3+AcQxKbLMlRgZD+jc47Xs+s5qSvWBou2ygd5T413k/SDOTCxDjidA+dcwzRo0qUWcGL201a5g+F0EvWv8rjre9m0lii6QKEoPyj60y3yfaIHeafels1Ia1FItjkBe8XydiXf7rKq8nmVRlpo8vl+vKwVuJY783tObHjUgBtXJdmnyYGiXxkxSrXa2mQhPz3KodK/QrnqCP27dURcMlp1hFF3LxFz7WtMCLW0yvDuUsuI2pdq0+zdt702wuwXVNIvbq/ssvX/CL8ryBLAogaxN9DN0vpjk+aXQLn11Zt99MgmnnqUgvOKQi1Quog/SxnSBiloKqB6aA10a28Uxoxkr0KAfhWhX3XPpfGMlbVj4GJuevLp0sGDVQT2biUQ== rhaist@RH-NB"
-      ];
-      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
-          ];
-        })
-      ];
-    };
-  };
-
-  krebs.iptables.tables.filter.INPUT.rules = [
-    { predicate = "-p tcp --dport 8000"; target = "ACCEPT";}
-    { predicate = "-p tcp --dport 9000"; target = "ACCEPT";}
-  ];
-
-  krebs.per-user.dev.packages = [
-    pkgs.go
-  ];
-  environment.variables.GOPATH = "$HOME/go";
-
-  security.sudo.extraConfig = ''
-    ${mainUser.name} ALL=(dev) NOPASSWD: ALL
-  '';
-
-  networking.interfaces.et0.ipv4.addresses = [
-    { address = "10.99.23.1"; prefixLength = 24; }
-  ];
-  virtualisation.docker.enable = true;
-  environment.etc."docker/daemon.json".source = pkgs.writeText "daemon.json" ''
-    {
-      "bip": "172.25.0.1/16"
-    }
-  '';
-  services.rabbitmq.enable = true;
-  services.postgresql.enable = true;
-}
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index db6bda005..30757964c 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -84,6 +84,7 @@ with import <stockholm/lib>;
       { from = "boardgamegeek@lassul.us"; to = lass.mail; }
       { from = "qwertee@lassul.us"; to = lass.mail; }
       { from = "zazzle@lassul.us"; to = lass.mail; }
+      { from = "hackbeach@lassul.us"; to = lass.mail; }
     ];
     system-aliases = [
       { from = "mailer-daemon"; to = "postmaster"; }
diff --git a/lass/2configs/print.nix b/lass/2configs/print.nix
new file mode 100644
index 000000000..e2d021641
--- /dev/null
+++ b/lass/2configs/print.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  services.printing = {
+    enable = true;
+    drivers = [
+      pkgs.foomatic_filters
+      pkgs.gutenprint
+    ];
+  };
+}
diff --git a/lass/2configs/urxvt.nix b/lass/2configs/urxvt.nix
index 90d28d650..fa63ddf25 100644
--- a/lass/2configs/urxvt.nix
+++ b/lass/2configs/urxvt.nix
@@ -19,9 +19,9 @@ with import <stockholm/lib>;
     URxvt.keysym.M-Escape:      perl:keyboard-select:activate
     URxvt.keysym.M-s:           perl:keyboard-select:search
 
-    URxvt.keysym.M-F1: command:\033]710;-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1\007\033]711;-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1\007
-    URxvt.keysym.M-F2: command:\033]710;xft:Monospace:size=15\007\033]711;xft:Monospace:size=15:bold\007
-    URxvt.keysym.M-F3: command:\033]710;xft:Monospace:size=20\007\033]711;xft:Monospace:size=20:bold\007
+    URxvt.keysym.M-F1: command:\033]710;${config.lass.fonts.regular}\007\033]711;${config.lass.fonts.bold}\007
+    URxvt.keysym.M-F2: command:\033]710;xft:Monospace:size=12\007\033]711;xft:Monospace:size=15:bold\007
+    URxvt.keysym.M-F3: command:\033]710;xft:Monospace:size=18\007\033]711;xft:Monospace:size=20:bold\007
     URxvt.keysym.M-F4: command:\033]710;xft:Monospace:size=25\007\033]711;xft:Monospace:size=25:bold\007
     URxvt.keysym.M-F5: command:\033]710;xft:Monospace:size=30\007\033]711;xft:Monospace:size=30:bold\007
 
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index d19f534fe..e1c1313ea 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -4,7 +4,7 @@ let
 
   inherit (import <stockholm/lib>)
     genid
-    genid_signed
+    genid_uint31
   ;
   inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
     servePage
@@ -134,7 +134,7 @@ in {
   };
 
   users.users.domsen = {
-    uid = genid_signed "domsen";
+    uid = genid_uint31 "domsen";
     description = "maintenance acc for domsen";
     home = "/home/domsen";
     useDefaultShell = true;
@@ -143,49 +143,49 @@ in {
   };
 
   users.users.bruno = {
-    uid = genid_signed "bruno";
+    uid = genid_uint31 "bruno";
     home = "/home/bruno";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.jla-trading = {
-    uid = genid_signed "jla-trading";
+    uid = genid_uint31 "jla-trading";
     home = "/home/jla-trading";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.jms = {
-    uid = genid_signed "jms";
+    uid = genid_uint31 "jms";
     home = "/home/jms";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.ms = {
-    uid = genid_signed "ms";
+    uid = genid_uint31 "ms";
     home = "/home/ms";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.testuser = {
-    uid = genid_signed "testuser";
+    uid = genid_uint31 "testuser";
     home = "/home/testuser";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.akayguen = {
-    uid = genid_signed "akayguen";
+    uid = genid_uint31 "akayguen";
     home = "/home/akayguen";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.bui = {
-    uid = genid_signed "bui";
+    uid = genid_uint31 "bui";
     home = "/home/bui";
     useDefaultShell = true;
     createHome = true;