flake: update lock file

cachix.nix

@@ -9,6 +9,5 @@ let
   imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
 in {
   inherit imports;
-  nix.settings.substituters = ["https://cache.nixos.org/"];
+  nix.binaryCaches = ["https://cache.nixos.org/"];
 }
-    

cachix/nix-community.nix

@@ -1,12 +1,11 @@
 
 {
-  nix.settings = {
-    substituters = [
+  nix = {
+    binaryCaches = [
       "https://nix-community.cachix.org"
     ];
-    trusted-public-keys = [
+    binaryCachePublicKeys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };
 }
-    

flake.lock

@@ -1,12 +1,18 @@
 {
   "nodes": {
     "emacs-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1649732714,
-        "narHash": "sha256-D8iDZsLJWXB4n/Iy/KCpgdKSLFff2rynCeohO7Xs3R0=",
+        "lastModified": 1652123915,
+        "narHash": "sha256-oUB1163GgKTVu5pu/YoAMkJ281cBKFS9DDC4K5u4n5Q=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8b7323d06cc5310f75781ae87dd50840c3b2bfc7",
+        "rev": "ef3088863916b0604dbd5c3ba402b7f52c89c53d",
         "type": "github"
       },
       "original": {
@@ -15,6 +21,21 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -22,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649642044,
-        "narHash": "sha256-V9ZjTJcbDPgWG+H3rIC6XuPHZAPK1VupBbSsuDbptkQ=",
+        "lastModified": 1651886851,
+        "narHash": "sha256-kbXOJSf1uho0/7P54nZkJdJY3oAelIjyc6tfiRhaXJI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e39a9d0103e3b2e42059c986a8c633824b96c193",
+        "rev": "882bd8118bdbff3a6e53e5ced393932b351ce2f6",
         "type": "github"
       },
       "original": {
@@ -37,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1649497218,
-        "narHash": "sha256-groqC9m1P4hpnL6jQvZ3C8NEtduhdkvwGT0+0LUrcYw=",
+        "lastModified": 1651726670,
+        "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd364d268852561223a5ada15caad669fd72800e",
+        "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01",
         "type": "github"
       },
       "original": {
@@ -52,11 +73,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1649749110,
-        "narHash": "sha256-gN/BkRu93GDHGENao+G0oHrknSJB3l+sfGOZWkqG2RY=",
+        "lastModified": 1652125341,
+        "narHash": "sha256-84/r2TMeF/Yhg/0x2vKlRAZ0HK98ZvD+KuktNvNhBZM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "287aa9ab138e00c3a3519e437a56b7627c62c478",
+        "rev": "3e3a32313f59e13b9a8a513801f848ce94515df7",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -70,7 +70,6 @@ in {
       yubioath-desktop
       yubikey-personalization
       yubikey-personalization-gui
-      gopass
       lastpass-cli
       tor
       torsocks
@@ -235,7 +234,7 @@ in {
     enable = true;
     settings = {
       default-key = "0x9E42CE071C4559D1";
-      keyserver = "hkps://hkps.pool.sks-keyservers.net";
+      keyserver = "hkps://keys.openpgp.org";
       keyserver-options = "no-honor-keyserver-url include-revoked";
     };
   };
@@ -252,6 +251,7 @@ in {
 
   programs.gopass = {
     enable = true;
+    jsonAPI.enable = true;
     password-store = "${h}/Reference/Passwords";
     settings = { safecontent = true; };
   };

home/modules/gopass.nix

@@ -10,6 +10,8 @@ in {
     programs.gopass = {
       enable = mkEnableOption "gopass";
 
+      jsonAPI.enable = mkEnableOption "gopass-jsonapi";
+
       password-store = mkOption {
         type = types.str;
         default = "~/.local/share/gopass/stores/root";
@@ -27,7 +29,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ pkgs.gopass ];
+    home.packages = [ pkgs.gopass ] ++ (optional cfg.jsonAPI.enable pkgs.gopass-jsonapi);
 
     xdg.enable = true;
     xdg.configFile."gopass/config.yml".source =

home/profiles/desktop/default.nix

@@ -29,6 +29,7 @@ with lib;
       atom
       obsidian
       flameshot
+      gitkraken
 
       openshot-qt
       blender

home/profiles/emacs/default.nix

@@ -12,7 +12,7 @@ let
 in {
   programs.emacs = {
     enable = true;
-    package = pkgs.emacsPgtkGcc;
+    package = pkgs.emacsPgtkNativeComp;
   };
 
   home.packages = with pkgs;

home/profiles/shell/zsh.nix

@@ -14,12 +14,12 @@
 
       ns = "nix search nixpkgs";
 
-      lg = pkgs.lazygit + ./bin/lazygit;
+      lg = pkgs.lazygit + /bin/lazygit;
     };
     sessionVariables = { ZSH_CUSTOM = ./zsh/omz-custom; };
 
     initExtra = ''
-      function export-emacs {
+      export-emacs () {
           if [ "$(emacsclient -e t)" != 't' ]; then
               return 1
           fi
@@ -29,6 +29,10 @@
               emacsclient -e "(setenv \"''${name}\" \"''${value}\")" >/dev/null
           done
       }
+
+      cite () {
+          http --follow --body "https://doi.org/$1" "Accept: text/x-bibliography; style=chicago-author-date" | tee >(wl-copy)
+      }
     '';
 
     oh-my-zsh = {

hosts/gwydion/default.nix

@@ -31,6 +31,7 @@
     6600 # mpd
     21 # ftp
     1313 # Hugo preview
+    3000 # various dev web servers
     5000 # nix-serve (see below)
   ];
 

overlay.nix

@@ -1,76 +1,5 @@
 final: prev:
 let inherit (final) callPackage;
 in {
-  python39Packages = prev.python39Packages // {
-    pycurl = callPackage ({ lib, buildPythonPackage, isPyPy, fetchPypi
-      , pythonOlder, curl, openssl, bottle, pytestCheckHook, flaky }:
 
-      buildPythonPackage rec {
-        pname = "pycurl";
-        version = "7.45.1";
-        disabled = isPyPy
-          || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208
-
-        src = fetchPypi {
-          inherit pname version;
-          sha256 = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo=";
-        };
-
-        preConfigure = ''
-          substituteInPlace setup.py --replace '--static-libs' '--libs'
-          export PYCURL_SSL_LIBRARY=openssl
-        '';
-
-        buildInputs = [ curl openssl.out ];
-
-        nativeBuildInputs = [ curl ];
-
-        checkInputs = [ bottle pytestCheckHook flaky ];
-
-        pytestFlagsArray = [
-          # don't pick up the tests directory below examples/
-          "tests"
-        ];
-
-        preCheck = ''
-          export HOME=$TMPDIR
-        '';
-
-        disabledTests = [
-          # libcurl stopped passing the reason phrase from the HTTP status line
-          # https://github.com/pycurl/pycurl/issues/679
-          "test_failonerror"
-          "test_failonerror_status_line_invalid_utf8_python3"
-          # bottle>=0.12.17 escapes utf8 properly, so these test don't work anymore
-          # https://github.com/pycurl/pycurl/issues/669
-          "test_getinfo_content_type_invalid_utf8_python3"
-          "test_getinfo_cookie_invalid_utf8_python3"
-          "test_getinfo_raw_content_type_invalid_utf8"
-          "test_getinfo_raw_cookie_invalid_utf8"
-          # tests that require network access
-          "test_keyfunction"
-          "test_keyfunction_bogus_return"
-          # OSError: tests/fake-curl/libcurl/with_openssl.so: cannot open shared object file: No such file or directory
-          "test_libcurl_ssl_openssl"
-          # OSError: tests/fake-curl/libcurl/with_nss.so: cannot open shared object file: No such file or directory
-          "test_libcurl_ssl_nss"
-          # OSError: tests/fake-curl/libcurl/with_gnutls.so: cannot open shared object file: No such file or directory
-          "test_libcurl_ssl_gnutls"
-          # AssertionError: assert 'crypto' in ['curl']
-          "test_ssl_in_static_libs"
-          # pycurl.error: (27, '')
-          "test_getinfo_raw_certinfo"
-          "test_request_with_certinfo"
-          "test_request_with_verifypeer"
-          "test_request_without_certinfo"
-        ];
-
-        meta = with lib; {
-          homepage = "http://pycurl.io/";
-          description = "Python Interface To The cURL library";
-          license = with licenses; [ lgpl2Only mit ];
-          maintainers = with maintainers; [ SuperSandro2000 ];
-        };
-      });
-  };
 }