Remove previously needed unstable references

This commit is contained in:
Natsu Kagami 2024-06-02 16:56:54 +02:00
parent db64c71a2a
commit 74ad74af1f
Signed by: nki
GPG key ID: 55A032EB38B49ADB
4 changed files with 9 additions and 17 deletions

View file

@ -4,8 +4,6 @@ let
cfg = config.linux.graphical;
vscode = with pkgs; if stdenv.isAarch64 then unstable.vscode else unstable.vscode-fhs;
alwaysStartup = with pkgs; [ ];
in
{
imports = [ ./x11.nix ./wayland.nix ./alacritty.nix ];
@ -46,19 +44,19 @@ in
cinnamon.nemo # File manager
thunderbird # Email
sublime-music # For navidrome
pkgs.unstable.cinny-desktop
pkgs.unstable.gajim
cinny-desktop
gajim
vivaldi
# Note taking
pkgs.unstable.logseq
logseq
# Audio
qpwgraph # Pipewire graph
# (if stdenv.isAarch64 then zotero else pkgs.unstable.zotero) // kinda fucked for now from CVE
zotero_7
libreoffice
mpv # for anki
pkgs.unstable.anki-bin
anki-bin
tdesktop
whatsapp-for-linux
@ -75,11 +73,11 @@ in
] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
gnome.cheese # Webcam check, expensive
# Chat stuff
unstable.slack
slack
]));
nki.programs.discord.enable = pkgs.stdenv.isx86_64;
nki.programs.discord.package = (pkgs.callPackage pkgs.unstable.vesktop.override { stdenv = pkgs.gcc13Stdenv; }).overrideAttrs (attrs: {
nki.programs.discord.package = pkgs.vesktop.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.nss_latest pkgs.makeWrapper ];
postInstall = ''
makeWrapper $out/bin/vesktop $out/bin/discord
@ -214,7 +212,7 @@ in
"${srcFile}/${pkg.name}.desktop";
};
};
autoStartup = listToAttrs (map f (cfg.startup ++ alwaysStartup));
autoStartup = listToAttrs (map f cfg.startup);
in
autoStartup // {
## Polkit UI

View file

@ -166,7 +166,7 @@ in
] ++ lib.lists.optional
(!pkgs.stdenv.isAarch64)
(
{ command = "${pkgs.unstable.premid}/bin/premid"; }
{ command = "${pkgs.premid}/bin/premid"; }
) else [ ]);
### Keybindings

View file

@ -28,7 +28,6 @@ in
cloud.traefik.hosts.invidious = { host = "invi.dtth.ch"; port = 61191; };
services.invidious = {
enable = true;
package = pkgs.unstable.invidious;
domain = "invi.dtth.ch";
port = 61191;
extraSettingsFile = config.sops.secrets.invidious.path;

View file

@ -5,15 +5,10 @@ let
x86 = import nixpkgs-unstable { system = prev.system; config.allowUnsupportedSystem = true; };
};
overlay-needs-unstable = final: prev: {
# override some packages that needs unstable that cannot be changed in the setup.
nix-direnv = prev.unstable.nix-direnv;
# Typst updates really quickly.
typst = final.unstable.typst;
typst-lsp = final.unstable.typst-lsp;
peertube = final.unstable.peertube;
# Until 0.35 is in
kitty = final.unstable.kitty;
};