diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index a7f9e52..2f4374b 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -94,7 +94,7 @@ lm_sensors sshfs gopls - anki + anki-bin trezorctl trezor-agent q @@ -143,6 +143,7 @@ )) telegram-desktop jadx + gradle ]; programs.waybar.enable = true; diff --git a/hosts/chunk/conduwuit.nix b/hosts/chunk/conduwuit.nix index 99d3958..3a6638f 100644 --- a/hosts/chunk/conduwuit.nix +++ b/hosts/chunk/conduwuit.nix @@ -1,9 +1,7 @@ -{ inputs, ... }: +{ ... }: { services.conduwuit = { enable = true; - package = - inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised; settings.global = { port = [ 8448 ]; server_name = "cything.io"; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index d6bd53e..0fd41cf 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -427,4 +427,9 @@ services.envfs.enable = true; programs.kdeconnect.enable = true; programs.dconf.enable = true; + + programs.java = { + enable = true; + binfmt = true; + }; } diff --git a/overlay/default.nix b/overlay/default.nix index 6d532cf..6f577ac 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,7 +1,6 @@ { inputs }: let overlays = [ - ./conduwuit ./attic ]; importedOverlays = map (m: import m) overlays; @@ -15,12 +14,7 @@ importedOverlays stable = inputs.nixpkgs-stable; in { - # bitwarden-cli = pkgFrom stable "bitwarden-cli"; - # roundcube = pkgFrom stable "roundcube"; - # lldb = pkgFrom stable "lldb"; - # calibre = pkgFrom stable "calibre"; - # nil = inputs.nil.packages.${prev.system}.nil; - # anki = pkgFrom inputs.anki "anki-bin"; + conduwuit = inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised; } ) ]