Lillian-Violet/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

disable the git conduwuit and use the nixpkgs one

Browse source
This commit is contained in:
Lillian Violet 2024-12-21 00:21:27 +01:00
parent 745b72d6f5
commit 34bd6cca90
3 changed files with 74 additions and 720 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

780
flake.lock
View file

File diff suppressed because it is too large Load diff

10
flake.nix
View file

@ -34,10 +34,10 @@
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
# Conduit fork without all the fuss and drama # Conduit fork without all the fuss and drama
conduwuit = { # conduwuit = {
url = "github:girlbossceo/conduwuit"; # url = "github:girlbossceo/conduwuit";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; # };
# Nix index database files # Nix index database files
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";
@ -99,7 +99,7 @@
jovian, jovian,
nixos-hardware, nixos-hardware,
nix-index-database, nix-index-database,
conduwuit, # conduwuit,
stylix, stylix,
... ...
} @ inputs: let } @ inputs: let

4
nixos/server/package-configs/conduit/default.nix
View file

@ -1,7 +1,6 @@
{ {
config, config,
pkgs, pkgs,
inputs,
... ...
}: let }: let
# You'll need to edit these values # You'll need to edit these values
@ -35,7 +34,8 @@ in {
# This causes NixOS to use the flake defined in this repository instead of # This causes NixOS to use the flake defined in this repository instead of
# the build of Conduit built into nixpkgs. # the build of Conduit built into nixpkgs.
package = inputs.conduwuit.packages.${pkgs.system}.default; # package = inputs.conduwuit.packages.${pkgs.system}.default;
package = pkgs.conduwuit;
settings.global = { settings.global = {
inherit server_name; inherit server_name;