diff --git a/flake.lock b/flake.lock index 5bf2cec..8f7367e 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1754932414, - "narHash": "sha256-V8c+68Axn5AGDCaG9Zv+EqNU4D6xWPHNXLIapq6AGiM=", + "lastModified": 1756487002, + "narHash": "sha256-hN9RfNXy53qAkT68T+IYZpl68uE1uPOVMkw0MqC43KA=", "owner": "aylur", "repo": "ags", - "rev": "9e6912b51d7bc58f35d10b11be1a126b926b56d3", + "rev": "8ff792dba6cc82eed10e760f551075564dd0a407", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1754893912, - "narHash": "sha256-kzU/3A4k+d3PsgMLohzSh4KJybTqvzqibUVqV2yXCGY=", + "lastModified": 1756474652, + "narHash": "sha256-iiBU6itpEqE0spXeNJ3uJTfioSyKYjt5bNepykpDXTE=", "owner": "aylur", "repo": "astal", - "rev": "5d4eef66392b0dff99a63a4f39ff886624bd69dd", + "rev": "20bd8318e4136fbd3d4eb2d64dbabc3acbc915dd", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1755442500, - "narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=", + "lastModified": 1756579987, + "narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3", + "rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1755452770, - "narHash": "sha256-oc8xrqvVIoDxbfTlbkE1XQ7O88TgNZn5FOZKLiuIEmg=", + "lastModified": 1756630008, + "narHash": "sha256-weZiVKbiWQzTifm6qCxzhxghEu5mbh9mWNUdkzOLCR0=", "owner": "nix-community", "repo": "NUR", - "rev": "eab62298402c7cdfdefda647a4046befa3a84051", + "rev": "f6a5a7b60dd6065e78ef06390767e689ffa3c23f", "type": "github" }, "original": { @@ -381,11 +381,11 @@ ] }, "locked": { - "lastModified": 1755069017, - "narHash": "sha256-cTD5WfZRK2mwrSktlYcrk6DOEEkQbE1z78O16TF293c=", + "lastModified": 1756052001, + "narHash": "sha256-dlLqyHxqiFAoIwshKe9X3PzXcJ+up88Qb2JVQswFaNE=", "owner": "icewind1991", "repo": "nvidia-patch-nixos", - "rev": "d187885c14bdd8520d40f527134d536168f8d92b", + "rev": "780af7357d942fad2ddd9f325615a5f6ea7e37ee", "type": "github" }, "original": { @@ -495,11 +495,11 @@ ] }, "locked": { - "lastModified": 1755506147, - "narHash": "sha256-B4e60+9j1cMEhAjpvgcNSSJbzPe2CUpAo2av15xd/0M=", + "lastModified": 1755532656, + "narHash": "sha256-xYb5dJej3emyr4oWWAhkMP8rPc3kdVOXGZcIbAx1Y/I=", "ref": "refs/heads/main", - "rev": "ebe2f986fc82df849d879f5b0af403c78ead2002", - "revCount": 10, + "rev": "b01f3f8456903cb1bde9637cc23b456b47354138", + "revCount": 11, "type": "git", "url": "ssh://git@karaolidis.com/karaolidis/nix-sas.git" }, @@ -511,11 +511,11 @@ "secrets": { "flake": false, "locked": { - "lastModified": 1755454846, - "narHash": "sha256-tbI+AcQGvtucMKKr+VHM53ZI6upPBjD9kR5PCyF4K60=", + "lastModified": 1755532677, + "narHash": "sha256-kufX5RjMXg+Vu++JKCuMGsO2xTx9gN9YGCnRNcmthCM=", "ref": "refs/heads/main", - "rev": "c1a835c4f9ba9915671c79b3241f4d4863f11323", - "revCount": 33, + "rev": "646c6d87251e4562aa7b416c438225718746bb8e", + "revCount": 34, "type": "git", "url": "ssh://git@karaolidis.com/karaolidis/nix-secrets.git" }, @@ -554,11 +554,11 @@ ] }, "locked": { - "lastModified": 1755405549, - "narHash": "sha256-0vJD6WhL1jfXbnpH6r8yr1RgzB8mGFWIWokKHaJMJ/4=", + "lastModified": 1756614537, + "narHash": "sha256-qyszmZO9CEKAlj5NBQo1AIIADm5Fgqs5ZggW1sU1TVo=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "df1f5d4c0633040937358755defff9f07e9c0a73", + "rev": "374eb5d97092b97f7aaafd58a2012943b388c0df", "type": "github" }, "original": { @@ -589,11 +589,11 @@ ] }, "locked": { - "lastModified": 1754847726, - "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", + "lastModified": 1755934250, + "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", + "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", "type": "github" }, "original": { diff --git a/hosts/common/configs/system/ssh/default.nix b/hosts/common/configs/system/ssh/default.nix index 55b04ff..8acccee 100644 --- a/hosts/common/configs/system/ssh/default.nix +++ b/hosts/common/configs/system/ssh/default.nix @@ -12,7 +12,7 @@ jupiter-sish = { publicKeyFile = "${inputs.secrets}/hosts/jupiter/ssh_sish_ed25519_key.pub"; - extraHostNames = [ "karaolidis.com" ]; + extraHostNames = [ "tunnel.karaolidis.com" ]; }; jupiter-vps = { diff --git a/hosts/common/configs/user/console/neovim/default.nix b/hosts/common/configs/user/console/neovim/default.nix index 9ca8db3..ca4e988 100644 --- a/hosts/common/configs/user/console/neovim/default.nix +++ b/hosts/common/configs/user/console/neovim/default.nix @@ -132,9 +132,15 @@ # luasnip.enable = true; # }; - # tabline = { - # nvimBufferline.enable = true; - # }; + tabline = { + nvimBufferline = { + enable = true; + setupOpts.options = { + show_close_icon = false; + show_buffer_close_icons = false; + }; + }; + }; telescope = { enable = true; @@ -193,6 +199,68 @@ # nvim-scrollbar.enable = true; nvim-web-devicons.enable = true; }; + keymaps = [ + { + mode = [ "n" ]; + key = ""; + action = "zz"; + silent = true; + noremap = true; + desc = "Page up and center"; + } + { + mode = [ "n" ]; + key = ""; + action = "zz"; + silent = true; + noremap = true; + desc = "Half-page up and center"; + } + { + mode = [ "n" ]; + key = ""; + action = "zz"; + silent = true; + noremap = true; + desc = "Half-page down and center"; + } + { + mode = [ "n" ]; + key = ""; + action = "zz"; + silent = true; + noremap = true; + desc = "Page down and center"; + } + { + mode = [ "n" ]; + key = "ww"; + action = "w"; + silent = true; + desc = "Save"; + } + { + mode = [ "n" ]; + key = "wq"; + action = "wq"; + silent = true; + desc = "Save & Quit"; + } + { + mode = [ "n" ]; + key = "ee"; + action = "Neotree toggle"; + silent = true; + desc = "Toggle Neo-tree"; + } + { + mode = [ "n" ]; + key = "ef"; + action = "Neotree reveal"; + silent = true; + desc = "Reveal file in Neo-tree"; + } + ]; }; }; }; diff --git a/hosts/common/configs/user/console/ssh-agent/default.nix b/hosts/common/configs/user/console/ssh-agent/default.nix index e3416e9..a2e558b 100644 --- a/hosts/common/configs/user/console/ssh-agent/default.nix +++ b/hosts/common/configs/user/console/ssh-agent/default.nix @@ -3,6 +3,6 @@ { home-manager.users.${user} = { services.ssh-agent.enable = true; - programs.ssh.addKeysToAgent = "yes"; + programs.ssh.matchBlocks."*".addKeysToAgent = "yes"; }; } diff --git a/hosts/common/configs/user/console/ssh/default.nix b/hosts/common/configs/user/console/ssh/default.nix index d62fffd..8e6c91a 100644 --- a/hosts/common/configs/user/console/ssh/default.nix +++ b/hosts/common/configs/user/console/ssh/default.nix @@ -1,5 +1,9 @@ { user, home }: { ... }: { - home-manager.users.${user}.programs.ssh.enable = true; + home-manager.users.${user}.programs.ssh = { + enable = true; + enableDefaultConfig = false; + matchBlocks."*".identitiesOnly = true; + }; } diff --git a/hosts/common/configs/user/gui/vscode/default.nix b/hosts/common/configs/user/gui/vscode/default.nix index be9ff0b..b17af93 100644 --- a/hosts/common/configs/user/gui/vscode/default.nix +++ b/hosts/common/configs/user/gui/vscode/default.nix @@ -25,8 +25,6 @@ in ms-vsliveshare.vsliveshare ms-vscode-remote.remote-ssh naumovs.color-highlight - # FIXME: https://github.com/microsoft/vscode/issues/130415 - wdhongtw.gpg-indicator ]; userSettings = { diff --git a/hosts/elara/configs/ssh/default.nix b/hosts/elara/configs/ssh/default.nix index e5e0dc5..ce8e3db 100644 --- a/hosts/elara/configs/ssh/default.nix +++ b/hosts/elara/configs/ssh/default.nix @@ -33,16 +33,14 @@ HostName github.com IdentityFile /root/.ssh/ssh_sas_ed25519_key IdentitiesOnly yes + UserKnownHostsFile ${pkgs.sshKnownHosts.github} Host gitlab.sas.com User git HostName gitlab.sas.com IdentityFile /root/.ssh/ssh_sas_ed25519_key IdentitiesOnly yes + ${lib.strings.optionalString config.sas.build.private "UserKnownHostsFile ${pkgs.sshKnownHosts.sas-gitlab}"} ''; - - knownHostsFiles = - with pkgs.sshKnownHosts; - ([ github ] ++ lib.lists.optionals config.sas.build.private [ sas-gitlab ]); }; } diff --git a/hosts/elara/users/nikara/configs/console/ssh/default.nix b/hosts/elara/users/nikara/configs/console/ssh/default.nix index 5778720..371da28 100644 --- a/hosts/elara/users/nikara/configs/console/ssh/default.nix +++ b/hosts/elara/users/nikara/configs/console/ssh/default.nix @@ -81,83 +81,80 @@ in }; programs = { - ssh = { - matchBlocks = { - "karaolidis.com" = { - hostname = "karaolidis.com"; - user = "nick"; - identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; - identitiesOnly = true; - }; - - "github.com" = { - hostname = "github.com"; - user = "git"; - identityFile = [ "${home}/.ssh/ssh_personal_ed25519_key" ]; - identitiesOnly = true; - }; - - "gitlab.com" = { - hostname = "gitlab.com"; - user = "git"; - identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; - identitiesOnly = true; - }; - - "github.sas.com" = { - hostname = "github.com"; - user = "git"; - identityFile = [ "${home}/.ssh/ssh_sas_ed25519_key" ]; - identitiesOnly = true; - }; - - "cldlgn.fyi.sas.com" = { - inherit user; - hostname = "cldlgn.fyi.sas.com"; - identityFile = "${home}/.ssh/ssh_sas_ed25519_key"; - identitiesOnly = true; - }; - - "gitlab.sas.com" = { - hostname = "gitlab.sas.com"; - user = "git"; - identityFile = "${home}/.ssh/ssh_sas_ed25519_key"; - identitiesOnly = true; - }; - - "gerrit-svi.unx.sas.com" = { - hostname = "gerrit-svi.unx.sas.com"; - user = "nikara"; - port = 29418; - identityFile = "${home}/.ssh/ssh_sas_ed25519_key"; - identitiesOnly = true; - }; - - "artifactlfs.unx.sas.com" = { - hostname = "artifactlfs.unx.sas.com"; - user = "nikara"; - port = 1339; - identityFile = "${home}/.ssh/ssh_sas_rsa_key"; - identitiesOnly = true; - }; + ssh.matchBlocks = { + "karaolidis.com" = { + hostname = "karaolidis.com"; + user = "nick"; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; }; - userKnownHostsFile = builtins.concatStringsSep " " ( - with pkgs.sshKnownHosts; - ( - [ - "${home}/.ssh/known_hosts" - github - gitlab - ] - ++ lib.lists.optionals config.sas.build.private [ - sas-cldlgn - sas-gitlab - sas-gerrit - sas-artifact - ] - ) - ); + "tunnel.karaolidis.com" = { + hostname = "tunnel.karaolidis.com"; + user = "nick"; + port = 2222; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; + }; + + "github.com" = { + hostname = "github.com"; + user = "git"; + identityFile = [ "${home}/.ssh/ssh_personal_ed25519_key" ]; + userKnownHostsFile = builtins.toString pkgs.sshKnownHosts.github; + }; + + "gitlab.com" = { + hostname = "gitlab.com"; + user = "git"; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; + userKnownHostsFile = builtins.toString pkgs.sshKnownHosts.gitlab; + }; + + "github.sas.com" = { + hostname = "github.com"; + user = "git"; + identityFile = [ "${home}/.ssh/ssh_sas_ed25519_key" ]; + userKnownHostsFile = lib.mkIf config.sas.build.private ( + builtins.toString pkgs.sshKnownHosts.github + ); + }; + + "cldlgn.fyi.sas.com" = { + inherit user; + hostname = "cldlgn.fyi.sas.com"; + identityFile = "${home}/.ssh/ssh_sas_ed25519_key"; + userKnownHostsFile = lib.mkIf config.sas.build.private ( + builtins.toString pkgs.sshKnownHosts.sas-cldlgn + ); + }; + + "gitlab.sas.com" = { + hostname = "gitlab.sas.com"; + user = "git"; + identityFile = "${home}/.ssh/ssh_sas_ed25519_key"; + userKnownHostsFile = lib.mkIf config.sas.build.private ( + builtins.toString pkgs.sshKnownHosts.sas-gitlab + ); + }; + + "gerrit-svi.unx.sas.com" = { + hostname = "gerrit-svi.unx.sas.com"; + user = "nikara"; + port = 29418; + identityFile = "${home}/.ssh/ssh_sas_ed25519_key"; + userKnownHostsFile = lib.mkIf config.sas.build.private ( + builtins.toString pkgs.sshKnownHosts.sas-gerrit + ); + }; + + "artifactlfs.unx.sas.com" = { + hostname = "artifactlfs.unx.sas.com"; + user = "nikara"; + port = 1339; + identityFile = "${home}/.ssh/ssh_sas_rsa_key"; + userKnownHostsFile = lib.mkIf config.sas.build.private ( + builtins.toString pkgs.sshKnownHosts.sas-artifact + ); + }; }; git.extraConfig.url = { diff --git a/hosts/himalia/users/nick/configs/console/ssh/default.nix b/hosts/himalia/users/nick/configs/console/ssh/default.nix index c9d11dc..838bc58 100644 --- a/hosts/himalia/users/nick/configs/console/ssh/default.nix +++ b/hosts/himalia/users/nick/configs/console/ssh/default.nix @@ -37,38 +37,33 @@ in }; programs = { - ssh = { - matchBlocks = { - "karaolidis.com" = { - hostname = "karaolidis.com"; - user = "nick"; - identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; - identitiesOnly = true; - }; - - "github.com" = { - hostname = "github.com"; - user = "git"; - identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; - identitiesOnly = true; - }; - - "gitlab.com" = { - hostname = "gitlab.com"; - user = "git"; - identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; - identitiesOnly = true; - }; + ssh.matchBlocks = { + "karaolidis.com" = { + hostname = "karaolidis.com"; + user = "nick"; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; }; - userKnownHostsFile = builtins.concatStringsSep " " ( - with pkgs.sshKnownHosts; - [ - "${home}/.ssh/known_hosts" - github - gitlab - ] - ); + "tunnel.karaolidis.com" = { + hostname = "tunnel.karaolidis.com"; + user = "nick"; + port = 2222; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; + }; + + "github.com" = { + hostname = "github.com"; + user = "git"; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; + userKnownHostsFile = builtins.toString pkgs.sshKnownHosts.github; + }; + + "gitlab.com" = { + hostname = "gitlab.com"; + user = "git"; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; + userKnownHostsFile = builtins.toString pkgs.sshKnownHosts.gitlab; + }; }; clipbook.bookmarks."SSH Key Passphrase".source = hmConfig.sops.secrets."ssh/pass".path; diff --git a/hosts/installer/users/nick/configs/console/ssh/default.nix b/hosts/installer/users/nick/configs/console/ssh/default.nix index e187a8a..6f2a0b3 100644 --- a/hosts/installer/users/nick/configs/console/ssh/default.nix +++ b/hosts/installer/users/nick/configs/console/ssh/default.nix @@ -36,38 +36,33 @@ in }; }; - programs.ssh = { - matchBlocks = { - "karaolidis.com" = { - hostname = "karaolidis.com"; - user = "nick"; - identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; - identitiesOnly = true; - }; - - "github.com" = { - hostname = "github.com"; - user = "git"; - identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; - identitiesOnly = true; - }; - - "gitlab.com" = { - hostname = "gitlab.com"; - user = "git"; - identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; - identitiesOnly = true; - }; + programs.ssh.matchBlocks = { + "karaolidis.com" = { + hostname = "karaolidis.com"; + user = "nick"; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; }; - userKnownHostsFile = builtins.concatStringsSep " " ( - with pkgs.sshKnownHosts; - [ - "${home}/.ssh/known_hosts" - github - gitlab - ] - ); + "tunnel.karaolidis.com" = { + hostname = "tunnel.karaolidis.com"; + user = "nick"; + port = 2222; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; + }; + + "github.com" = { + hostname = "github.com"; + user = "git"; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; + userKnownHostsFile = builtins.toString pkgs.sshKnownHosts.github; + }; + + "gitlab.com" = { + hostname = "gitlab.com"; + user = "git"; + identityFile = "${home}/.ssh/ssh_personal_ed25519_key"; + userKnownHostsFile = builtins.toString pkgs.sshKnownHosts.gitlab; + }; }; }; } diff --git a/overlays/default.nix b/overlays/default.nix index f4b1766..2d15c8a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,7 +4,6 @@ final: prev: darktable = import ./darktable final prev; hyprland = import ./hyprland final prev; mpv = import ./mpv final prev; - ncspot = import ./ncspot final prev; spicetify-cli = import ./spicetify-cli final prev; telepresence = import ./telepresence final prev; } @@ -86,10 +85,6 @@ final: prev: gitlab = final.ssh-known-hosts-gitlab; }; - vscode-extensions = prev.vscode-extensions or { } // { - wdhongtw.gpg-indicator = final.vscode-extension-wdhongtw-gpg-indicator; - }; - yaziPlugins = prev.yaziPlugins or { } // { custom-shell = final.yazi-plugin-custom-shell; }; diff --git a/overlays/ncspot/default.nix b/overlays/ncspot/default.nix deleted file mode 100644 index 0336383..0000000 --- a/overlays/ncspot/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -final: prev: -# FIXME: https://github.com/hrkfdn/ncspot/issues/1681#issuecomment-3186274719 -prev.ncspot.overrideAttrs (oldAttrs: rec { - src = prev.fetchFromGitHub { - owner = "hrkfdn"; - repo = "ncspot"; - rev = "aac67d631f25bbc79f509d34aa85e6daff954830"; - hash = "sha256-B6BA1ksfDEySZH6gzkU5khOzwXAmeHbMHsx3sXd9lbs="; - }; - - cargoDeps = prev.rustPlatform.fetchCargoVendor { - inherit src; - hash = "sha256-HrQJiIzSvu/vR03UdnCcU6TGToBDKKDC6XscjvX3KPE="; - }; -}) diff --git a/packages/comentario/default.nix b/packages/comentario/default.nix index b4e748e..df8802b 100644 --- a/packages/comentario/default.nix +++ b/packages/comentario/default.nix @@ -2,14 +2,14 @@ # AUTO-UPDATE: nix-update --flake comentario --version=branch=dev --subpackage frontend pkgs.buildGoModule (finalAttrs: { pname = "comentario"; - version = "3.14.0-unstable-2025-08-08"; + version = "3.14.0-unstable-2025-08-29"; src = pkgs.fetchFromGitLab { owner = "comentario"; repo = "comentario"; # FIXME: Stable rev once type error is fixed - rev = "7380d55820827db82f9d191ad82cd35cdbf08cfa"; - hash = "sha256-uWpHrI4K/VfekW4PDaJXyqjyCGXbYnsGwV0OCSsfw3s="; + rev = "90773f976366318389f9d5aa457e6303e6159740"; + hash = "sha256-f0Y+OdbsG8eA2kD17b4QWaL0hAuoF476XtYm/aFOmLY="; }; patches = [ @@ -37,7 +37,7 @@ pkgs.buildGoModule (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = pkgs.yarn-berry.fetchYarnBerryDeps { inherit (finalFrontendAttrs) src patches missingHashes; - hash = "sha256-HGxWvdFDTCPoDD6ry30gfprvpDAMoQJ0RHMkCzOcVRs="; + hash = "sha256-bn/PNgk7ZjCzGSj7BQQCB+5RY+ivJGYZa2/GC4eRjPY="; }; nativeBuildInputs = with pkgs; [ diff --git a/packages/darktable/lua-scripts/default.nix b/packages/darktable/lua-scripts/default.nix index bf251f9..d4cb1a1 100644 --- a/packages/darktable/lua-scripts/default.nix +++ b/packages/darktable/lua-scripts/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake --version=branch=master darktable-lua-scripts pkgs.stdenv.mkDerivation { pname = "lua-scripts"; - version = "release-2.0.0-unstable-2025-07-05"; + version = "release-2.0.0-unstable-2025-08-18"; src = pkgs.fetchFromGitHub { owner = "darktable-org"; repo = "lua-scripts"; - rev = "aed3275943f218e559c58b98579ceafb02e220da"; - hash = "sha256-vRE0kxqbjdjwU+S0Eu44ctYulYPgD0XsrTsz1ESq6t0="; + rev = "c95547caa72f7b136b5192dd19a535da3fbe4e9b"; + hash = "sha256-Qt3DkmNH/ZWY3uI8UvhSM4dDt7KDQlJqOnPmsySGGwU="; }; installPhase = '' diff --git a/packages/default.nix b/packages/default.nix index 73c4f7f..03343a9 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -89,10 +89,6 @@ ssh-known-hosts-github = import ./ssh/known-hosts/github { inherit pkgs; }; ssh-known-hosts-gitlab = import ./ssh/known-hosts/gitlab { inherit pkgs; }; - vscode-extension-wdhongtw-gpg-indicator = import ./vscode/extensions/gpg-indicator { - inherit pkgs; - }; - wsl-wl-clipboard = import ./wsl-wl-clipboard { inherit pkgs; }; yazi-plugin-custom-shell = import ./yazi/plugins/custom-shell { inherit pkgs; }; diff --git a/packages/littlelink-server/default.nix b/packages/littlelink-server/default.nix index 1ac204b..67bfd39 100644 --- a/packages/littlelink-server/default.nix +++ b/packages/littlelink-server/default.nix @@ -2,18 +2,18 @@ # AUTO-UPDATE: nix-update --flake --version=branch=master littlelink-server pkgs.stdenv.mkDerivation (finalAttrs: { pname = "littlelink-server"; - version = "0-unstable-2025-07-30"; + version = "0-unstable-2025-08-25"; src = pkgs.fetchFromGitHub { owner = "techno-tim"; repo = "littlelink-server"; - rev = "bc1b832bfa02bd901d3592820bb9f2eaa6b65b30"; - hash = "sha256-5IDwp/mv0mRsLPxbzZfYxV3hE0U2iJEJitj5OlEhVvs="; + rev = "9c65c4f389a92b2bf2ca85e545960ef3be4e72e9"; + hash = "sha256-nd3dMWuYz2Af5XokTgMJdF0U2L98EW6CVuDGSXSOlls="; }; offlineCache = pkgs.fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-HbidudAixPNkW3/TAjcDnVZoMyrHein4+sV0QGaZWIo="; + hash = "sha256-Ikd2PUBIPTTv7e08HbANk4chwMtObyZtnd6pyiWKqps="; }; nativeBuildInputs = with pkgs; [ diff --git a/packages/obsidian/plugins/excalidraw/default.nix b/packages/obsidian/plugins/excalidraw/default.nix index 649b892..bcdadf6 100644 --- a/packages/obsidian/plugins/excalidraw/default.nix +++ b/packages/obsidian/plugins/excalidraw/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-excalidraw --subpackage mathjaxToSVG pkgs.buildNpmPackage (finalAttrs: { pname = "obsidian.plugins.excalidraw"; - version = "2.14.3"; + version = "2.15.1"; pkg = pkgs.fetchFromGitHub { owner = "zsviczian"; repo = "obsidian-excalidraw-plugin"; rev = finalAttrs.version; - hash = "sha256-cZAxCJFlw+ShO5YQDkzw58Y4W+cqRb9oyjp/xHRX6cE="; + hash = "sha256-EsyR5PTZkR+/+5F9mteZ06smbX0mhxtbagO6ZDloHgs="; }; mathjaxToSVG = pkgs.buildNpmPackage { @@ -32,7 +32,7 @@ pkgs.buildNpmPackage (finalAttrs: { patches = [ ./package-lock.patch ]; - npmDepsHash = "sha256-OKIK8zyadoAmX5BciqJzhHM8cl0vRnCywlMrNhcUWHI="; + npmDepsHash = "sha256-QuhHPLjPpZNKZH7qhOr77CCZS9+ls35+ka4WYOEt4zI="; npmPackFlags = [ "--ignore-scripts" ]; configurePhase = '' diff --git a/packages/obsidian/plugins/excalidraw/package-lock.patch b/packages/obsidian/plugins/excalidraw/package-lock.patch index bbc664f..f7d1d89 100644 --- a/packages/obsidian/plugins/excalidraw/package-lock.patch +++ b/packages/obsidian/plugins/excalidraw/package-lock.patch @@ -1,13 +1,13 @@ diff --git a/package-lock.json b/package-lock.json -index 033dbdd..fcb5477 100644 +index 21d66bd..fc0b033 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@popperjs/core": "^2.11.8", "@zsviczian/colormaster": "^1.2.2", -- "@zsviczian/excalidraw": "0.18.0-27", -+ "@zsviczian/excalidraw": "0.18.0-30", +- "@zsviczian/excalidraw": "0.18.0-31", ++ "@zsviczian/excalidraw": "0.18.0-37", "chroma-js": "^3.1.2", "clsx": "^2.0.0", "es6-promise-pool": "2.5.0", @@ -15,12 +15,12 @@ index 033dbdd..fcb5477 100644 "license": "MIT" }, "node_modules/@zsviczian/excalidraw": { -- "version": "0.18.0-27", -- "resolved": "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.18.0-27.tgz", -- "integrity": "sha512-cigzCO65+EB+Y4G9LYEK/kVf2R3nNqNjEhGWqi5tZ0AcHEKPsMHAn6CtU36V6crRdojZLtyg5RASIdkxy4zZCA==", -+ "version": "0.18.0-30", -+ "resolved": "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.18.0-30.tgz", -+ "integrity": "sha512-jeiejbAqCPq1kg76kxNV2+PpBf8yDCdcgPqZ6O4TOX+2IKpw0/K9Y16VPjGDO7SWGRBCi82WM98Vf09tdl5KaQ==", +- "version": "0.18.0-31", +- "resolved": "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.18.0-31.tgz", +- "integrity": "sha512-A1wyp8EVOhCdoxdX7middc8LoLpjPLtxiSTeBbdMtungl8VQzAcQ2tSGCkncK/8RBcBaUk44Hr6KcWjezHnQew==", ++ "version": "0.18.0-37", ++ "resolved": "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.18.0-37.tgz", ++ "integrity": "sha512-SC4a6wj6IzE9HucxImDoOPcojojW/8FSry1hSA+hXfU350DhY6VlpFQ1DHJMPqVgIkFHB/hbCHt3klV+66+ouw==", + "license": "MIT", "dependencies": { "@braintree/sanitize-url": "6.0.2", diff --git a/packages/obsidian/plugins/tasks/default.nix b/packages/obsidian/plugins/tasks/default.nix index 983bb8f..be5aa10 100644 --- a/packages/obsidian/plugins/tasks/default.nix +++ b/packages/obsidian/plugins/tasks/default.nix @@ -2,18 +2,18 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-tasks pkgs.stdenv.mkDerivation (finalAttrs: { pname = "tasks"; - version = "7.20.0"; + version = "7.21.0"; src = pkgs.fetchFromGitHub { owner = "obsidian-tasks-group"; repo = "obsidian-tasks"; rev = finalAttrs.version; - hash = "sha256-K9/H2BgruB1O9KwW+xoiCsuXFfu6o4xZDCI40OEmh+o="; + hash = "sha256-/7vTXAsMHWOopscdKldbXpvQvEl4qcnV3HpYClZWUsg="; }; offlineCache = pkgs.fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-ecPZvpMQkL2o0X4qx6h1jwQVZrtTC3+Aj7n/SBLRQbo="; + hash = "sha256-PXMN/05G1FIiR93seJSBilZDzXMv3o3cXDaEOUC71s0="; }; nativeBuildInputs = with pkgs; [ diff --git a/packages/obsidian/plugins/url-into-selection/default.nix b/packages/obsidian/plugins/url-into-selection/default.nix index adcc851..e56a804 100644 --- a/packages/obsidian/plugins/url-into-selection/default.nix +++ b/packages/obsidian/plugins/url-into-selection/default.nix @@ -2,16 +2,16 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-url-into-selection pkgs.buildNpmPackage (finalAttrs: { pname = "url-into-selection"; - version = "1.11.3"; + version = "1.11.4"; src = pkgs.fetchFromGitHub { owner = "denolehov"; repo = "obsidian-url-into-selection"; rev = finalAttrs.version; - hash = "sha256-B793Lpt/3ddj9xvpNSsiHjsa1yP7ZXhQFLBUPfCriAw="; + hash = "sha256-8yzx1ryMf7gRGbdD7zL3I1Q+W1RwcubTo42o6O3zCDY="; }; - npmDepsHash = "sha256-DKjYtQ6KycPEms5BdyOXw6iNb9MgNOyJg8haL+cZHMk="; + npmDepsHash = "sha256-/EVidF6Wn/AFFgqYIJjUErpZyfliNtCSHMMS1n6GBew="; npmPackFlags = [ "--ignore-scripts" ]; installPhase = '' diff --git a/packages/obsidian/themes/minimal/default.nix b/packages/obsidian/themes/minimal/default.nix index 5617ee2..374f7b9 100644 --- a/packages/obsidian/themes/minimal/default.nix +++ b/packages/obsidian/themes/minimal/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-theme-minimal pkgs.buildNpmPackage (finalAttrs: { pname = "minimal"; - version = "8.0.3"; + version = "8.0.4"; src = pkgs.fetchFromGitHub { owner = "kepano"; repo = "obsidian-minimal"; rev = finalAttrs.version; - hash = "sha256-pLfmIRY/opTgxYsvyNa9MVN9NziCTrjDTM/oBfhxEc0="; + hash = "sha256-TGToK2k9zpd5LappqlkGgxJliXqE4HzsBq07c4IN+T4="; }; npmDepsHash = "sha256-R+XeEkDP0MxNQsFCWmHXKtLBcmiOTv9Nw7t2e27kvQg="; diff --git a/packages/oidcwarden/default.nix b/packages/oidcwarden/default.nix index a0bbb9c..42c9e98 100644 --- a/packages/oidcwarden/default.nix +++ b/packages/oidcwarden/default.nix @@ -3,16 +3,16 @@ # FIXME: https://github.com/dani-garcia/vaultwarden/pull/3899 pkgs.rustPlatform.buildRustPackage (finalAttrs: { pname = "oidcwarden"; - version = "2025.6.1-3"; + version = "2025.8.1-1"; src = pkgs.fetchFromGitHub { owner = "Timshel"; repo = "OIDCWarden"; rev = "v${finalAttrs.version}"; - hash = "sha256-I4zOWIU8iBQeLMMQSVcKc3w+WodiZ6MDYnKR7H/+v0Y="; + hash = "sha256-yH2qewIV79hBDRn0KFj2mULpD2tTm5+8E2kIN8uMWHM="; }; - cargoHash = "sha256-fMePvMnefdcN90Y3BPqcKNXyg7tUd64IOUnOQis/qTU="; + cargoHash = "sha256-ZPCRFBaISCIlPY/x3lTqxuePgZXcOLvgyOrw2XVcAVw="; env.VW_VERSION = finalAttrs.version; diff --git a/packages/prometheus-podman-exporter/default.nix b/packages/prometheus-podman-exporter/default.nix index 7e1461e..1ea2bdd 100644 --- a/packages/prometheus-podman-exporter/default.nix +++ b/packages/prometheus-podman-exporter/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake prometheus-podman-exporter pkgs.buildGoModule (finalAttrs: { pname = "prometheus-podman-exporter"; - version = "1.17.2"; + version = "1.18.0"; src = pkgs.fetchFromGitHub { owner = "containers"; repo = "prometheus-podman-exporter"; rev = "v${finalAttrs.version}"; - hash = "sha256-TlQQbeYcCTZKF6DUKM+UE8iU9KC5tLpCtee62sNbW8s="; + hash = "sha256-hrecxJp78c8LruXTGRDU6zNWnyh+vwgCpVJsm026NYw="; }; vendorHash = null; diff --git a/packages/shlink-web-client/default.nix b/packages/shlink-web-client/default.nix index c83d4a3..6ebe22d 100644 --- a/packages/shlink-web-client/default.nix +++ b/packages/shlink-web-client/default.nix @@ -2,16 +2,16 @@ # AUTO-UPDATE: nix-update --flake shlink-web-client pkgs.buildNpmPackage (finalAttrs: { pname = "shlink-web-client"; - version = "4.5.0"; + version = "4.5.1"; src = pkgs.fetchFromGitHub { owner = "shlinkio"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-pIB1WH5iRyr0yNjqxK+bC7qh5fSzYMdOzlut1ohjSkg="; + hash = "sha256-ieRTXAYlF0IOt/dlXuHUGvvT1J+TYVWaoNQbYZFLOZ4="; }; - npmDepsHash = "sha256-Kn2hVMxQpNi3SwGElymNojaUyc/QMbi+9oIuFEkLeLw="; + npmDepsHash = "sha256-m9HrEyHgKSsCX/nf1DsEdSEnUQkt8vsbaJ0T3ndu1JU="; homepage = "/web"; diff --git a/packages/shlink/default.nix b/packages/shlink/default.nix index 4a1294f..1d7a726 100644 --- a/packages/shlink/default.nix +++ b/packages/shlink/default.nix @@ -2,11 +2,11 @@ # AUTO-UPDATE: nix-update --flake shlink pkgs.stdenv.mkDerivation (finalAttrs: { pname = "shlink"; - version = "4.5.0"; + version = "4.5.2"; src = pkgs.fetchzip { url = "https://github.com/shlinkio/shlink/releases/download/v${finalAttrs.version}/shlink${finalAttrs.version}_php8.4_dist.zip"; - sha256 = "sha256-IndszqEW3pUaBIHBh4eIkPF2sM/KawANAW1wWx8tRdU="; + sha256 = "sha256-1ZKC/o3IPPfVWxyAIkiaLN70XXLXHKalAvEG63Xrmes="; }; installPhase = '' diff --git a/packages/vscode/extensions/gpg-indicator/default.nix b/packages/vscode/extensions/gpg-indicator/default.nix deleted file mode 100644 index 2878358..0000000 --- a/packages/vscode/extensions/gpg-indicator/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: -# AUTO-UPDATE: nix-update --flake vscode-extension-wdhongtw-gpg-indicator -pkgs.vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "wdhongtw"; - name = "gpg-indicator"; - version = "0.7.5"; - hash = "sha256-gRwpU/KQj/5eYIJe6BORERIkiLV8Chz7+gJMqb08+J0="; - }; -}