summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
Diffstat (limited to 'configs')
-rw-r--r--configs/alacritty.nix5
-rw-r--r--configs/bash/default.nix13
-rw-r--r--configs/default.nix1
-rw-r--r--configs/earlyoom.nix10
-rw-r--r--configs/gitconfig.nix2
-rw-r--r--configs/gitrepos.nix2
-rw-r--r--configs/hw/AO753.nix3
-rw-r--r--configs/hw/winmax2.nix13
-rw-r--r--configs/hw/x220.nix29
-rw-r--r--configs/pulse.nix7
-rw-r--r--configs/repo-sync/wiki.nix1
-rw-r--r--configs/variables.nix19
-rw-r--r--configs/wiregrill.nix4
-rw-r--r--configs/xserver/default.nix2
14 files changed, 55 insertions, 56 deletions
diff --git a/configs/alacritty.nix b/configs/alacritty.nix
index 1a8eb92..473592a 100644
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -36,11 +36,6 @@ let
mouse.hide_when_typing = true;
scrolling.multiplier = 8;
};
- configs.root = lib.recursiveUpdate configs.default {
- colors.primary.background = "#230000";
- colors.primary.foreground = "#e0c0c0";
- colors.normal.black = "#800000";
- };
configs.fzmenu = lib.recursiveUpdate configs.default {
colors.primary.background = "#2A172A";
window.dimensions.columns = 70;
diff --git a/configs/bash/default.nix b/configs/bash/default.nix
index 0ec6bf0..70c94da 100644
--- a/configs/bash/default.nix
+++ b/configs/bash/default.nix
@@ -23,18 +23,7 @@
case $UID in
${mylib.shell.escape (toString config.krebs.users.tv.uid)})
if test ''${SHLVL-1} = 1 && test -n "''${DISPLAY-}"; then
- _CURRENT_DESKTOP_NAME=''${_CURRENT_DESKTOP_NAME-$(
- ${pkgs.xorg.xprop}/bin/xprop -notype -root \
- 32i _NET_CURRENT_DESKTOP \
- 8s _NET_DESKTOP_NAMES \
- |
- ${pkgs.gnused}/bin/sed -r 's/.* = //;s/"//g;s/, /\a/g' |
- {
- read -r _NET_CURRENT_DESKTOP
- IFS=$'\a' read -ra _NET_DESKTOP_NAMES
- echo "''${_NET_DESKTOP_NAMES[$_NET_CURRENT_DESKTOP]}"
- }
- )}
+ _CURRENT_DESKTOP_NAME=''${_CURRENT_DESKTOP_NAME-$(${pkgs.xextras}/bin/net-current-desktop)}
case $_CURRENT_DESKTOP_NAME in
hrm)
cd ~/hrm
diff --git a/configs/default.nix b/configs/default.nix
index 06fd83a..fb8627d 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -19,6 +19,7 @@
./ssh.nix
./sshd.nix
./tmux.nix
+ ./variables.nix
./vim.nix
./xdg.nix
{
diff --git a/configs/earlyoom.nix b/configs/earlyoom.nix
new file mode 100644
index 0000000..1249c7a
--- /dev/null
+++ b/configs/earlyoom.nix
@@ -0,0 +1,10 @@
+{ lib, ... }: {
+ services.earlyoom.enable = true;
+ systemd.services.earlyoom.environment.EARLYOOM_ARGS = lib.mkForce (toString [
+ "-m 5"
+ "-s 10"
+ "-r 0"
+ "--prefer '(^|/)chromium$'"
+ ]);
+
+}
diff --git a/configs/gitconfig.nix b/configs/gitconfig.nix
index c4111ed..1965427 100644
--- a/configs/gitconfig.nix
+++ b/configs/gitconfig.nix
@@ -6,7 +6,7 @@
markEmptyLines = false
stripLeadingSymbols = false
[pager]
- diff = ${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy \
+ diff = ${pkgs.diff-so-fancy}/bin/diff-so-fancy \
| ${pkgs.less}/bin/less -FRX
[user]
email = tv@krebsco.de
diff --git a/configs/gitrepos.nix b/configs/gitrepos.nix
index 0e61989..174e303 100644
--- a/configs/gitrepos.nix
+++ b/configs/gitrepos.nix
@@ -126,7 +126,7 @@
hc = {};
mime = {};
quipper = {};
- scanner = {};
+ terminal-scanner = {};
wai-middleware-time = {};
web-routes-wai-custom = {};
xintmap = {};
diff --git a/configs/hw/AO753.nix b/configs/hw/AO753.nix
index ea58c01..5e91564 100644
--- a/configs/hw/AO753.nix
+++ b/configs/hw/AO753.nix
@@ -41,7 +41,4 @@
'';
krebs.nixpkgs.allowUnfreePredicate = pkg: packageName pkg == "broadcom-sta";
-
- tv.hw.screens.primary.width = 1366;
- tv.hw.screens.primary.height = 768;
}
diff --git a/configs/hw/winmax2.nix b/configs/hw/winmax2.nix
index 4bcd6f1..7edad5a 100644
--- a/configs/hw/winmax2.nix
+++ b/configs/hw/winmax2.nix
@@ -21,10 +21,6 @@
hardware.enableRedistributableFirmware = true;
hardware.graphics.enable = true;
- hardware.graphics.extraPackages = [
- pkgs.amdvlk
- pkgs.rocmPackages.clr
- ];
networking.wireless.enable = true;
networking.wireless.interfaces = [
@@ -36,12 +32,9 @@
services.illum.enable = true;
- services.logind.extraConfig = /* ini */ ''
- HandlePowerKey=ignore
- '';
+ services.logind.settings.Login = {
+ HandlePowerKey = "ignore";
+ };
tv.lidControl.enable = true;
-
- tv.hw.screens.primary.width = 2560;
- tv.hw.screens.primary.height = 1600;
}
diff --git a/configs/hw/x220.nix b/configs/hw/x220.nix
index 6ae6cec..6cd9641 100644
--- a/configs/hw/x220.nix
+++ b/configs/hw/x220.nix
@@ -49,7 +49,12 @@
# Required for Centrino.
hardware.enableRedistributableFirmware = true;
- hardware.graphics.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
+ hardware.graphics = {
+ extraPackages = [
+ pkgs.intel-vaapi-driver
+ pkgs.libva-vdpau-driver
+ ];
+ };
hardware.trackpoint = {
enable = true;
@@ -64,25 +69,17 @@
services.tlp.enable = true;
services.tlp.settings = {
START_CHARGE_THRESH_BAT0 = 80;
+ WOL_DISABLE = false;
};
-
- services.logind.extraConfig = ''
- HandleHibernateKey=ignore
- HandleLidSwitch=ignore
- HandlePowerKey=ignore
- HandleSuspendKey=ignore
- '';
-
- # because extraConfig is not extra enough:
- services.logind.lidSwitch = "ignore";
- services.logind.lidSwitchDocked = "ignore";
- services.logind.lidSwitchExternalPower = "ignore";
+ services.logind.settings.Login.HandleHibernateKey = "ignore";
+ services.logind.settings.Login.HandleLidSwitch = "ignore";
+ services.logind.settings.Login.HandleLidSwitchDocked = "ignore";
+ services.logind.settings.Login.HandleLidSwitchExternalPower = "ignore";
+ services.logind.settings.Login.HandlePowerKey = "ignore";
+ services.logind.settings.Login.HandleSuspendKey = "ignore";
services.xserver = {
videoDriver = "intel";
};
-
- tv.hw.screens.primary.width = lib.mkDefault 1366;
- tv.hw.screens.primary.height = lib.mkDefault 768;
}
diff --git a/configs/pulse.nix b/configs/pulse.nix
index 9c317ae..1ccbf82 100644
--- a/configs/pulse.nix
+++ b/configs/pulse.nix
@@ -75,7 +75,7 @@ in
];
};
- hardware.pulseaudio = {
+ services.pulseaudio = {
inherit support32Bit;
};
@@ -94,11 +94,10 @@ in
};
serviceConfig = {
ExecStart = "${pkg}/bin/pulseaudio --exit-idle-time=-1";
- ExecStartPre = pkgs.writeDash "pulse-start" ''
+ ExecStartPre = "+${pkgs.writeDash "pulse-start" ''
install -o pulse -g pulse -m 0750 -d ${runDir}
install -o pulse -g pulse -m 0700 -d ${runDir}/home
- '';
- PermissionsStartOnly = "true";
+ ''}";
User = "pulse";
};
};
diff --git a/configs/repo-sync/wiki.nix b/configs/repo-sync/wiki.nix
index 94f7e80..01e03f0 100644
--- a/configs/repo-sync/wiki.nix
+++ b/configs/repo-sync/wiki.nix
@@ -1,6 +1,7 @@
{ config, lib, mylib, pkgs, ... }: {
krebs.repo-sync.enable = true;
krebs.repo-sync.repos.wiki.branches.hotdog = {
+ smart = true;
origin.url = "http://cgit.hotdog.r/wiki";
mirror.url = "git@${config.krebs.build.host.name}.r:wiki";
};
diff --git a/configs/variables.nix b/configs/variables.nix
new file mode 100644
index 0000000..cdfaceb
--- /dev/null
+++ b/configs/variables.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }: {
+ options.hrm.environment.variables = lib.mkOption {
+ type = lib.types.attrsOf lib.types.str;
+ default = {};
+ description = ''
+ This is a stricter version of `environment.variables`, using
+ `escapeShellArg` instead of `"` for quoting.
+
+ Use this when you don't have the need to reference other variables or
+ inject code into `/nix/store/*-set-environment`. This is also useful
+ for variables that need be used in contexts that don't perform shell
+ initialization, like e.g. `systemd.services.*.environment`;
+ '';
+ };
+ config.environment.variables =
+ lib.mapAttrs
+ (_name: value: ''"${lib.escapeShellArg value}"'')
+ config.hrm.environment.variables;
+}
diff --git a/configs/wiregrill.nix b/configs/wiregrill.nix
index 55bb6f5..ee73061 100644
--- a/configs/wiregrill.nix
+++ b/configs/wiregrill.nix
@@ -8,8 +8,8 @@ in
lib.mkIf cfg.enable {
networking.wireguard.interfaces.wiregrill = {
ips =
- lib.optional (cfg.net.ip4 != null) cfg.net.ip4.addr ++
- lib.optional (cfg.net.ip6 != null) cfg.net.ip6.addr;
+ lib.optional (cfg.net.ip4 != null) (toCidrNotation cfg.net.ip4) ++
+ lib.optional (cfg.net.ip6 != null) (toCidrNotation cfg.net.ip6);
listenPort = 51820;
privateKeyFile = "${config.krebs.secret.directory}/wiregrill.key";
allowedIPsAsRoutes = true;
diff --git a/configs/xserver/default.nix b/configs/xserver/default.nix
index 884a982..88c1afb 100644
--- a/configs/xserver/default.nix
+++ b/configs/xserver/default.nix
@@ -6,13 +6,11 @@
user = config.krebs.build.user;
xmonad.pkg = pkgs.haskellPackages.xmonad-tv.overrideAttrs (_: {
au = {
- XMONAD_BUILD_SCREEN_WIDTH = 1920;
XMONAD_BUILD_TERM_FONT_WIDTH = 10;
XMONAD_BUILD_TERM_FONT = "xft:Input Mono:size=12:style=Regular";
XMONAD_BUILD_TERM_PADDING = 2;
};
}.${config.krebs.build.host.name} or {
- XMONAD_BUILD_SCREEN_WIDTH = 1366;
XMONAD_BUILD_TERM_FONT_WIDTH = 6;
XMONAD_BUILD_TERM_FONT = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
XMONAD_BUILD_TERM_PADDING = 2;
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-30 13:42:10 +0000