From e7116bc68ea2e15d67f3ece21ff3bccafc5b58b4 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 13 Jan 2021 04:54:29 +0100 Subject: tv pinentry-urxvt: init --- tv/5pkgs/simple/pinentry-urxvt/default.nix | 56 ++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 tv/5pkgs/simple/pinentry-urxvt/default.nix diff --git a/tv/5pkgs/simple/pinentry-urxvt/default.nix b/tv/5pkgs/simple/pinentry-urxvt/default.nix new file mode 100644 index 00000000..65b76c07 --- /dev/null +++ b/tv/5pkgs/simple/pinentry-urxvt/default.nix @@ -0,0 +1,56 @@ +{ pkgs, ... }@args: + +let + lib = import ; + + # config cannot be declared in the input attribute set because that would + # cause callPackage to inject the wrong config. Instead, get it from ... + # via args. + config = args.config or {}; + + cfg = eval.config; + + eval = lib.evalModules { + modules = lib.singleton { + _file = toString ./default.nix; + imports = lib.singleton config; + options = { + appName = lib.mkOption { + default = "pinentry-urxvt"; + type = lib.types.str; + }; + display = lib.mkOption { + default = ":0"; + type = lib.types.str; + }; + }; + }; + }; + + +in + + pkgs.write "pinentry-urxvt" { + "/bin/pinentry".link = pkgs.writeDash "pinentry-urxvt-wrapper" '' + set -efu + exec 3<&0 4>&1 5>&2 + export DISPLAY=${lib.shell.escape cfg.display} + exec ${pkgs.rxvt_unicode}/bin/urxvt \ + -name ${lib.shell.escape cfg.appName} \ + -e ${pkgs.writeDash "pinentry-urxvt-tty" '' + set -efu + exec 2>&5 + TTY=$(${pkgs.coreutils}/bin/tty) + while read -r line <&3; do + case $line in + 'OPTION ttyname='*) + echo "OPTION ttyname=$TTY" + ;; + *) + echo "$line" + esac + done | ${pkgs.pinentry.tty}/bin/pinentry-tty "$@" >&4 + ''} \ + "$@" + ''; + } -- cgit v1.2.3 From d59ef4a45c644e8882acf408991f3fcb3f759ebd Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 13 Jan 2021 04:56:43 +0100 Subject: tv xmonad: center float all pinentry windows --- tv/5pkgs/haskell/xmonad-tv/src/main.hs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs index b8ddd27e..50b03d81 100644 --- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs +++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs @@ -8,6 +8,7 @@ import System.Exit (exitFailure) import Control.Exception import Control.Monad.Extra (whenJustM) +import qualified Data.List import Graphics.X11.ExtraTypes.XF86 import Text.Read (readEither) import XMonad @@ -59,6 +60,11 @@ main = getArgs >>= \case args -> hPutStrLn stderr ("bad arguments: " <> show args) >> exitFailure +queryPrefix :: Query String -> String -> Query Bool +queryPrefix query prefix = + fmap (Data.List.isPrefixOf prefix) query + + mainNoArgs :: IO () mainNoArgs = do workspaces0 <- getWorkspaces0 @@ -82,7 +88,7 @@ mainNoArgs = do , manageHook = composeAll [ appName =? "fzmenu-urxvt" --> doCenterFloat - , appName =? "pinentry" --> doCenterFloat + , appName `queryPrefix` "pinentry" --> doCenterFloat , title =? "Upload to Imgur" --> doRectFloat (W.RationalRect 0 0 (1 % 8) (1 % 8)) , placeHook (smart (1,0)) -- cgit v1.2.3 From 0260651324ae28b58b9d565f03d9f9c81a50219f Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Jan 2021 16:41:47 +0100 Subject: tv mu: fsck.repair=yes --- tv/1systems/mu/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index d5169281..c80a9ba1 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -17,6 +17,7 @@ with import ; boot.initrd.luks.devices.muca.device = "/dev/sda2"; boot.initrd.availableKernelModules = [ "ahci" ]; boot.kernelModules = [ "fbcon" "kvm-intel" ]; + boot.kernelParams = [ "fsck.repair=yes" ]; boot.extraModulePackages = [ ]; fileSystems = { -- cgit v1.2.3 From 4319cfd283f58b482af261c22f8293384fb2d663 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Jan 2021 16:42:22 +0100 Subject: tv mu: lightdm -> autoLogin --- tv/1systems/mu/config.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index c80a9ba1..8fd6ee45 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -110,9 +110,8 @@ with import ; services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.lightdm.autoLogin.enable = true; - services.xserver.displayManager.lightdm.autoLogin.user = "vv"; - services.xserver.displayManager.lightdm.enable = true; + services.xserver.displayManager.autoLogin.enable = true; + services.xserver.displayManager.autoLogin.user = "vv"; users.users.vv = { inherit (config.krebs.users.vv) home uid; -- cgit v1.2.3 From 5f8532b51d6132157197dffde04a0a3d34982901 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Jan 2021 23:36:19 +0100 Subject: TabFS: 1fc4845 -> a6045e0 --- krebs/5pkgs/simple/TabFS/default.nix | 6 +----- krebs/5pkgs/simple/TabFS/src.json | 10 ++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 krebs/5pkgs/simple/TabFS/src.json diff --git a/krebs/5pkgs/simple/TabFS/default.nix b/krebs/5pkgs/simple/TabFS/default.nix index 23fdf519..69de919e 100644 --- a/krebs/5pkgs/simple/TabFS/default.nix +++ b/krebs/5pkgs/simple/TabFS/default.nix @@ -3,11 +3,7 @@ stdenv.mkDerivation rec { name = "TabFS"; - src = pkgs.fetchgit { - url = https://cgit.krebsco.de/TabFS; - rev = "1fc4845283a0e6aa46a8d8978f356d5ccdcedd13"; - sha256 = "0bsm5fhxrr6zwbnm9p10h9pwm85llr02g2ch97a62r62dhjjrc8h"; - }; + src = pkgs.fetchgit (lib.importJSON ./src.json); phases = [ "unpackPhase" diff --git a/krebs/5pkgs/simple/TabFS/src.json b/krebs/5pkgs/simple/TabFS/src.json new file mode 100644 index 00000000..24e36aef --- /dev/null +++ b/krebs/5pkgs/simple/TabFS/src.json @@ -0,0 +1,10 @@ +{ + "url": "https://cgit.krebsco.de/TabFS", + "rev": "a6045e0e29b85e3e66c468f3561009ded1db6ec5", + "date": "2021-01-14T23:56:09+01:00", + "path": "/nix/store/mbcywm1yq5vr7awxqb533faz34minfax-TabFS", + "sha256": "1z0kj95zh0jl8laa0whra1jys8pws3199sy29vmlv2nxrkz13blv", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} -- cgit v1.2.3 From a68e8e39f6c844f921176875ab79e69b4c66871a Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 15 Jan 2021 23:30:37 +0100 Subject: tv slock service: conflicts picom service When picom is running, slock will show the screenshot of the locked screen after DPMS changes state to `on'. https://bbs.archlinux.org/viewtopic.php?id=256547 seems related, but the suggested fix (adding `no-fading-openclose = true;` to picom's config) didn't help. With this commit, the picom service gets "suspended" while the slock service is running. --- tv/3modules/slock.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tv/3modules/slock.nix b/tv/3modules/slock.nix index 53f7f1f6..926adc8e 100644 --- a/tv/3modules/slock.nix +++ b/tv/3modules/slock.nix @@ -28,6 +28,9 @@ in { }); ''; systemd.services."slock-${cfg.user.name}@" = { + conflicts = [ + "picom@%i.target" + ]; environment = { DISPLAY = ":%I"; LD_PRELOAD = pkgs.runCommandCC "slock-${cfg.user.name}.so" { @@ -61,6 +64,8 @@ in { restartIfChanged = false; serviceConfig = { ExecStart = "${pkgs.slock}/bin/slock"; + ExecStopPost = + "+${pkgs.systemd}/bin/systemctl start xsession@%i.target"; OOMScoreAdjust = -1000; Restart = "on-failure"; RestartSec = "100ms"; -- cgit v1.2.3 From 5e15227baf547216a833733bd5515b9c462d7b2b Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 16 Jan 2021 14:23:28 +0100 Subject: krops: 1.23.0 -> 1.24.1 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 5ea12551..c2fa4855 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 5ea125514e48c630120fbb6a44e9ae0c7932a123 +Subproject commit c2fa48550f2bb46009b9cecdb9ac838dc402ce19 -- cgit v1.2.3 From bac67993aab5acc7ad33d23e3e8e9a59ce83dc3d Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 17 Jan 2021 15:09:04 +0100 Subject: scanner: use version and license from cabal file --- krebs/5pkgs/haskell/scanner.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/krebs/5pkgs/haskell/scanner.nix b/krebs/5pkgs/haskell/scanner.nix index 071fd757..28f89b06 100644 --- a/krebs/5pkgs/haskell/scanner.nix +++ b/krebs/5pkgs/haskell/scanner.nix @@ -1,12 +1,13 @@ { mkDerivation, base, fetchgit, stdenv }: mkDerivation { pname = "scanner"; - version = "1.0.0"; + version = "1.0.1"; src = fetchgit { - url = http://cgit.ni.krebsco.de/scanner; - rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad"; + url = "http://cgit.ni.krebsco.de/scanner"; sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn"; + rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad"; + fetchSubmodules = true; }; libraryHaskellDepends = [ base ]; - license = stdenv.lib.licenses.wtfpl; + license = stdenv.lib.licenses.mit; } -- cgit v1.2.3 From 7b7ebd8708885633c926c21a4b71d5d4ce8931cf Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 18 Jan 2021 10:53:59 +0100 Subject: git-preview: remove redundant copy --- krebs/5pkgs/simple/git-preview.nix | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 krebs/5pkgs/simple/git-preview.nix diff --git a/krebs/5pkgs/simple/git-preview.nix b/krebs/5pkgs/simple/git-preview.nix deleted file mode 100644 index d6c9579a..00000000 --- a/krebs/5pkgs/simple/git-preview.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ coreutils, git, writeDashBin }: - -writeDashBin "git-preview" '' - set -efu - head_commit=$(${git}/bin/git log -1 --format=%H) - merge_commit=$1; shift - merge_message='Merge for git-preview' - preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX) - preview_branch=$(${coreutils}/bin/basename "$preview_dir") - ${git}/bin/git worktree add -b "$preview_branch" "$preview_dir" >/dev/null - ${git}/bin/git -C "$preview_dir" checkout "$head_commit" - ${git}/bin/git -C "$preview_dir" merge -m "$merge_message" "$merge_commit" - ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@" & - ${git}/bin/git branch -fd "$preview_branch" - ${coreutils}/bin/rm -fR "$preview_dir" - wait -'' -- cgit v1.2.3