summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/base.nix3
-rw-r--r--lass/2configs/baseX.nix4
-rw-r--r--lass/2configs/downloading.nix1
-rw-r--r--lass/2configs/websites/domsen.nix13
4 files changed, 18 insertions, 3 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 8017d4270..30ab90997 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -10,7 +10,7 @@ with config.krebs.lib;
{
users.extraUsers =
mapAttrs (_: h: { hashedPassword = h; })
- (import /root/secrets/hashedPasswords.nix);
+ (import <secrets/hashedPasswords.nix>);
}
{
users.extraUsers = {
@@ -88,6 +88,7 @@ with config.krebs.lib;
environment.systemPackages = with pkgs; [
#stockholm
git
+ gnumake
jq
parallel
proot
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index bb32be086..6c52240af 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -33,7 +33,6 @@ in {
dmenu
gitAndTools.qgit
- mpv
much
pavucontrol
powertop
@@ -44,6 +43,9 @@ in {
xsel
zathura
+ mpv
+ mpv-poll
+ yt-next
#window manager stuff
#haskellPackages.xmobar
#haskellPackages.yeganesh
diff --git a/lass/2configs/downloading.nix b/lass/2configs/downloading.nix
index 115cb8b61..ccd751413 100644
--- a/lass/2configs/downloading.nix
+++ b/lass/2configs/downloading.nix
@@ -20,6 +20,7 @@ in {
];
openssh.authorizedKeys.keys = [
config.krebs.users.lass.pubkey
+ config.krebs.users.lass-uriel.pubkey
];
};
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 109c216c0..895146d25 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -1,6 +1,8 @@
{ config, pkgs, ... }:
-{
+let
+ inherit (config.krebs.lib) genid;
+in {
imports = [
../../3modules/static_nginx.nix
../../3modules/owncloud_nginx.nix
@@ -26,6 +28,15 @@
rootPassword = toString (<secrets/mysql_rootPassword>);
};
+ users.users.domsen = {
+ uid = genid "domsen";
+ description = "maintenance acc for domsen";
+ home = "/home/domsen";
+ useDefaultShell = true;
+ extraGroups = [ "nginx" ];
+ createHome = true;
+ };
+
#lass.wordpress = {
# "ubikmedia.de" = {
# };