From 7b7afc679851cdfdf9507cfa84daf88fc5ddbfb4 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 11 May 2025 18:53:45 +0200 Subject: [PATCH] update search engines librewolf, update fish, neovim update --- flake.lock | 54 +++++++++---------- modules/home/apps/librewolf/default.nix | 18 ++++++- modules/home/cli-apps/fish/default.nix | 1 + modules/nixos/cli/neovim/lsp/default.nix | 1 - systems/x86_64-linux/bodenheizung/default.nix | 3 +- 5 files changed, 46 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index e73d8ca..d9a467a 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1746187242, - "narHash": "sha256-wtfhdDEPsxKYaJHCt0+eYaLm9pFVw594MZzQqP6iIE0=", + "lastModified": 1746849806, + "narHash": "sha256-6vJX4DnhDlWNtOOh3v08YqPgjJblfgHnV9562nPHNEo=", "owner": "rycee", "repo": "nur-expressions", - "rev": "982ed2da17695d932b695eacaec05c8ca053f8fc", + "rev": "e2408d3f94a6b658e12f135501aa7fd38efabc72", "type": "gitlab" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1746193516, - "narHash": "sha256-7KqthzbP7LbJpo6DtxlTg2Fqcs7HL1iV1vd1mM8q/u0=", + "lastModified": 1746798521, + "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", "owner": "nix-community", "repo": "home-manager", - "rev": "355a6b937d07a95cb0b753ef513bcaad09128dea", + "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", "type": "github" }, "original": { @@ -133,11 +133,11 @@ }, "mnw": { "locked": { - "lastModified": 1745705214, - "narHash": "sha256-XGfaHbFI4vvDuaoVO3IFYZKezXIO8rhUaMCGcjY71Ac=", + "lastModified": 1746338991, + "narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=", "owner": "Gerg-L", "repo": "mnw", - "rev": "c1f4587db4c53dcefa432c46c7a899a116d8e924", + "rev": "c65407ee9387ef75985dad3e30f58c822c766ec1", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1746814339, + "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745377448, - "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", + "lastModified": 1746152631, + "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", + "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1746052492, - "narHash": "sha256-1O7oXrrzGij2HwbwwLcbGNM5UbqFXTRb1q59lzE71jM=", + "lastModified": 1746852864, + "narHash": "sha256-4pE761eSft4GUboGMdseBC7WvfY81CMHuCuxnVy9PwI=", "owner": "notashelf", "repo": "nvf", - "rev": "ef3928be60ffee84062a0db4392834b339833245", + "rev": "fee3bbe536b5bf484aedebafa5130b485068b64f", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1745310711, - "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "stable": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { diff --git a/modules/home/apps/librewolf/default.nix b/modules/home/apps/librewolf/default.nix index 23d33cc..b7a0664 100644 --- a/modules/home/apps/librewolf/default.nix +++ b/modules/home/apps/librewolf/default.nix @@ -20,6 +20,7 @@ let "signon.rememberSignons" = true; "signon.storeWhenAutocompleteOff" = true; "sidebar.verticalTabs" = true; + "general.useragent.compatMode.firefox" = true; }; defaultExtensions = with inputs.firefox-addons.packages."x86_64-linux"; [ bitwarden @@ -30,6 +31,7 @@ let seventv ]; defaultSearch = { + force = true; # We need this, else the build fails privateDefault = "SearXNG"; default = "SearXNG"; engines = { @@ -42,7 +44,7 @@ let "My Nixos Packages" = { urls = [ { template = "https://mynixos.com/search?q={searchTerms}"; } ]; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; + definedAliases = [ "@mnp" ]; }; "NixOS Wiki" = { @@ -51,6 +53,20 @@ let updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@nw" ]; }; + + "NixOS Packages" = { + url = [ { template = "https://search.nixos.org/packages?query={searchTerms}"; } ]; + icon = "https://wiki.nixos.org/favicon.ico"; + updateInterval = 24 * 60 * 60 * 1000; + definedAliases = [ "@np" ]; + }; + + "NixOS Options" = { + url = [ { template = "https://search.nixos.org/options?query={searchTerms}"; } ]; + icon = "https://wiki.nixos.org/favicon.ico"; + updateInterval = 24 * 60 * 60 * 1000; + definedAliases = [ "@no" ]; + }; }; }; in diff --git a/modules/home/cli-apps/fish/default.nix b/modules/home/cli-apps/fish/default.nix index 67bbdc7..4ba9198 100644 --- a/modules/home/cli-apps/fish/default.nix +++ b/modules/home/cli-apps/fish/default.nix @@ -20,6 +20,7 @@ in enable = true; shellAliases = { nix-dns = "nixos-rebuild switch --flake .#dns --target-host dns-1 --use-remote-sudo && nixos-rebuild switch --flake .#dns --target-host dns-2 --use-remote-sudo"; + nix-blarm = "nixos-rebuild switch --flake .#blarm --target-host blarm --use-remote-sudo"; cd = "z"; }; plugins = [ diff --git a/modules/nixos/cli/neovim/lsp/default.nix b/modules/nixos/cli/neovim/lsp/default.nix index 44bd6cc..670f9d9 100644 --- a/modules/nixos/cli/neovim/lsp/default.nix +++ b/modules/nixos/cli/neovim/lsp/default.nix @@ -2,7 +2,6 @@ programs.nvf.settings.vim = { lsp.enable = true; languages = { - enableLSP = true; enableTreesitter = true; nix.enable = true; nix.format.type = "nixfmt"; diff --git a/systems/x86_64-linux/bodenheizung/default.nix b/systems/x86_64-linux/bodenheizung/default.nix index 2bcf658..10fe271 100644 --- a/systems/x86_64-linux/bodenheizung/default.nix +++ b/systems/x86_64-linux/bodenheizung/default.nix @@ -16,8 +16,7 @@ with lib.${namespace}; systemd-boot = { enable = true; consoleMode = "max"; - }; - }; + }; }; }; virtualisation.libvirtd.enable = true;