Merge branch 'master' of gum:stockholm

6 files changed, 13 insertions, 22 deletions

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 40f4e12c7..66e12b262 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -50,7 +50,7 @@ with lib;
       source = {
         git.nixpkgs = {
           url = https://github.com/Lassulus/nixpkgs;
-          rev = "363c8430f1efad8b03d5feae6b3a4f2fe7b29251";
+          rev = "93d8671e2c6d1d25f126ed30e5e6f16764330119";
         };
         dir.secrets = {
           host = config.krebs.hosts.mors;
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 4e46c18d2..0596682df 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -31,10 +31,15 @@ in {
 
   environment.systemPackages = with pkgs; [
 
-    powertop
-    sxiv
+    gitAndTools.qgit
+    mpv
     much
+    pavucontrol
+    powertop
     push
+    slock
+    sxiv
+    xsel
     zathura
 
   #window manager stuff
diff --git a/lass/2configs/libvirt.nix b/lass/2configs/libvirt.nix
index 368722e77..7520a0e36 100644
--- a/lass/2configs/libvirt.nix
+++ b/lass/2configs/libvirt.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   mainUser = config.users.extraUsers.mainUser;
@@ -8,7 +8,7 @@ in {
 
   users.extraUsers = {
     libvirt = {
-      uid = 358821352; # genid libvirt
+      uid = lib.genid "libvirt";
       description = "user for running libvirt stuff";
       home = "/home/libvirt";
       useDefaultShell = true;
diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix
index 6a226441b..d62a18a52 100644
--- a/lass/2configs/skype.nix
+++ b/lass/2configs/skype.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   mainUser = config.users.extraUsers.mainUser;
@@ -7,7 +7,7 @@ in {
   users.extraUsers = {
     skype = {
       name = "skype";
-      uid = 2259819492; #genid skype
+      uid = lib.genid "skype";
       description = "user for running skype";
       home = "/home/skype";
       useDefaultShell = true;
diff --git a/lass/2configs/weechat.nix b/lass/2configs/weechat.nix
index 18007ed61..6a257f0bb 100644
--- a/lass/2configs/weechat.nix
+++ b/lass/2configs/weechat.nix
@@ -8,7 +8,7 @@
 
   users.extraUsers.chat = {
     home = "/home/chat";
-    uid = 986764891; # genid chat
+    uid = lib.genid "chat";
     useDefaultShell = true;
     createHome = true;
     openssh.authorizedKeys.keys = [
diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index da337f6a7..04d14c7ce 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -7,7 +7,6 @@ let
   user = config.users.users.mainUser;
 
   out = {
-
     services.xserver = {
       display = 11;
       tty = 11;
@@ -41,16 +40,6 @@ let
       };
     };
 
-    environment.systemPackages = [
-      pkgs.gitAndTools.qgit
-      pkgs.mpv
-      pkgs.pavucontrol
-      pkgs.slock
-      pkgs.sxiv
-      pkgs.xsel
-      pkgs.zathura
-    ];
-
     security.setuidPrograms = [
       "slock"
     ];
@@ -106,9 +95,6 @@ let
     set -efu
     export PATH; PATH=${makeSearchPath "bin" ([
       pkgs.rxvt_unicode
-      pkgs.i3lock
-      pkgs.haskellPackages.yeganesh
-      pkgs.dmenu
     ] ++ config.environment.systemPackages)}:/var/setuid-wrappers
     settle() {(
       # Use PATH for a clean journal