From 210c032fca659799376e08abb924536ee2e414ed Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 8 Dec 2021 22:01:32 +0100 Subject: tv x220 nix.daemon*: admit NixOS 21.11 harder Only compare majorMinor nixpkgs version because 21.11pre-git < 21.11 --- tv/2configs/hw/x220.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index a4342fcc..8c68cdef 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -31,7 +31,7 @@ in nix.buildCores = 2; nix.maxJobs = 2; } - (if lib.versionAtLeast lib.version "21.11" then { + (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.11" then { nix.daemonCPUSchedPolicy = "batch"; nix.daemonIOSchedPriority = 1; } else { -- cgit v1.2.3 From 0209b3499fe5582b42e21db2cebd9940c7ebc76e Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 10 Dec 2021 23:29:17 +0100 Subject: tv mu: use krebs.setuid --- tv/1systems/mu/config.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 8fd6ee45..7c3f8cfd 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -83,8 +83,11 @@ with import ; 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 = [ -- cgit v1.2.3 From 07880447af2d00c1e68591d02a9903756977df91 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 10 Dec 2021 23:37:07 +0100 Subject: tv xmonad-tv: stdenv.lib -> lib --- tv/5pkgs/haskell/xmonad-tv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tv/5pkgs/haskell/xmonad-tv/default.nix b/tv/5pkgs/haskell/xmonad-tv/default.nix index 36dffaa1..edb5f258 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; } -- cgit v1.2.3 From 52fcfb00fd573cfffaea2ab62d7829efd42fe85b Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 10 Dec 2021 23:41:53 +0100 Subject: tv CAC: RIP --- tv/2configs/hw/CAC-Developer-1.nix | 8 -------- tv/2configs/hw/CAC-Developer-2.nix | 8 -------- tv/2configs/hw/CAC.nix | 13 ------------- 3 files changed, 29 deletions(-) delete mode 100644 tv/2configs/hw/CAC-Developer-1.nix delete mode 100644 tv/2configs/hw/CAC-Developer-2.nix delete mode 100644 tv/2configs/hw/CAC.nix diff --git a/tv/2configs/hw/CAC-Developer-1.nix b/tv/2configs/hw/CAC-Developer-1.nix deleted file mode 100644 index 5143c835..00000000 --- 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 1b3b102c..00000000 --- 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 9ed18344..00000000 --- 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; -} -- cgit v1.2.3 From 30bdb1e7e535f8257f06a929012e58f421f709b0 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 10 Dec 2021 23:40:36 +0100 Subject: tv w110er nix.daemon*: admit NixOS 21.11 --- tv/2configs/hw/w110er.nix | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix index 818d1aca..09dd9a49 100644 --- a/tv/2configs/hw/w110er.nix +++ b/tv/2configs/hw/w110er.nix @@ -1,7 +1,6 @@ -with import ; -{ pkgs, ... }: - -{ +{ pkgs, ... }: let + lib = import ; +in { imports = [ ../smartd.nix { @@ -16,6 +15,18 @@ with import ; # "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 ; networking.wireless.enable = true; - nix = { - buildCores = 4; - maxJobs = 4; - daemonIONiceLevel = 1; - daemonNiceLevel = 1; - }; - services.logind.extraConfig = '' HandleHibernateKey=ignore HandleLidSwitch=ignore -- cgit v1.2.3 From 1c778a5443554a55dd526d67f79b265168953da2 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 10 Dec 2021 23:43:44 +0100 Subject: tv AO753 nix.daemon*: admit NixOS 21.11 --- tv/2configs/hw/AO753.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix index 469f5c6f..c9afe9a0 100644 --- a/tv/2configs/hw/AO753.nix +++ b/tv/2configs/hw/AO753.nix @@ -5,6 +5,18 @@ with import ; { 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 = { @@ -29,13 +41,6 @@ with import ; config.boot.kernelPackages.broadcom_sta ]; - nix = { - buildCores = 2; - maxJobs = 2; - daemonIONiceLevel = 1; - daemonNiceLevel = 1; - }; - services.logind.extraConfig = '' HandleHibernateKey=ignore HandleLidSwitch=ignore -- cgit v1.2.3 From 250fef75330f6681e891044656d4a30b02109f69 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 10 Dec 2021 23:49:12 +0100 Subject: tv AO753: drop boot.kernelPackages broadcom_sta is not broken for default kernel packages anymore. --- tv/2configs/hw/AO753.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix index c9afe9a0..dd6fcfe6 100644 --- a/tv/2configs/hw/AO753.nix +++ b/tv/2configs/hw/AO753.nix @@ -33,10 +33,6 @@ with import ; "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 ]; -- cgit v1.2.3