diff options
author | makefu <github@syntax-fehler.de> | 2021-12-13 09:29:58 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2021-12-13 09:29:58 +0100 |
commit | ed065e8add0376384b8f23a016f0fedab13f7fd2 (patch) | |
tree | 1e596ac0432bb6d085d2861efee5f54bdea37e75 /tv | |
parent | d424c3f6af7c505d5ad64210d0a1b59af7483916 (diff) | |
parent | f2533d88924feb48834a07c4dc1e82cd21acd025 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
-rw-r--r-- | tv/1systems/mu/config.nix | 7 | ||||
-rw-r--r-- | tv/2configs/hw/AO753.nix | 23 | ||||
-rw-r--r-- | tv/2configs/hw/CAC-Developer-1.nix | 8 | ||||
-rw-r--r-- | tv/2configs/hw/CAC-Developer-2.nix | 8 | ||||
-rw-r--r-- | tv/2configs/hw/CAC.nix | 13 | ||||
-rw-r--r-- | tv/2configs/hw/w110er.nix | 26 | ||||
-rw-r--r-- | tv/5pkgs/haskell/xmonad-tv/default.nix | 4 |
7 files changed, 34 insertions, 55 deletions
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 8fd6ee45b..7c3f8cfdb 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -83,8 +83,11 @@ with import <stockholm/lib>; programs.ssh.startAgent = false; - security.wrappers = { - slock.source = "${pkgs.slock}/bin/slock"; + krebs.setuid = { + slock = { + filename = "${pkgs.slock}/bin/slock"; + mode = "4111"; + }; }; security.pam.loginLimits = [ diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix index 469f5c6f8..dd6fcfe67 100644 --- a/tv/2configs/hw/AO753.nix +++ b/tv/2configs/hw/AO753.nix @@ -5,6 +5,18 @@ with import <stockholm/lib>; { imports = [ ../smartd.nix + + { + nix.buildCores = 2; + nix.maxJobs = 2; + } + (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.11" then { + nix.daemonCPUSchedPolicy = "batch"; + nix.daemonIOSchedPriority = 1; + } else { + nix.daemonIONiceLevel = 1; + nix.daemonNiceLevel = 1; + }) ]; boot.loader.grub = { @@ -21,21 +33,10 @@ with import <stockholm/lib>; "wl" ]; - # broadcom_sta is marked as broken for 5.9+ - # pkgs.linuxPackages_latest ist 5.9 - boot.kernelPackages = pkgs.linuxPackages_5_8; - boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - nix = { - buildCores = 2; - maxJobs = 2; - daemonIONiceLevel = 1; - daemonNiceLevel = 1; - }; - services.logind.extraConfig = '' HandleHibernateKey=ignore HandleLidSwitch=ignore diff --git a/tv/2configs/hw/CAC-Developer-1.nix b/tv/2configs/hw/CAC-Developer-1.nix deleted file mode 100644 index 5143c8359..000000000 --- a/tv/2configs/hw/CAC-Developer-1.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: -{ - imports = [ ./CAC.nix ]; - nix = { - buildCores = 1; - maxJobs = 1; - }; -} diff --git a/tv/2configs/hw/CAC-Developer-2.nix b/tv/2configs/hw/CAC-Developer-2.nix deleted file mode 100644 index 1b3b102cc..000000000 --- a/tv/2configs/hw/CAC-Developer-2.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: -{ - imports = [ ./CAC.nix ]; - nix = { - buildCores = 2; - maxJobs = 2; - }; -} diff --git a/tv/2configs/hw/CAC.nix b/tv/2configs/hw/CAC.nix deleted file mode 100644 index 9ed18344a..000000000 --- a/tv/2configs/hw/CAC.nix +++ /dev/null @@ -1,13 +0,0 @@ -_: -{ - boot.initrd.availableKernelModules = [ - "ata_piix" - "vmw_pvscsi" - ]; - boot.loader.grub.splashImage = null; - nix = { - daemonIONiceLevel = 1; - daemonNiceLevel = 1; - }; - sound.enable = false; -} diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix index 818d1aca6..09dd9a49d 100644 --- a/tv/2configs/hw/w110er.nix +++ b/tv/2configs/hw/w110er.nix @@ -1,7 +1,6 @@ -with import <stockholm/lib>; -{ pkgs, ... }: - -{ +{ pkgs, ... }: let + lib = import <stockholm/lib>; +in { imports = [ ../smartd.nix { @@ -16,6 +15,18 @@ with import <stockholm/lib>; # "nvidia-settings" #]; } + + { + nix.buildCores = 4; + nix.maxJobs = 4; + } + (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.11" then { + nix.daemonCPUSchedPolicy = "batch"; + nix.daemonIOSchedPriority = 1; + } else { + nix.daemonIONiceLevel = 1; + nix.daemonNiceLevel = 1; + }) ]; boot.extraModprobeConfig = '' @@ -35,13 +46,6 @@ with import <stockholm/lib>; networking.wireless.enable = true; - nix = { - buildCores = 4; - maxJobs = 4; - daemonIONiceLevel = 1; - daemonNiceLevel = 1; - }; - services.logind.extraConfig = '' HandleHibernateKey=ignore HandleLidSwitch=ignore diff --git a/tv/5pkgs/haskell/xmonad-tv/default.nix b/tv/5pkgs/haskell/xmonad-tv/default.nix index 36dffaa13..edb5f258e 100644 --- a/tv/5pkgs/haskell/xmonad-tv/default.nix +++ b/tv/5pkgs/haskell/xmonad-tv/default.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, base, bytestring, containers, directory -, extra, stdenv, template-haskell, th-env, unix, X11, xmonad +, extra, lib, template-haskell, th-env, unix, X11, xmonad , xmonad-contrib, xmonad-stockholm }: mkDerivation { @@ -12,5 +12,5 @@ mkDerivation { aeson base bytestring containers directory extra template-haskell th-env unix X11 xmonad xmonad-contrib xmonad-stockholm ]; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; } |