update nextcloud and conduwuit

disable weird LLM shit in firefox pre-emtpively
update flake lock, fix all errors (small tweaks)
2025-04-05 14:36:00 +02:00 · 2025-04-04 20:54:44 +02:00 · 2025-04-01 17:52:43 +02:00 · 2025-03-31 19:19:46 +02:00 · 2025-03-29 02:06:36 +01:00
8 changed files with 82 additions and 258 deletions
--- a/flake.lock
+++ b/flake.lock
@ -74,6 +74,7 @@
        "flake-parts": [
          "flake-parts"
        ],
+        "nix-github-actions": "nix-github-actions",
        "nixpkgs": [
          "nixpkgs"
        ],
@ -81,11 +82,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1742852783,
-        "narHash": "sha256-pgpFoMc1RGGSyOGJikcXzsQND7VQ1/ywTwFa537b/hQ=",
+        "lastModified": 1743460818,
+        "narHash": "sha256-NmpDlQORTW1T2xot97mim7+4CQySFMMoWF10Ix8CXcY=",
        "owner": "koverstreet",
        "repo": "bcachefs-tools",
-        "rev": "6657ce2de3cdb25b14fb0183b90366e3e577fb9a",
+        "rev": "3aa2a4c47ce57ff3965b75df9dde1a7b40ed6ae1",
        "type": "github"
      },
      "original": {
@ -115,11 +116,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1742599566,
-        "narHash": "sha256-xr6ntmiUPXSh9o9mJ7og9vxALMQs1EQhIhWUAO2D1M0=",
+        "lastModified": 1743414153,
+        "narHash": "sha256-bFIXz7SvLlSNR4M3vYPYS1CpEN9vTUiH01R4iR/BDmA=",
        "owner": "catppuccin",
        "repo": "nix",
-        "rev": "5e303e8d7e251868fa79f83bbda69da90aa62402",
+        "rev": "2f52f9ead26f80d7b391cedcbb3eb309bd83fff4",
        "type": "github"
      },
      "original": {
@ -502,11 +503,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742851132,
-        "narHash": "sha256-8vEcDefstheV1whup+5fSpZu4g9Jr7WpYzOBKAMSHn4=",
+        "lastModified": 1743519130,
+        "narHash": "sha256-Nw6sLnuwDPW7pBJ5jIvFFMqBfeK31xcp7/w1oYH1Q7U=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c4d5d72805d14ea43c140eeb70401bf84c0f11b4",
+        "rev": "0afad8f08014c992c832466c1d46a0aa96ca2563",
        "type": "github"
      },
      "original": {
@ -539,15 +540,15 @@
    },
    "jovian": {
      "inputs": {
-        "nix-github-actions": "nix-github-actions",
+        "nix-github-actions": "nix-github-actions_2",
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1742465245,
-        "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=",
+        "lastModified": 1743144043,
+        "narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287",
+        "rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24",
        "type": "github"
      },
      "original": {
@ -580,6 +581,27 @@
      }
    },
    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "bcachefs-tools",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737420293,
+        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
+    "nix-github-actions_2": {
      "inputs": {
        "nixpkgs": [
          "jovian",
@ -608,11 +630,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742701275,
-        "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=",
+        "lastModified": 1743306489,
+        "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6",
+        "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d",
        "type": "github"
      },
      "original": {
@ -659,11 +681,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1742806253,
-        "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
+        "lastModified": 1743420942,
+        "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
+        "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
        "type": "github"
      },
      "original": {
@ -675,11 +697,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1742288794,
-        "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
+        "lastModified": 1742889210,
+        "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
+        "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
        "type": "github"
      },
      "original": {
@ -706,11 +728,11 @@
    },
    "nixpkgs-edge": {
      "locked": {
-        "lastModified": 1742855907,
-        "narHash": "sha256-7njF0f8vk19p0cCYP+9EgYWT2RPCTSD822Yi41THKcs=",
+        "lastModified": 1743520842,
+        "narHash": "sha256-5lWR/Ku1xrwDGacNRyCUrCYr66AdR6BntH6vfHUpZns=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d395b30f4825e4bfbc31ed2fbd06162da496217e",
+        "rev": "963f97c0792f299d42f6ff9245618383bbce825e",
        "type": "github"
      },
      "original": {
@ -721,11 +743,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1742669843,
-        "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
+        "lastModified": 1743315132,
+        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
+        "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
        "type": "github"
      },
      "original": {
@ -769,11 +791,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1742669843,
-        "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
+        "lastModified": 1743315132,
+        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
+        "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
        "type": "github"
      },
      "original": {
@ -800,11 +822,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1742578646,
-        "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=",
+        "lastModified": 1743441817,
+        "narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993",
+        "rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e",
        "type": "github"
      },
      "original": {
@ -1031,11 +1053,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1742700801,
-        "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
+        "lastModified": 1743502316,
+        "narHash": "sha256-zI2WSkU+ei4zCxT+IVSQjNM9i0ST++T2qSFXTsAND7s=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
+        "rev": "e7f4d7ed8bce8dfa7d2f2fe6f8b8f523e54646f8",
        "type": "github"
      },
      "original": {
@ -1066,11 +1088,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1742855382,
-        "narHash": "sha256-C/aBeGktWiRg2EoSc0Aug8v+cZirSkyoVtMx1P0Dex0=",
+        "lastModified": 1743496321,
+        "narHash": "sha256-xhHg8ixBhZngvGOMb2SJuJEHhHA10n8pA02fEKuKzek=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "5321ab0c763caa786c9756a8e8e85d1c35a8e650",
+        "rev": "54721996d6590267d095f63297d9051e9342a33d",
        "type": "github"
      },
      "original": {
@ -1257,11 +1279,11 @@
        "rust-overlay": "rust-overlay_3"
      },
      "locked": {
-        "lastModified": 1741803511,
-        "narHash": "sha256-DcCGBWvAvt+OWI+EcPRO+/IXZHkFgPxZUmxf2VLl8no=",
+        "lastModified": 1743151937,
+        "narHash": "sha256-SjfGN+3wrzgRvzpziowTQUIr/o6ac5iMniua0ra6elo=",
        "owner": "dj95",
        "repo": "zjstatus",
-        "rev": "df9c77718f7023de8406e593eda6b5b0bc09cddd",
+        "rev": "2772e18d1bf57b5fe24c7e2c86a6cbec0475cd88",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -34,10 +34,10 @@
    catppuccin.url = "github:catppuccin/nix";

    # Conduit fork without all the fuss and drama
-    # conduwuit = {
-    #   url = "github:girlbossceo/conduwuit";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    conduwuit = {
+      url = "github:girlbossceo/conduwuit";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

    # Nix index database files
    nix-index-database.url = "github:nix-community/nix-index-database";
@ -99,7 +99,7 @@
    jovian,
    nixos-hardware,
    nix-index-database,
-    # conduwuit,
+    conduwuit,
    stylix,
    ...
  } @ inputs: let
@ -131,7 +131,7 @@
      nix-index-database.nixosModules.nix-index
      {
        home-manager.sharedModules = [
-          inputs.catppuccin.homeManagerModules.catppuccin
+          catppuccin.homeModules.catppuccin
          ./home-manager/shared
          sops-nix.homeManagerModules.sops
        ];
@ -164,7 +164,7 @@
    nixosModules = import ./modules/nixos;
    # Reusable home-manager modules you might want to export
    # These are usually stuff you would upstream into home-manager
-    homeManagerModules = import ./modules/home-manager;
+    # homeManagerModules = import ./modules/home-manager;

    # Your custom packages and modifications, exported as overlays
    overlays = import ./overlays {inherit inputs;};
--- a/home-manager/shared/shell/helix/helix.nix
+++ b/home-manager/shared/shell/helix/helix.nix
@ -7,7 +7,7 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "helix";
-  version = "24.07";
+  version = "25.01.1";

  # This release tarball includes source code for the tree-sitter grammars,
  # which is not ordinarily part of the repository.
@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec {
    stripRoot = false;
  };

+  useFetchCargoVendor = true;
  cargoHash = "";

  nativeBuildInputs = [git installShellFiles];
--- a/nixos/desktop/package-configs/firefox/default.nix
+++ b/nixos/desktop/package-configs/firefox/default.nix
@ -160,6 +160,8 @@
        "floorp.tabbar.style" = 2;
        "floorp.browser.user.interface" = 8;
        "signon.rememberSignons" = true;
+        "browser.ml.chat.enabled" = false;
+        "browser.ml.chat.shortcuts" = false;
      };
      # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks
      # Bookmarks = [
--- a/nixos/server/package-configs/nextcloud/default.nix
+++ b/nixos/server/package-configs/nextcloud/default.nix
@ -50,7 +50,7 @@
    enable = true;
    hostName = "nextcloud.gladtherescake.eu";

-    package = pkgs.nextcloud30;
+    package = pkgs.nextcloud31;

    # Use HTTPS for links
    https = true;
--- a/nixos/shared/packages/default.nix
+++ b/nixos/shared/packages/default.nix
@ -22,7 +22,7 @@
      install-nix-no-inhibit
      update
      upgrade
-      # simple-completion-language-server
+      simple-completion-language-server

      # System tools
      age
--- a/pkgs/fcast/default.nix
+++ b/pkgs/fcast/default.nix
@ -1,202 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  cargo,
-  copyDesktopItems,
-  dbus,
-  electron_28,
-  fetchFromGitLab,
-  glib,
-  gnome,
-  gtk3,
-  jq,
-  libsecret,
-  makeDesktopItem,
-  makeWrapper,
-  moreutils,
-  napi-rs-cli,
-  nodejs_18,
-  patchutils_0_4_2,
-  pkg-config,
-  python3,
-  runCommand,
-  rustc,
-  rustPlatform,
-}: let
-  description = "A secure and free password manager for all of your devices";
-  icon = "bitwarden";
-  electron = electron_28;
-in
-  buildNpmPackage rec {
-    pname = "bitwarden-desktop";
-    version = "2024.3.0";
-
-    src = fetchFromGitLab {
-      owner = "videostreaming";
-      repo = "fcast";
-      rev = "b13d0f7e8150c279d377a78f89d338b7fc0f5539";
-      hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g=";
-    };
-
-    patches = [
-      ./electron-builder-package-lock.patch
-    ];
-
-    # The nested package-lock.json from upstream is out-of-date, so copy the
-    # lock metadata from the root package-lock.json.
-    postPatch = ''
-      cat {,apps/desktop/src/}package-lock.json \
-        | ${lib.getExe jq} -s '
-          .[1].packages."".dependencies.argon2 = .[0].packages."".dependencies.argon2
-            | .[0].packages."" = .[1].packages.""
-            | .[1].packages = .[0].packages
-            | .[1]
-          ' \
-        | ${moreutils}/bin/sponge apps/desktop/src/package-lock.json
-    '';
-
-    nodejs = nodejs_18;
-
-    makeCacheWritable = true;
-    npmFlags = ["--legacy-peer-deps"];
-    npmWorkspace = "apps/desktop";
-    npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc=";
-
-    cargoDeps = rustPlatform.fetchCargoTarball {
-      name = "${pname}-${version}";
-      inherit src;
-      patches =
-        map
-        (
-          patch:
-            runCommand
-            (builtins.baseNameOf patch)
-            {nativeBuildInputs = [patchutils_0_4_2];}
-            ''
-              < ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out
-            ''
-        )
-        patches;
-      patchFlags = ["-p4"];
-      sourceRoot = "${src.name}/${cargoRoot}";
-      hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI=";
-    };
-    cargoRoot = "apps/desktop/desktop_native";
-
-    env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
-
-    nativeBuildInputs = [
-      cargo
-      copyDesktopItems
-      jq
-      makeWrapper
-      moreutils
-      napi-rs-cli
-      pkg-config
-      python3
-      rustc
-      rustPlatform.cargoCheckHook
-      rustPlatform.cargoSetupHook
-    ];
-
-    buildInputs = [
-      glib
-      gtk3
-      libsecret
-    ];
-
-    preBuild = ''
-      if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
-        echo 'ERROR: electron version mismatch'
-        exit 1
-      fi
-    '';
-
-    postBuild = ''
-      pushd apps/desktop
-
-      # desktop_native/index.js loads a file of that name regarldess of the libc being used
-      mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node
-
-      npm exec electron-builder -- \
-        --dir \
-        -c.electronDist=${electron}/libexec/electron \
-        -c.electronVersion=${electron.version}
-
-      popd
-    '';
-
-    doCheck = true;
-
-    nativeCheckInputs = [
-      dbus
-      (gnome.gnome-keyring.override {useWrappedDaemon = false;})
-    ];
-
-    checkFlags = [
-      "--skip=password::password::tests::test"
-    ];
-
-    checkPhase = ''
-      runHook preCheck
-
-      pushd ${cargoRoot}
-      export HOME=$(mktemp -d)
-      export -f cargoCheckHook runHook _eval _callImplicitHook
-      export cargoCheckType=release
-      dbus-run-session \
-        --config-file=${dbus}/share/dbus-1/session.conf \
-        -- bash -e -c cargoCheckHook
-      popd
-
-      runHook postCheck
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir $out
-
-      pushd apps/desktop/dist/linux-unpacked
-      mkdir -p $out/opt/Bitwarden
-      cp -r locales resources{,.pak} $out/opt/Bitwarden
-      popd
-
-      makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \
-        --add-flags $out/opt/Bitwarden/resources/app.asar \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
-        --set-default ELECTRON_IS_DEV 0 \
-        --inherit-argv0
-
-      pushd apps/desktop/resources/icons
-      for icon in *.png; do
-        dir=$out/share/icons/hicolor/"''${icon%.png}"/apps
-        mkdir -p "$dir"
-        cp "$icon" "$dir"/${icon}.png
-      done
-      popd
-
-      runHook postInstall
-    '';
-
-    desktopItems = [
-      (makeDesktopItem {
-        name = "bitwarden";
-        exec = "bitwarden %U";
-        inherit icon;
-        comment = description;
-        desktopName = "Bitwarden";
-        categories = ["Utility"];
-      })
-    ];
-
-    meta = {
-      changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}";
-      inherit description;
-      homepage = "https://bitwarden.com";
-      license = lib.licenses.gpl3;
-      maintainers = with lib.maintainers; [amarshall kiwi];
-      platforms = ["x86_64-linux"];
-      mainProgram = "bitwarden";
-    };
-  }
--- a/pkgs/simple-completion-language-server/default.nix
+++ b/pkgs/simple-completion-language-server/default.nix
@ -5,16 +5,17 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "simple-completion-language-server";
-  version = "ff9f90bc96c347f284571bc6310bc31f95508d55";
+  version = "6c797949ad5a6e9548b60b5475d1c9977f26c811";

  src = fetchFromGitHub {
    owner = "estin";
    repo = pname;
    rev = version;
-    hash = "sha256-qybbZXjKzKcc6UXfAjwmkkB+qEUuGQXABRbMj7bNksM=";
+    hash = "sha256-cITZdlDB03i7gOYbahV99wZOQ7tisnqdT/N2Z12oLFM=";
  };

-  cargoHash = "sha256-VTz2Fm+PRUPM5+u9D+2TzGGIEQwb1j0Lz0WRaQ5/Yzo=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-nannF4BKRLCcsS7VznzEHqrhLHYvN4X22t8jud87XEM=";
  meta = with lib; {
    description = "Language server to enable word completion and snippets for Helix editor";
    homepage = "https://github.com/estin/simple-completion-language-server";
Author	SHA1	Message	Date
Lillian Violet	6e92148600	update nextcloud and conduwuit	2025-04-05 14:36:00 +02:00
Lillian Violet	b0b86f6ac4	disable weird LLM shit in firefox pre-emtpively	2025-04-04 20:54:44 +02:00
Lillian Violet	7232b225b7	update flake lock, fix all errors (small tweaks)	2025-04-01 17:52:43 +02:00
Lillian Violet	42a6516376	update flake lock	2025-03-31 19:19:46 +02:00
Lillian Violet	2a2367e835	update flake lock	2025-03-29 02:06:36 +01:00