From 1a83245c4d5c40d00d68c02578ab596fea25d19e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 26 Mar 2025 10:35:39 +0100 Subject: [PATCH 1/2] update lock --- flake.lock | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index ed60842..e336b8b 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1741895547, - "narHash": "sha256-kSb+kLH23exgw0bBO0lycD7sxIqKoYSwNnFzrfMqRtM=", + "lastModified": 1742773104, + "narHash": "sha256-dAhrL+gEjNN5U/Sosy7IrX0Y0qPA0U7Gp9TBhqEliNU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "ec50f84eca2f07eb07e9c8a5e61ee82a83930f53", + "rev": "d74460da63a8c08a69a1f143b04f2ab1a6b2f5c2", "type": "gitlab" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1741894454, - "narHash": "sha256-Mu2YXrGr/8Cid6W44AXci/YYnASoXjGrMV9Sjs66oyc=", + "lastModified": 1742957044, + "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b0baed7b2bf6a5e365d4cba042b580a2bc32e34", + "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1741877919, - "narHash": "sha256-4KrD5vgXA7P1rt7kiJJhKeSy6GZCOIwt0onaFu6R58o=", + "lastModified": 1742701397, + "narHash": "sha256-xkr0Bl6LShu0S0ubG+mS0uokPzmZLvm1pRzDFesgugg=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "7ab708b58d55b7653759cd4240e65884a9da8bd4", + "rev": "d48c8a01968afc8870b5afcba43b7739c943f7f8", "type": "github" }, "original": { @@ -482,11 +482,11 @@ ] }, "locked": { - "lastModified": 1740947705, - "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", + "lastModified": 1742568034, + "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "507911df8c35939050ae324caccc7cf4ffb76565", + "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", "type": "github" }, "original": { @@ -497,11 +497,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { @@ -522,11 +522,11 @@ ] }, "locked": { - "lastModified": 1741866599, - "narHash": "sha256-Re/T1Cjmiis0tdphj/Wjqt+c2RlMw/il7LBWzvwQPz0=", + "lastModified": 1742432671, + "narHash": "sha256-6M0lxz78i79n0UUm6GP/r7zMFXWr0V7gZhpnmtLSlJQ=", "owner": "nix-community", "repo": "nixos-images", - "rev": "63285ff93fc1daa2caac9f86e2302ae4edc5e84f", + "rev": "55f23642b75d501387691a22a7e86fbc22d06372", "type": "github" }, "original": { @@ -537,11 +537,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1741724370, - "narHash": "sha256-WsD+8uodhl58jzKKcPH4jH9dLTLFWZpVmGq4W1XDVF4=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95600680c021743fd87b3e2fe13be7c290e1cac4", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -553,11 +553,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -591,11 +591,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741709061, - "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=", + "lastModified": 1742916868, + "narHash": "sha256-2eN75OsaNpL3FzAs3hz9Xm3+htIP3iLdfRP6PGfOoS8=", "owner": "nix-community", "repo": "nixvim", - "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974", + "rev": "6b95b825529aa2d8536f7684fe64382ef4d15d84", "type": "github" }, "original": { @@ -613,11 +613,11 @@ ] }, "locked": { - "lastModified": 1741886583, - "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -636,11 +636,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -679,11 +679,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1741822816, - "narHash": "sha256-up3i+d8ZFoKEWSMpG2CoBwIKEzSmRSycIEuOSKlNhtM=", + "lastModified": 1742413977, + "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", "owner": "yu-re-ka", "repo": "nixos-mailserver", - "rev": "9eb0063bc2afaa00bd286623f3565fbec1103eba", + "rev": "b4fbffe79c00f19be94b86b4144ff67541613659", "type": "gitlab" }, "original": { @@ -726,11 +726,11 @@ ] }, "locked": { - "lastModified": 1741861888, - "narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=", + "lastModified": 1742700801, + "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f", + "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", "type": "github" }, "original": { @@ -746,11 +746,11 @@ ] }, "locked": { - "lastModified": 1741636056, - "narHash": "sha256-YYqTwGHpbeHs3m9jfqJJv6qO6fV6vXyB2cOVefINRTg=", + "lastModified": 1742432134, + "narHash": "sha256-J9BMk5uEXGZqe3ksA+TNjpuWx67r6qwa6MCS+ayDTqw=", "owner": "nix-community", "repo": "srvos", - "rev": "037690b00101fe635e83963dd965f04d5dad0a68", + "rev": "60a187c45762fcc5ed0f3c97e1da890d0ed3f695", "type": "github" }, "original": { @@ -855,11 +855,11 @@ ] }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { @@ -875,11 +875,11 @@ ] }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { From 23c46f6a4143bed8249c074061b5083ada319319 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 26 Mar 2025 10:52:51 +0100 Subject: [PATCH 2/2] update firefox config --- home-modules/firefox/default.nix | 60 ++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/home-modules/firefox/default.nix b/home-modules/firefox/default.nix index e8063b1..b47f894 100644 --- a/home-modules/firefox/default.nix +++ b/home-modules/firefox/default.nix @@ -237,10 +237,11 @@ in isDefault = true; name = "default"; search = { - default = "DuckDuckGo"; + default = "ddg"; force = true; engines = { - "Nix Packages" = { + "nixpkgs" = { + name = "Nix Packages"; urls = [ { template = "https://search.nixos.org/packages"; @@ -263,7 +264,8 @@ in icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; definedAliases = [ "@np" ]; }; - "NixOS Modules" = { + "nixos" = { + name = "NixOS Modules"; urls = [ { template = "https://search.nixos.org/options"; @@ -286,7 +288,8 @@ in icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; definedAliases = [ "@nm" ]; }; - "Noogle" = { + "noogle" = { + name = "Noogle"; urls = [ { template = "https://noogle.dev/q"; @@ -301,7 +304,8 @@ in icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; definedAliases = [ "@noogle" ]; }; - "Home Manager Modules" = { + "home-manager" = { + name = "Home Manager Modules"; urls = [ { template = "https://home-manager-options.extranix.com/"; @@ -320,7 +324,8 @@ in icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; definedAliases = [ "@hm" ]; }; - "Repology" = { + "repology" = { + name = "Repology"; urls = [ { template = "https://repology.org/projects"; @@ -332,11 +337,12 @@ in ]; } ]; - iconUpdateURL = "https://raw.githubusercontent.com/repology/repology-webapp/master/repologyapp/static/repology40x40.v1.png"; + icon = "https://raw.githubusercontent.com/repology/repology-webapp/master/repologyapp/static/repology40x40.v1.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@repo" ]; }; - "NixOS Wiki" = { + "nixos-wiki" = { + name = "NixOS Wiki"; urls = [ { template = "https://wiki.nixos.org/w/index.php"; @@ -348,10 +354,11 @@ in ]; } ]; - icon = "${config.programs.firefox.profiles.default.search.engines."Nix Packages".icon}"; + icon = "${config.programs.firefox.profiles.default.search.engines.nixpkgs.icon}"; definedAliases = [ "@nw" ]; }; - "Arch Wiki" = { + "arch-wiki" = { + name = "Arch Wiki"; urls = [ { template = "https://wiki.archlinux.org/index.php"; @@ -363,11 +370,12 @@ in ]; } ]; - iconUpdateURL = "https://upload.wikimedia.org/wikipedia/commons/1/13/Arch_Linux_%22Crystal%22_icon.svg"; + icon = "https://upload.wikimedia.org/wikipedia/commons/1/13/Arch_Linux_%22Crystal%22_icon.svg"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@arch" ]; }; - "Minecraft Wiki" = { + "minecraft-wiki" = { + name = "Minecraft Wiki"; urls = [ { template = "https://minecraft.wiki/"; @@ -379,11 +387,12 @@ in ]; } ]; - iconUpdateURL = "https://minecraft.wiki/images/Wiki.png"; + icon = "https://minecraft.wiki/images/Wiki.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@mc" ]; }; - "Warframe Wiki" = { + "warframe-wiki" = { + name = "Warframe Wiki"; urls = [ { template = "https://warframe.fandom.com/wiki/Special:Search"; @@ -395,11 +404,12 @@ in ]; } ]; - iconUpdateURL = "https://static.wikia.nocookie.net/warframe/images/e/e6/Site-logo.png"; + icon = "https://static.wikia.nocookie.net/warframe/images/e/e6/Site-logo.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@wf" ]; }; - "MusicBrainz Artis" = { + "musicbrainz-artist" = { + name = "MusicBrainz Artist"; urls = [ { template = "https://musicbrainz.org/search"; @@ -415,11 +425,12 @@ in ]; } ]; - iconUpdateURL = "https://musicbrainz.org/static/images/favicons/apple-touch-icon-180x180.png"; + icon = "https://musicbrainz.org/static/images/favicons/apple-touch-icon-180x180.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@mb" ]; }; - "DuckDuckGo" = { + "ddg" = { + name = "DuckDuckGo"; urls = [ { template = "https://duckduckgo.com"; @@ -431,17 +442,14 @@ in ]; } ]; - iconUpdateURL = "https://duckduckgo.com/assets/logo_header.v109.svg"; + icon = "https://duckduckgo.com/assets/logo_header.v109.svg"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "ddg" ]; }; - "Bing".metaData.hidden = true; - "Google".metaData.hidden = true; - "eBay".metaData.hidden = true; - "Amazon.de".metaData.hidden = true; - "ToS;DR Search".metaData.hidden = true; - "LibRedirect".metaData.hidden = true; - "Wikipedia (en)".metaData.alias = "@wiki"; + "bing".metaData.hidden = true; + "google".metaData.hidden = true; + "ebay".metaData.hidden = true; + "wikipedia".metaData.alias = "@wiki"; }; }; };