diff --git a/configurations/home-manager/eve/packages.nix b/configurations/home-manager/eve/packages.nix index f8f0ef8..c87f786 100644 --- a/configurations/home-manager/eve/packages.nix +++ b/configurations/home-manager/eve/packages.nix @@ -33,7 +33,6 @@ in { (lib.mkIf (config.user.isDesktopUser || config.user.isTerminalUser) { git = { enable = true; - signing.format = "openpgp"; settings = { user.name = "Eve"; user.email = "evesnrobins@gmail.com"; diff --git a/configurations/home-manager/leyla/packages/git.nix b/configurations/home-manager/leyla/packages/git.nix index 162c553..499e37b 100644 --- a/configurations/home-manager/leyla/packages/git.nix +++ b/configurations/home-manager/leyla/packages/git.nix @@ -2,7 +2,6 @@ config = { programs = { git = { - signing.format = "openpgp"; settings = { user.name = "Leyla Becker"; user.email = "git@jan-leila.com"; diff --git a/flake.lock b/flake.lock index 3cc4c63..14c8561 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1773889306, - "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", + "lastModified": 1772867152, + "narHash": "sha256-RIFgZ4O6Eg+5ysZ8Tqb3YvcqiRaNy440GEY22ltjRrs=", "owner": "nix-community", "repo": "disko", - "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", + "rev": "eaafb89b56e948661d618eefd4757d9ea8d77514", "type": "github" }, "original": { @@ -28,11 +28,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774843378, - "narHash": "sha256-8QLbY8F7UdxeQaW0KUVgr1/YPIupe+1lGjS5joR+ZCw=", + "lastModified": 1772856163, + "narHash": "sha256-xD+d1+FVhKJ+oFYMTWOdVSBoXS4yeMyVZyDjMXqWEJE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0a31b668e3ebb599f95dc518076d709e8dddb57c", + "rev": "d358a550c7beac5f04fbc5a786e14af079606689", "type": "gitlab" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1774898676, - "narHash": "sha256-0Utnqo+FbB+0CVUi0MI3oonF0Kuzy9VcgRkxl53Euvk=", + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a184bd2f8426087bae93f203403cd4b86c99e57d", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1773460763, - "narHash": "sha256-y9kC3ff89btXS8RD6pAtM50g0qtsim1I8HXBtgSqdbI=", + "lastModified": 1767364176, + "narHash": "sha256-l6YdEBYQxXjD8ujqvc0tKdwWc3K8UQOi+E4Y3DKQ318=", "ref": "refs/heads/main", - "rev": "5e56f5a973e24292b125dca9e9d506b0a91d6903", - "revCount": 180, + "rev": "1688100bba140492658d597f6b307c327f35c780", + "revCount": 179, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module.git" }, @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1773000227, - "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=", + "lastModified": 1772379624, + "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f", + "rev": "52d061516108769656a8bd9c6e811c677ec5b462", "type": "github" }, "original": { @@ -255,11 +255,11 @@ ] }, "locked": { - "lastModified": 1774925891, - "narHash": "sha256-8QGLGZJGnjPXFkWncYI9IXfUJEaPshX81W9LCJyQbGE=", + "lastModified": 1772850876, + "narHash": "sha256-Ga19zlfMpakCY4GMwBSOljNLOF0nEYrYBXv0hP/d4rw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "01dbb479b5f70a18feaa6398077c3babba0d4ba9", + "rev": "22f084d4c280dfc8a9d764f7b85af38e5d69c3dc", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774777275, - "narHash": "sha256-qogBiYFq8hZusDPeeKRqzelBAhZvREc7Cl+qlewGUCg=", + "lastModified": 1771969195, + "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b8f81636927f1af0cca812d22c876bad0a883ccd", + "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -354,11 +354,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1774205961, - "narHash": "sha256-FBtI04msHcdVx9zri3CFcARxifiDPefTg6p8nTsXPj4=", + "lastModified": 1771445312, + "narHash": "sha256-8uOcu+ZurGx0LmGFCf87Zbj4ikhVPQtP+PuBscEBCv0=", "owner": "IntQuant", "repo": "noita_entangled_worlds", - "rev": "5a5155b62c73a01f2307bbd385a6bd766be66b9c", + "rev": "4a842f29d0e5fb8dc6df73d87f7bb8d2a16f0fc8", "type": "github" }, "original": { @@ -431,11 +431,11 @@ ] }, "locked": { - "lastModified": 1774910634, - "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=", + "lastModified": 1772495394, + "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301", + "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", "type": "github" }, "original": { diff --git a/modules/common-modules/overlays/default.nix b/modules/common-modules/overlays/default.nix index fab8f2b..3def9e9 100644 --- a/modules/common-modules/overlays/default.nix +++ b/modules/common-modules/overlays/default.nix @@ -6,35 +6,5 @@ (final: prev: { noita_entangled_worlds = inputs.noita-entangled-worlds.packages.${prev.stdenv.hostPlatform.system}.noita-proxy; }) - # Workaround: some extensions in nix-vscode-extensions have invalid semver - # engine versions (e.g. 1.112.01907 with leading zeros) that cause - # forVSCodeVersion to throw. This tries the version-filtered set per site - # and falls back to unfiltered only for sites with bad semver data. - (final: prev: { - nix-vscode-extensions = - prev.nix-vscode-extensions - // { - forVSCodeVersion = vscodeVersion: let - filtered = prev.nix-vscode-extensions.forVSCodeVersion vscodeVersion; - unfiltered = prev.nix-vscode-extensions; - safeSite = site: let - # builtins.attrNames forces the filter to run on all extensions, - # which triggers semver parsing. If any extension has an invalid - # version, this catches the error and falls back to the unfiltered set. - tried = builtins.tryEval ( - builtins.seq (builtins.length (builtins.attrNames filtered.${site})) filtered.${site} - ); - in - if tried.success - then tried.value - else unfiltered.${site}; - in - filtered - // { - open-vsx = safeSite "open-vsx"; - vscode-marketplace = safeSite "vscode-marketplace"; - }; - }; - }) ]; } diff --git a/modules/home-manager-modules/programs/protonvpn.nix b/modules/home-manager-modules/programs/protonvpn.nix index 31f8910..5742948 100644 --- a/modules/home-manager-modules/programs/protonvpn.nix +++ b/modules/home-manager-modules/programs/protonvpn.nix @@ -11,7 +11,7 @@ config = lib.mkIf config.programs.protonvpn-gui.enable (lib.mkMerge [ { home.packages = with pkgs; [ - proton-vpn + protonvpn-gui ]; } (