summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
Diffstat (limited to 'lass')
-rw-r--r--lass/2configs/default.nix1
-rw-r--r--lass/2configs/nixpkgs.nix2
-rw-r--r--lass/2configs/repo-sync.nix1
-rw-r--r--lass/2configs/vim.nix2
-rw-r--r--lass/2configs/websites/domsen.nix27
-rw-r--r--lass/2configs/websites/util.nix9
-rw-r--r--lass/5pkgs/default.nix1
-rw-r--r--lass/5pkgs/untilport/default.nix18
-rw-r--r--lass/5pkgs/xmonad-lass.nix2
9 files changed, 10 insertions, 53 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index e964704c3..e33514ee0 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -149,6 +149,7 @@ with import <stockholm/lib>;
tmux
untilport
usbutils
+ logify
#unpack stuff
p7zip
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 5f9800b0f..4f1347b82 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
{
krebs.build.source.nixpkgs.git = {
url = https://cgit.lassul.us/nixpkgs;
- ref = "c85f39e";
+ ref = "aa03833";
};
}
diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index 775bd7665..0b6cd8231 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -106,6 +106,7 @@ in {
(sync-remote "lassulus-blog" "https://github.com/lassulus/lassulus-blog")
(sync-remote "painload" "https://github.com/krebscode/painload")
(sync-remote "Reaktor" "https://github.com/krebscode/Reaktor")
+ (sync-remote "nixos-wiki" "https://github.com/Mic92/nixos-wiki.wiki.git")
(sync-remote-silent "nixpkgs" "https://github.com/nixos/nixpkgs")
(sync-retiolum "go")
(sync-retiolum "much")
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index e6cf8d101..40f7eedde 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -4,7 +4,7 @@ with import <stockholm/lib>;
let
out = {
environment.systemPackages = [
- vim
+ (hiPrio vim)
pkgs.pythonPackages.flake8
];
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index a5c51735a..581b37d91 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -21,22 +21,6 @@ let
exec ${pkgs.msmtp}/bin/msmtp --read-envelope-from -C ${msmtprc} "$@"
'';
- restartPhpfpm_o.ubikmedia = pkgs.writeDash "restartPhpfpm_o.ubikmedia.org" ''
- ${pkgs.systemd}/bin/systemctl restart phpfpm-o.ubikmedia.de.service
- '';
-
- restartPhpfpm_o.ubikmedia_wrapper = pkgs.writeDashBin "restartPhpfpm_o.ubikmedia" ''
- /run/wrappers/bin/sudo ${restartPhpfpm_o.ubikmedia}
- '';
-
- restartPhpfpm_ubikmedia = pkgs.writeDash "restartPhpfpm_ubikmedia.org" ''
- ${pkgs.systemd}/bin/systemctl restart phpfpm-ubikmedia.de.service
- '';
-
- restartPhpfpm_ubikmedia_wrapper = pkgs.writeDashBin "restartPhpfpm_ubikmedia" ''
- /run/wrappers/bin/sudo ${restartPhpfpm_ubikmedia}
- '';
-
in {
imports = [
./sqlBackup.nix
@@ -180,16 +164,5 @@ in {
createHome = true;
};
- #sudo restart wrappers
- security.sudo.extraConfig = ''
- domsen ALL= (root) NOPASSWD: ${restartPhpfpm_o.ubikmedia}
- domsen ALL= (root) NOPASSWD: ${restartPhpfpm_ubikmedia}
- '';
-
- krebs.per-user.domsen.packages = [
- restartPhpfpm_ubikmedia_wrapper
- restartPhpfpm_o.ubikmedia_wrapper
- ];
-
}
diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix
index 6d14de731..36ae1a904 100644
--- a/lass/2configs/websites/util.nix
+++ b/lass/2configs/websites/util.nix
@@ -168,6 +168,7 @@ rec {
'';
locations."~ \.php$".extraConfig = ''
fastcgi_pass unix:/srv/http/${domain}/phpfpm.pool;
+ fastcgi_read_timeout 120;
include ${pkgs.nginx}/conf/fastcgi.conf;
'';
#Directives to send expires headers and turn off 404 error logging.
@@ -182,10 +183,10 @@ rec {
user = nginx
group = nginx
pm = dynamic
- pm.max_children = 15
- pm.start_servers = 3
- pm.min_spare_servers = 1
- pm.max_spare_servers = 10
+ pm.max_children = 25
+ pm.start_servers = 5
+ pm.min_spare_servers = 3
+ pm.max_spare_servers = 20
listen.owner = nginx
listen.group = nginx
php_admin_value[error_log] = 'stderr'
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index e49a0442d..fd52325ae 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -18,7 +18,6 @@
pop = pkgs.callPackage ./pop/default.nix {};
q = pkgs.callPackage ./q {};
rs = pkgs.callPackage ./rs/default.nix {};
- untilport = pkgs.callPackage ./untilport/default.nix {};
urban = pkgs.callPackage ./urban/default.nix {};
xmonad-lass = import ./xmonad-lass.nix { inherit pkgs; };
yt-next = pkgs.callPackage ./yt-next/default.nix {};
diff --git a/lass/5pkgs/untilport/default.nix b/lass/5pkgs/untilport/default.nix
deleted file mode 100644
index 61bcc2b89..000000000
--- a/lass/5pkgs/untilport/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.writeDashBin "untilport" ''
- set -euf
-
- usage() {
- echo 'untiport $target $port'
- echo 'Sleeps until the destinated port is reachable.'
- echo 'ex: untilport google.de 80 && echo "google is now reachable"'
- }
-
-
- if [ $# -ne 2 ]; then
- usage
- else
- until ${pkgs.netcat-openbsd}/bin/nc -z "$@"; do sleep 1; done
- fi
-''
diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix
index 82f507138..22ec7efa9 100644
--- a/lass/5pkgs/xmonad-lass.nix
+++ b/lass/5pkgs/xmonad-lass.nix
@@ -95,7 +95,7 @@ displaySomeException = displayException
myKeyMap :: [([Char], X ())]
myKeyMap =
- [ ("M4-<F11>", spawn "${pkgs.i3lock}/bin/i3lock -i $HOME/wallpaper/wallpaper -f")
+ [ ("M4-<F11>", spawn "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f")
, ("M4-C-p", spawn "${pkgs.scrot}/bin/scrot ~/public_html/scrot.png")
, ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type")
, ("<XF86AudioRaiseVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume @DEFAULT_SINK@ +4%")