summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/mors/physical.nix4
-rw-r--r--lass/1systems/skynet/config.nix5
-rw-r--r--lass/2configs/baseX.nix36
-rw-r--r--lass/2configs/binary-cache/server.nix8
-rw-r--r--lass/2configs/nfs-dl.nix8
-rw-r--r--lass/2configs/websites/sqlBackup.nix8
-rw-r--r--lass/3modules/default.nix1
-rw-r--r--lass/3modules/ejabberd/default.nix13
-rw-r--r--lass/3modules/klem.nix75
-rw-r--r--lass/5pkgs/custom/xmonad-lass/default.nix4
10 files changed, 145 insertions, 17 deletions
diff --git a/lass/1systems/mors/physical.nix b/lass/1systems/mors/physical.nix
index 6828d70de..2f3a68442 100644
--- a/lass/1systems/mors/physical.nix
+++ b/lass/1systems/mors/physical.nix
@@ -23,7 +23,7 @@
services.udev.extraRules = ''
SUBSYSTEM=="net", DEVPATH=="/devices/pci*/*1c.1/*/net/*", NAME="wl0"
- SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:c4:7a:f1", NAME="et0"
+ SUBSYSTEM=="net", ATTR{address}=="3c:97:0e:4f:42:35", NAME="et0"
'';
#TODO activationScripts seem broken, fix them!
@@ -37,12 +37,10 @@
echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.2/power/control'
echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.0/power/control'
echo 'auto' > '/sys/bus/pci/devices/0000:00:1d.0/power/control'
- echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.3/power/control'
echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.0/power/control'
echo 'auto' > '/sys/bus/pci/devices/0000:00:1b.0/power/control'
echo 'auto' > '/sys/bus/pci/devices/0000:00:1a.0/power/control'
echo 'auto' > '/sys/bus/pci/devices/0000:00:19.0/power/control'
echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.1/power/control'
- echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.4/power/control'
'';
}
diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix
index 70787e514..1bc440a98 100644
--- a/lass/1systems/skynet/config.nix
+++ b/lass/1systems/skynet/config.nix
@@ -36,7 +36,6 @@ with import <stockholm/lib>;
networking.wireless.enable = false;
networking.networkmanager.enable = true;
- services.logind.extraConfig = ''
- HandleLidSwitch=ignore
- '';
+ services.logind.lidSwitch = "ignore";
+ services.logind.lidSwitchDocked = "ignore";
}
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 1185be9d4..baf93ffe5 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -91,6 +91,10 @@ in {
xorg.xhost
xsel
zathura
+ (pkgs.writeDashBin "screenshot" ''
+ ${pkgs.flameshot-once}/bin/flameshot-once
+ ${pkgs.klem}/bin/klem
+ '')
];
fonts.fonts = with pkgs; [
@@ -147,4 +151,36 @@ in {
krebs.xresources.enable = true;
lass.screenlock.enable = true;
+
+ lass.klem = {
+ kpaste.script = pkgs.writeDash "kpaste-wrapper" ''
+ ${pkgs.kpaste}/bin/kpaste \
+ | ${pkgs.coreutils}/bin/tail -1 \
+ | ${pkgs.coreutils}/bin/tr -d '\r\n'
+ '';
+ go = {
+ target = "STRING";
+ script = "${pkgs.goify}/bin/goify";
+ };
+ "go.lassul.us" = {
+ target = "STRING";
+ script = pkgs.writeDash "go.lassul.us" ''
+ export GO_HOST='go.lassul.us'
+ ${pkgs.goify}/bin/goify
+ '';
+ };
+ qrcode = {
+ target = "image";
+ script = pkgs.writeDash "zbar" ''
+ ${pkgs.zbar}/bin/zbarimg -q -
+ '';
+ };
+ ocr = {
+ target = "image";
+ script = pkgs.writeDash "gocr" ''
+ ${pkgs.netpbm}/bin/pngtopnm - \
+ | ${pkgs.gocr}/bin/gocr -
+ '';
+ };
+ };
}
diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix
index d3775b5df..9b91035a8 100644
--- a/lass/2configs/binary-cache/server.nix
+++ b/lass/2configs/binary-cache/server.nix
@@ -9,8 +9,12 @@
};
systemd.services.nix-serve = {
- requires = ["secret.service"];
- after = ["secret.service"];
+ after = [
+ config.krebs.secret.files.nix-serve-key.service
+ ];
+ partOf = [
+ config.krebs.secret.files.nix-serve-key.service
+ ];
};
krebs.secret.files.nix-serve-key = {
path = "/run/secret/nix-serve.key";
diff --git a/lass/2configs/nfs-dl.nix b/lass/2configs/nfs-dl.nix
index ba53321b9..91b026455 100644
--- a/lass/2configs/nfs-dl.nix
+++ b/lass/2configs/nfs-dl.nix
@@ -3,17 +3,19 @@
device = "prism.w:/export/download";
fsType = "nfs";
options = [
- "timeo=14"
+ #"timeo=14"
"noauto"
"noatime"
"nodiratime"
- "noac"
- "nocto"
+ #"noac"
+ #"nocto"
"x-systemd.automount"
"x-systemd.device-timeout=1"
"x-systemd.idle-timeout=1min"
"x-systemd.requires=retiolum.service"
"x-systemd.requires=wpa_supplicant.service"
+ "user"
+ "_netdev"
];
};
}
diff --git a/lass/2configs/websites/sqlBackup.nix b/lass/2configs/websites/sqlBackup.nix
index 10a6e4643..c9783bece 100644
--- a/lass/2configs/websites/sqlBackup.nix
+++ b/lass/2configs/websites/sqlBackup.nix
@@ -14,8 +14,12 @@
};
systemd.services.mysql = {
- requires = [ "secret.service" ];
- after = [ "secret.service" ];
+ after = [
+ config.krebs.secret.files.mysql_rootPassword.service
+ ];
+ partOf = [
+ config.krebs.secret.files.mysql_rootPassword.service
+ ];
};
lass.mysqlBackup = {
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index f6179c394..335658ed8 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -6,6 +6,7 @@ _:
./folderPerms.nix
./hass.nix
./hosts.nix
+ ./klem.nix
./mysql-backup.nix
./news.nix
./nichtparasoup.nix
diff --git a/lass/3modules/ejabberd/default.nix b/lass/3modules/ejabberd/default.nix
index 4838a9093..20a38d572 100644
--- a/lass/3modules/ejabberd/default.nix
+++ b/lass/3modules/ejabberd/default.nix
@@ -17,6 +17,7 @@ in {
certfile = mkOption {
type = types.secret-file;
default = {
+ name = "ejabberd-certfile";
path = "${cfg.user.home}/ejabberd.pem";
owner = cfg.user;
source-path = "/var/lib/acme/lassul.us/full.pem";
@@ -25,6 +26,7 @@ in {
dhfile = mkOption {
type = types.secret-file;
default = {
+ name = "ejabberd-dhfile";
path = "${cfg.user.home}/dhparams.pem";
owner = cfg.user;
source-path = "/dev/null";
@@ -74,8 +76,15 @@ in {
systemd.services.ejabberd = {
wantedBy = [ "multi-user.target" ];
- requires = [ "secret.service" ];
- after = [ "network.target" "secret.service" ];
+ after = [
+ config.krebs.secret.files.ejabberd-certfile.service
+ config.krebs.secret.files.ejabberd-s2s_certfile.service
+ "network.target"
+ ];
+ partOf = [
+ config.krebs.secret.files.ejabberd-certfile.service
+ config.krebs.secret.files.ejabberd-s2s_certfile.service
+ ];
serviceConfig = {
ExecStartPre = "${gen-dhparam} ${cfg.dhfile.path}";
ExecStart = "${cfg.pkgs.ejabberdctl}/bin/ejabberdctl foreground";
diff --git a/lass/3modules/klem.nix b/lass/3modules/klem.nix
new file mode 100644
index 000000000..a297adcd1
--- /dev/null
+++ b/lass/3modules/klem.nix
@@ -0,0 +1,75 @@
+{ config, pkgs, ... }: with import <stockholm/lib>; let
+ cfg = config.lass.klem;
+in {
+ options.lass.klem = mkOption {
+ default = {};
+ type = types.attrsOf (types.submodule ({ config, ...}: {
+ options = {
+ target = mkOption {
+ default = ".*";
+ description = ''
+ regex of valid targets
+ can be shown with xclip -selection clipboard -t TARGETS
+ the first hit is taken as target argument
+ '';
+ type = types.str;
+ };
+ script = mkOption {
+ description = ''
+ file to run if entry is selected
+ '';
+ type = types.path;
+ };
+ label = mkOption {
+ default = config._module.args.name;
+ description = ''
+ label to show in dmenu for this script
+ '';
+ type = types.str;
+ };
+ };
+ }));
+ };
+ config = let
+ klem = pkgs.writers.writeDashBin "klem" ''
+ set -x
+
+ labels=""
+ # match filetype against patterns
+ ${concatMapStringsSep "\n" (script: ''
+ ${pkgs.xclip}/bin/xclip -selection clipboard -target TARGETS -out \
+ | grep -q '${script.target}'
+ if [ $? -eq 0 ]; then
+ labels="$labels:${script.label}"
+ fi
+ '') (attrValues cfg)}
+
+ #remove empty line, feed into dmenu
+ script=$(echo "$labels" \
+ | ${pkgs.gnused}/bin/sed 's/^://;s/:/\n/g' \
+ | ${pkgs.dmenu}/bin/dmenu)
+
+ #run the chosen script
+ case $script in
+ ${concatMapStringsSep "\n" (script: indent ''
+ ${script.label})
+ target=$(${pkgs.xclip}/bin/xclip -selection clipboard -target TARGETS -out \
+ | ${pkgs.gnugrep}/bin/grep '${script.target}' \
+ | ${pkgs.gnugrep}/bin/grep -v TARGETS \
+ | ${pkgs.coreutils}/bin/head -1)
+ ${pkgs.xclip}/bin/xclip -selection clipboard -target "$target" -out \
+ | ${script.script} \
+ | ${pkgs.xclip}/bin/xclip -selection clipboard -in
+ ;;
+ '') (attrValues cfg)}
+ esac
+ '';
+ in mkIf (cfg != {}) {
+ environment.systemPackages = [ klem ];
+ nixpkgs.overlays = [
+ (self: super: {
+ klem = klem;
+ })
+ ];
+ };
+}
diff --git a/lass/5pkgs/custom/xmonad-lass/default.nix b/lass/5pkgs/custom/xmonad-lass/default.nix
index e1c45598f..e6d4b0664 100644
--- a/lass/5pkgs/custom/xmonad-lass/default.nix
+++ b/lass/5pkgs/custom/xmonad-lass/default.nix
@@ -126,7 +126,7 @@ myKeyMap =
, ("M4-x", floatNext True >> spawn myTerm)
, ("M4-c", floatNext True >> spawn "${pkgs.termite}/bin/termite")
, ("M4-f", floatNext True)
- , ("M4-b", sendMessage ToggleStruts)
+ , ("M4-b", spawn "/run/current-system/sw/bin/klem")
, ("M4-v", gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.greedyView) )
, ("M4-S-v", gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.shift) )
@@ -161,7 +161,7 @@ myKeyMap =
, ("M4-u", spawn "${pkgs.xcalib}/bin/xcalib -invert -alter")
, ("M4-s", spawn "${pkgs.knav}/bin/knav")
- , ("<Print>", spawn "${pkgs.flameshot-once}/bin/flameshot-once")
+ , ("M4-i", spawn "/run/current-system/sw/bin/screenshot")
--, ("M4-w", screenWorkspace 0 >>= (windows . W.greedyView))
--, ("M4-e", screenWorkspace 1 >>= (windows . W.greedyView))
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 05:50:16 +0000