From 7e0ca28180021d544379e7d41af6194e45d6c72f Mon Sep 17 00:00:00 2001 From: Philipp Hochkamp Date: Wed, 25 Jan 2023 07:49:02 +0100 Subject: [PATCH] update --- flake.lock | 60 +++++++++++++++++----------------- flake.nix | 2 +- hosts/daedalus/default.nix | 4 +-- hosts/daedalus/hammerspoon.lua | 16 ++++----- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 168c7094..430bb66e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1665870395, - "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", + "lastModified": 1673301561, + "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", "owner": "ryantm", "repo": "agenix", - "rev": "a630400067c6d03c9b3e0455347dc8559db14288", + "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", "type": "github" }, "original": { @@ -40,11 +40,11 @@ "coc-nvim": { "flake": false, "locked": { - "lastModified": 1672491459, - "narHash": "sha256-dkv+k4ohZHhYqZNt9a04uNSu2D1xfE2KrA71kfFLtH0=", + "lastModified": 1674586885, + "narHash": "sha256-I+/silVjSmjLNOTDVVSoQKbzkNgoJdiV/mmX14EBLL8=", "owner": "neoclide", "repo": "coc.nvim", - "rev": "28e0edd7818ad1b202680f4d1d814435488d0b8e", + "rev": "f3b0e2f2c028e03b97f36ae9a1f7152cf0d10be6", "type": "github" }, "original": { @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1671891118, - "narHash": "sha256-+GJYiT7QbfA306ex4sGMlFB8Ts297pn3OdQ9kTd4aDw=", + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "267040e7a2b8644f1fdfcf57b7e808c286dbdc7b", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1672481747, - "narHash": "sha256-fwWtmoN1t8cV0WBdpM8AKkQe6Y2Fhst3vC5UqGlz0ik=", + "lastModified": 1674615852, + "narHash": "sha256-FcZ42T0m+CVbNyqHsmjixlFzuCevZXsbPBG/3JtoBak=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "27ecb795fbcd192d09a07a647696a92bbb6138ff", + "rev": "53018b60fc15aaac1722031e50b043883b74fcd0", "type": "github" }, "original": { @@ -118,11 +118,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1672349765, - "narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=", + "lastModified": 1674556204, + "narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8", + "rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1672484314, - "narHash": "sha256-7A8cJ933P9fKJsuaG1C3zAR6P0mASU1LPX59HqO/2qQ=", + "lastModified": 1674550793, + "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3c03f64efbd255c73b9b61b2710c0e4a67fa7143", + "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672350804, - "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", + "lastModified": 1674459583, + "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", + "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1672506742, - "narHash": "sha256-YDQUqIqX7+zg0dfRIzHvXvu6r6y90L0MS+gZZCAeN50=", + "lastModified": 1674624031, + "narHash": "sha256-jrprd08u7leFnxQA9wAzzYRmn+aK0pqEBjDv3aFpIqw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9a86d8f9b3861f1fcedc1eda3bce06472d7b8b7", + "rev": "343b5c8134ac2387088f7662b2c4938361a714f1", "type": "github" }, "original": { @@ -266,11 +266,11 @@ "pandoc-latex-template": { "flake": false, "locked": { - "lastModified": 1670162125, - "narHash": "sha256-J0INJBMuiK9WKYfeK+TShJXv6BrUdEyeaVfxGQq4kx0=", + "lastModified": 1674388476, + "narHash": "sha256-5/xKGleBuyL+F1l7FnXkDMZT+wcpDve83BeoRkpDt18=", "owner": "Wandmalfarbe", "repo": "pandoc-latex-template", - "rev": "0fd152d9d1054b34befcb3c56106d2dd6ebc2c47", + "rev": "f0983486900c350b80147851cfffd53458a55293", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "zsh-completions": { "flake": false, "locked": { - "lastModified": 1672136787, - "narHash": "sha256-rgS2d5mOKnVy+49AVPQ3wP/hOwtykAsdp6t0dyucvbU=", + "lastModified": 1674037718, + "narHash": "sha256-MuLmPZW46z33voKOh0vyQcOYjbrZaVPJOwpMEAwxKt8=", "owner": "zsh-users", "repo": "zsh-completions", - "rev": "b46602db397bf1af6bb6906e1a749da09fdda27d", + "rev": "dd686f35d1314f9cfcf20fa13ac7bb33b1d424e1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 00c01b55..4cf6a773 100644 --- a/flake.nix +++ b/flake.nix @@ -95,7 +95,7 @@ packageOverrides = pyself: pysuper: { notmuch2 = pysuper.notmuch2.overridePythonAttrs (old: { postPatch = old.postPatch + ''sed -i "s|/private.*/notmuch-${old.version}/|$(pwd)/../../|g" _notmuch_config.py''; - meta.broken = null; + meta.broken = false; }); }; }; diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix index 5d00d780..a71257f0 100644 --- a/hosts/daedalus/default.nix +++ b/hosts/daedalus/default.nix @@ -11,7 +11,7 @@ in home = "/Users/ragon"; }; environment.systemPackages = [ - myEmacs + # myEmacs ]; homebrew = { @@ -64,7 +64,7 @@ in ''; in pkgs.substituteAll { - src = ./hammerspoon.lua; inherit myEmacs notmuchMails; + src = ./hammerspoon.lua; inherit notmuchMails; }; home.file.".finicky.js".source = ./finicky.js; diff --git a/hosts/daedalus/hammerspoon.lua b/hosts/daedalus/hammerspoon.lua index 5bfe80a0..8bb36113 100644 --- a/hosts/daedalus/hammerspoon.lua +++ b/hosts/daedalus/hammerspoon.lua @@ -352,12 +352,12 @@ local function notmuchTimerFunction() end notmuchMenubar = hs.menubar.new() -notmuchMenubar:setClickCallback(function(options) - if options.shift then - notmuchTimerFunction() - else - hs.task.new("@myEmacs@/bin/emacsclient", nil, function() return false end, - { "-c", "-a", "", "--eval", "(=notmuch)" }):start() - end -end) +-- notmuchMenubar:setClickCallback(function(options) +-- if options.shift then +-- notmuchTimerFunction() +-- else +-- hs.task.new("@myEmacs@/bin/emacsclient", nil, function() return false end, +-- { "-c", "-a", "", "--eval", "(=notmuch)" }):start() +-- end +-- end) notmuchTimer = hs.timer.doEvery(300, notmuchTimerFunction)