From 074d24c8feaa986966d9deffd8f6414f9649093c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 4 May 2022 12:48:27 +0200 Subject: bump --- _sources/generated.json | 254 ++++++++++----------- _sources/generated.nix | 12 +- .../gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs | 2 +- accounts/gkleen@sif/xmonad/xmonad.hs | 10 +- flake.lock | 36 +-- 5 files changed, 152 insertions(+), 162 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index c0e62d6c..0f9eb31f 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,196 +1,186 @@ { - "xcompose": { + "afew": { + "cargoLocks": null, + "extract": null, + "name": "afew", + "passthru": null, "pinned": false, - "cargoLock": null, - "name": "xcompose", "src": { "deepClone": false, - "owner": "kragen", + "fetchSubmodules": false, + "leaveDotGit": true, "name": null, - "repo": "xcompose", - "type": "github", - "sha256": "sha256-XQ0ZuXGvDLz9fJ0yGHtgL4wl9Jx3SG30cGBM2b947iY=", - "rev": "150c47fabb9f45e81138f71347dc75f69b5dd987", - "leaveDotGit": false, - "fetchSubmodules": false + "owner": "gkleen", + "repo": "afew", + "rev": "8ef9a5b73e5d1063cf912c70027c655fb19d1109", + "sha256": "sha256-Ipt/EvksMFihSo6t2aoQkjuxAEYdY6P4f1fhLJuGl3g=", + "type": "github" }, - "version": "150c47fabb9f45e81138f71347dc75f69b5dd987", - "passthru": null, + "version": "8ef9a5b73e5d1063cf912c70027c655fb19d1109" + }, + "emacs-scratch_el": { + "cargoLocks": null, "extract": null, - "rustGitDeps": null + "name": "emacs-scratch_el", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "ffevotte", + "repo": "scratch.el", + "rev": "0077334cc299aa7885f804d88f52cdb1b35caf71", + "sha256": "sha256-FUkKJ+1COGzgllzzv51yUIjMZI6slOFVExdwWl2ZEBA=", + "type": "github" + }, + "version": "0077334cc299aa7885f804d88f52cdb1b35caf71" }, "fast-cli": { - "pinned": false, - "cargoLock": null, + "cargoLocks": null, + "extract": null, "name": "fast-cli", + "passthru": null, + "pinned": false, "src": { "deepClone": false, - "owner": "gesquive", + "fetchSubmodules": false, + "leaveDotGit": false, "name": null, + "owner": "gesquive", "repo": "fast-cli", - "type": "github", - "sha256": "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=", "rev": "v0.2.10", - "leaveDotGit": false, - "fetchSubmodules": false + "sha256": "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=", + "type": "github" }, - "version": "v0.2.10", - "passthru": null, - "extract": null, - "rustGitDeps": null + "version": "v0.2.10" }, - "mpv-createchapter": { + "mpv-autosave": { + "cargoLocks": null, + "extract": null, + "name": "mpv-autosave", + "passthru": null, "pinned": false, - "cargoLock": null, - "name": "mpv-createchapter", "src": { "deepClone": false, - "owner": "shinchiro", - "name": null, - "repo": "mpv-createchapter", - "type": "github", - "sha256": "sha256-rPtG7mgf7tOY8Ih4Bz1tpd4MwXOxJmngjY+s70zWX+g=", - "rev": "8dd33e2debbcb963a195ec1371e02c85b49e7faa", + "fetchSubmodules": false, "leaveDotGit": false, - "fetchSubmodules": false + "name": null, + "rev": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704", + "sha256": "sha256-yxA8wgzdS7SyKLoNTWN87ShsBfPKUflbOu4Y0jS2G3I=", + "type": "git", + "url": "https://gist.github.com/2f71a97fb85ed42146f6d9f522bc34ef.git" }, - "version": "8dd33e2debbcb963a195ec1371e02c85b49e7faa", - "passthru": null, - "extract": null, - "rustGitDeps": null + "version": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704" }, - "v4l2loopback": { + "mpv-createchapter": { + "cargoLocks": null, + "extract": null, + "name": "mpv-createchapter", + "passthru": null, "pinned": false, - "cargoLock": null, - "name": "v4l2loopback", "src": { "deepClone": false, - "owner": "umlaeute", - "name": null, - "repo": "v4l2loopback", - "type": "github", - "sha256": "sha256-lmMPHszAVHWQGYD3Qq68psW3wBm3OQ5kz+dKwJOoRxk=", - "rev": "2199283ee936b9930038552b7a0890ec1736e7a2", + "fetchSubmodules": false, "leaveDotGit": false, - "fetchSubmodules": true + "name": null, + "owner": "shinchiro", + "repo": "mpv-createchapter", + "rev": "8dd33e2debbcb963a195ec1371e02c85b49e7faa", + "sha256": "sha256-rPtG7mgf7tOY8Ih4Bz1tpd4MwXOxJmngjY+s70zWX+g=", + "type": "github" }, - "version": "2199283ee936b9930038552b7a0890ec1736e7a2", - "passthru": null, - "extract": null, - "rustGitDeps": null + "version": "8dd33e2debbcb963a195ec1371e02c85b49e7faa" }, - "afew": { + "mpv-mpris": { + "cargoLocks": null, + "extract": null, + "name": "mpv-mpris", + "passthru": null, "pinned": false, - "cargoLock": null, - "name": "afew", "src": { "deepClone": false, - "owner": "gkleen", + "fetchSubmodules": false, + "leaveDotGit": false, "name": null, - "repo": "afew", - "type": "github", - "sha256": "sha256-Ipt/EvksMFihSo6t2aoQkjuxAEYdY6P4f1fhLJuGl3g=", - "rev": "8ef9a5b73e5d1063cf912c70027c655fb19d1109", - "leaveDotGit": true, - "fetchSubmodules": false + "owner": "hoyon", + "repo": "mpv-mpris", + "rev": "0.7.1", + "sha256": "sha256-Oc+PI4dGJdqja75JB2sT18NbU9kzIXYTi+eQdGxwRG0=", + "type": "github" }, - "version": "8ef9a5b73e5d1063cf912c70027c655fb19d1109", - "passthru": null, - "extract": null, - "rustGitDeps": null + "version": "0.7.1" }, "mpv-reload": { - "pinned": false, - "cargoLock": null, + "cargoLocks": null, + "extract": null, "name": "mpv-reload", - "src": { - "deepClone": false, - "owner": "4e6", - "name": null, - "repo": "mpv-reload", - "type": "github", - "sha256": "sha256-+DoKPIulQA3VSeXo8DjoxnPwDfcuCO5YHpXmB+M7EWk=", - "rev": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92", - "leaveDotGit": false, - "fetchSubmodules": false - }, - "version": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92", "passthru": null, - "extract": null, - "rustGitDeps": null - }, - "mpv-autosave": { "pinned": false, - "cargoLock": null, - "name": "mpv-autosave", "src": { "deepClone": false, - "url": "https://gist.github.com/2f71a97fb85ed42146f6d9f522bc34ef.git", - "name": null, - "type": "git", - "sha256": "sha256-yxA8wgzdS7SyKLoNTWN87ShsBfPKUflbOu4Y0jS2G3I=", - "rev": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704", + "fetchSubmodules": false, "leaveDotGit": false, - "fetchSubmodules": false + "name": null, + "owner": "4e6", + "repo": "mpv-reload", + "rev": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92", + "sha256": "sha256-+DoKPIulQA3VSeXo8DjoxnPwDfcuCO5YHpXmB+M7EWk=", + "type": "github" }, - "version": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704", - "passthru": null, - "extract": null, - "rustGitDeps": null + "version": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92" }, "uhk-agent": { - "pinned": false, - "cargoLock": null, + "cargoLocks": null, + "extract": null, "name": "uhk-agent", + "passthru": null, + "pinned": false, "src": { - "url": "https://github.com/UltimateHackingKeyboard/agent/releases/download/v1.5.17/UHK.Agent-1.5.17-linux-x86_64.AppImage", "name": null, + "sha256": "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc=", "type": "url", - "sha256": "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc=" + "url": "https://github.com/UltimateHackingKeyboard/agent/releases/download/v1.5.17/UHK.Agent-1.5.17-linux-x86_64.AppImage" }, - "version": "1.5.17", - "passthru": null, - "extract": null, - "rustGitDeps": null + "version": "1.5.17" }, - "mpv-mpris": { + "v4l2loopback": { + "cargoLocks": null, + "extract": null, + "name": "v4l2loopback", + "passthru": null, "pinned": false, - "cargoLock": null, - "name": "mpv-mpris", "src": { "deepClone": false, - "owner": "hoyon", - "name": null, - "repo": "mpv-mpris", - "type": "github", - "sha256": "sha256-kV/d10UCYRb3IDylrU1aCOdyLEegUkwl238Cbzrbd0g=", - "rev": "0.7", + "fetchSubmodules": true, "leaveDotGit": false, - "fetchSubmodules": false + "name": null, + "owner": "umlaeute", + "repo": "v4l2loopback", + "rev": "d01c20cca58772e7b29faef6da393c919a4d531b", + "sha256": "sha256-/HBU+FThl8qtgpJ4rHj9tbKxK+aTbccl7BhWVvzNDlU=", + "type": "github" }, - "version": "0.7", - "passthru": null, - "extract": null, - "rustGitDeps": null + "version": "d01c20cca58772e7b29faef6da393c919a4d531b" }, - "emacs-scratch_el": { + "xcompose": { + "cargoLocks": null, + "extract": null, + "name": "xcompose", + "passthru": null, "pinned": false, - "cargoLock": null, - "name": "emacs-scratch_el", "src": { "deepClone": false, - "owner": "ffevotte", - "name": null, - "repo": "scratch.el", - "type": "github", - "sha256": "sha256-FUkKJ+1COGzgllzzv51yUIjMZI6slOFVExdwWl2ZEBA=", - "rev": "0077334cc299aa7885f804d88f52cdb1b35caf71", + "fetchSubmodules": false, "leaveDotGit": false, - "fetchSubmodules": false + "name": null, + "owner": "kragen", + "repo": "xcompose", + "rev": "150c47fabb9f45e81138f71347dc75f69b5dd987", + "sha256": "sha256-XQ0ZuXGvDLz9fJ0yGHtgL4wl9Jx3SG30cGBM2b947iY=", + "type": "github" }, - "version": "0077334cc299aa7885f804d88f52cdb1b35caf71", - "passthru": null, - "extract": null, - "rustGitDeps": null + "version": "150c47fabb9f45e81138f71347dc75f69b5dd987" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 221543dd..58a1ff0a 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -61,13 +61,13 @@ }; mpv-mpris = { pname = "mpv-mpris"; - version = "0.7"; + version = "0.7.1"; src = fetchFromGitHub ({ owner = "hoyon"; repo = "mpv-mpris"; - rev = "0.7"; + rev = "0.7.1"; fetchSubmodules = false; - sha256 = "sha256-kV/d10UCYRb3IDylrU1aCOdyLEegUkwl238Cbzrbd0g="; + sha256 = "sha256-Oc+PI4dGJdqja75JB2sT18NbU9kzIXYTi+eQdGxwRG0="; }); }; mpv-reload = { @@ -91,13 +91,13 @@ }; v4l2loopback = { pname = "v4l2loopback"; - version = "2199283ee936b9930038552b7a0890ec1736e7a2"; + version = "d01c20cca58772e7b29faef6da393c919a4d531b"; src = fetchFromGitHub ({ owner = "umlaeute"; repo = "v4l2loopback"; - rev = "2199283ee936b9930038552b7a0890ec1736e7a2"; + rev = "d01c20cca58772e7b29faef6da393c919a4d531b"; fetchSubmodules = true; - sha256 = "sha256-lmMPHszAVHWQGYD3Qq68psW3wBm3OQ5kz+dKwJOoRxk="; + sha256 = "sha256-/HBU+FThl8qtgpJ4rHj9tbKxK+aTbccl7BhWVvzNDlU="; }); }; xcompose = { diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs index 729941aa..998c533e 100644 --- a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs +++ b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs @@ -137,7 +137,7 @@ connParser = do sshPrompt :: [Override] -> XPConfig -> X () sshPrompt o c = do sc <- io sshComplList - mkXPrompt Ssh c (mkComplFunFromList sc) $ ssh o + mkXPrompt Ssh c (mkComplFunFromList c sc) $ ssh o ssh :: [Override] -> String -> X () ssh overrides str = do diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs index 7a71ca56..8f66bf39 100644 --- a/accounts/gkleen@sif/xmonad/xmonad.hs +++ b/accounts/gkleen@sif/xmonad/xmonad.hs @@ -235,7 +235,7 @@ hostFromName h , hWsp = hWsp , hCoWsp = hCoWsp , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"]) - , (xK_d, [fromString browser, "google-chrome", "notmuch-links"]) + , (xK_d, [fromString browser, "google-chrome" {- , "notmuch-links" -}]) , (xK_c, [ inputPrompt xPConfigMonospace "dc" ?+ dc ]) , (xK_g, ["pidgin"]) , (xK_s, ["skype"]) @@ -249,10 +249,10 @@ hostFromName h , "tmux new-window -dt media mpv $(xclip -o -selection clipboard)" , "alacritty --class media -e tmuxp load /var/media" ]) - , (xK_m, [ "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch)'" + {- , (xK_m, [ "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch)'" , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch-mua-new-mail)'" , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e \"(browse-url-mail \"$(xclip -o)\")\"" - ]) + ]) -} , (xK_Return, ["keynav start,windowzoom", "keynav start"]) , (xK_t, [inputPrompt xPConfigMonospace "fuzzytime timer" ?+ fuzzytime, fuzzytime "unset", work_fuzzytime]) , (xK_a, [inputPrompt xPConfigMonospace "adjmix" ?+ adjmix]) @@ -411,7 +411,7 @@ hostFromName h (first : rest) = filter (not . null) $ lines result notification = Notify.summary first <> Notify.body (unlines rest) <> Notify.timeout Infinite <> Notify.urgency Normal <> Notify.appName "dc" void $ Notify.display notification - synergyCompl = mkComplFunFromList' ["mathw86"] + synergyCompl = mkComplFunFromList' xPConfigMonospace ["mathw86"] synergyStart host = safeSpawn "systemctl" ["--user", "start", "synergy-rtunnel@" ++ host ++ ".service"] synergyStop host = safeSpawn "systemctl" ["--user", "stop", "synergy-rtunnel@" ++ host ++ ".service"] @@ -603,7 +603,7 @@ main = do userCodeDef () $ whenJust (Map.lookup (mClean, s) ks) id | otherwise = return () handle _ = return () - handle shutdown $ launch myConfig + handle shutdown $ launch myConfig =<< getDirectories secs :: Int -> Int secs = (* 1000000) diff --git a/flake.lock b/flake.lock index 5506279d..76e974d5 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1648366999, - "narHash": "sha256-Sdm0lI2ZBc70EnMMmvfDVY7gIM3M4c2L86EdQ9tKRE4=", + "lastModified": 1651652192, + "narHash": "sha256-3FUsIJ81p57rOxODRVZ+anhnVav96VWbgNA1H3Np+TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "888eac32bd657bfe0d024c8770130d80d1c02cd3", + "rev": "267462dfb36d447421c789a3adf9d460cd09c147", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1648550259, - "narHash": "sha256-IXQb7TB3u5L/yh4o6tgQ8J961Ogedm0sn7cUVExM22E=", + "lastModified": 1651654660, + "narHash": "sha256-ZuQ3wQwIEwqBAEOeL/mY5dV0pxuz7OIz/lzeLBIskAE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d630c2dbc4fa2968bece12b508b0310bb2c7607", + "rev": "c04ef155994d060aceedf946eeba0ab756b19c01", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1648145722, - "narHash": "sha256-iC04ukXdms4XnvKh/o1LoYXDiAURD6y0vae8V6ovQfw=", + "lastModified": 1650169042, + "narHash": "sha256-x8469XNOU/ebIh5YCuvjcOAaAptwHjkEl1aTFrevu1o=", "owner": "berberman", "repo": "nvfetcher", - "rev": "daea67a8b6ec8aa89eb3a474c3d9e9ce2b2cc6f1", + "rev": "db780dba6923e531b5aedca502a36d3d9627fca9", "type": "github" }, "original": { @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1647279403, - "narHash": "sha256-ZsHfMah9+TElcjaENsaOIFHBNNtSbXmyLFVbiJiAECs=", + "lastModified": 1649756291, + "narHash": "sha256-KTll8bCINAzIUGaaMrbn9wb5nfhkXRLgmFrWGR/Dku0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c01f48b055ac776f9831c9d4a0fff83e3b74dbe3", + "rev": "c2614c4fe61943b3d280ac1892fcebe6e8eaf8c8", "type": "github" }, "original": { -- cgit v1.2.3