diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/alacritty.nix | 5 | ||||
| -rw-r--r-- | configs/bash/default.nix | 13 | ||||
| -rw-r--r-- | configs/gitconfig.nix | 2 | ||||
| -rw-r--r-- | configs/hw/winmax2.nix | 10 | ||||
| -rw-r--r-- | configs/hw/x220.nix | 25 | ||||
| -rw-r--r-- | configs/pulse.nix | 5 |
6 files changed, 19 insertions, 41 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/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/hw/winmax2.nix b/configs/hw/winmax2.nix index 8af5511..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,9 +32,9 @@ services.illum.enable = true; - services.logind.extraConfig = /* ini */ '' - HandlePowerKey=ignore - ''; + services.logind.settings.Login = { + HandlePowerKey = "ignore"; + }; tv.lidControl.enable = true; } diff --git a/configs/hw/x220.nix b/configs/hw/x220.nix index 323be01..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; @@ -67,18 +72,12 @@ 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"; diff --git a/configs/pulse.nix b/configs/pulse.nix index 815c309..1ccbf82 100644 --- a/configs/pulse.nix +++ b/configs/pulse.nix @@ -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"; }; }; |