chore(nix): use nixos-unstable-small

This commit is contained in:
steveej 2023-05-25 11:30:03 +02:00
parent 8c1d4fca8c
commit acaa6dc4cf
5 changed files with 15 additions and 8 deletions

View file

@ -6,8 +6,8 @@
packages', packages',
... ...
}: let }: let
pkgsUnstable = pkgs.callPackage nodeFlake.inputs.nixpkgs-unstable.outPath {}; pkgsMaster = nodeFlake.inputs.nixpkgs-master.${pkgs.system};
pkgsMaster = pkgs.callPackage nodeFlake.inputs.nixpkgs-master.outPath {}; pkgsUnstableSmall = nodeFlake.inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
in { in {
imports = [ imports = [
../profiles/common.nix ../profiles/common.nix
@ -40,6 +40,11 @@ in {
home.sessionVariables.GOPATH = "$HOME/src/go"; home.sessionVariables.GOPATH = "$HOME/src/go";
home.sessionVariables.PATH = pkgs.lib.concatStringsSep ":" ["$HOME/.local/bin" "$PATH"]; home.sessionVariables.PATH = pkgs.lib.concatStringsSep ":" ["$HOME/.local/bin" "$PATH"];
# required by logseq as of 2023-05-24
nixpkgs.config.permittedInsecurePackages = [
"electron-20.3.11"
];
home.packages = home.packages =
[] []
++ (with pkgs; [ ++ (with pkgs; [
@ -174,8 +179,7 @@ in {
# Document Processing and Management # Document Processing and Management
mendeley mendeley
evince evince
pkgsUnstable.logseq (logseq.override (_: {electron = pkgs.electron_20;}))
# (pkgsUnstable.logseq.override (_: {electron = pkgs.electron_20;}))
# File Synchronzation # File Synchronzation
dropbox dropbox
@ -227,7 +231,7 @@ in {
# openshot-qt # openshot-qt
# introduces python: screenkey # introduces python: screenkey
pkgsUnstable.ledger-live-desktop pkgsUnstableSmall.ledger-live-desktop
]); ]);
systemd.user.startServices = true; systemd.user.startServices = true;

View file

@ -9,6 +9,7 @@
inherit (import ../lib.nix {}) mkSimpleTrayService; inherit (import ../lib.nix {}) mkSimpleTrayService;
nixpkgs-2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system}; nixpkgs-2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system};
nixpkgs-unstable-small = nodeFlake.inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
nixpkgs-wayland' = repoFlake.inputs.nixpkgs-wayland.packages.${pkgs.system}; nixpkgs-wayland' = repoFlake.inputs.nixpkgs-wayland.packages.${pkgs.system};
wayprompt = nixpkgs-wayland'.wayprompt; wayprompt = nixpkgs-wayland'.wayprompt;
@ -60,7 +61,7 @@ in {
# xdg-desktop-portal xdg-desktop-portal-wlr # xdg-desktop-portal xdg-desktop-portal-wlr
# grim # grim
(signal-desktop.overrideAttrs (old: { (nixpkgs-unstable-small.signal-desktop.overrideAttrs (old: {
preFixup = old.preFixup + '' preFixup = old.preFixup + ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--add-flags "--enable-features=UseOzonePlatform" --add-flags "--enable-features=UseOzonePlatform"
@ -69,7 +70,7 @@ in {
''; '';
})) }))
((pkgs.session-desktop.override (old: { ((nixpkgs-unstable-small.session-desktop.override (old: {
inherit (nixpkgs-2211) appimageTools; inherit (nixpkgs-2211) appimageTools;
})) }))
.overrideAttrs(old: { .overrideAttrs(old: {

View file

@ -4,6 +4,7 @@
home.packages = [ home.packages = [
# required by any bar that has a tray plugin # required by any bar that has a tray plugin
pkgs.libappindicator-gtk3 pkgs.libappindicator-gtk3
pkgs.libdbusmenu-gtk3
]; ];
programs.waybar = { programs.waybar = {

View file

@ -19,7 +19,7 @@ in {
]; ];
extra-experimental-features = ["impure-derivations"]; extra-experimental-features = ["impure-derivations"];
system-features = ["recursive-nix"]; system-features = ["recursive-nix" "big-parallel"];
}; };
networking.bridges."virbr1".interfaces = []; networking.bridges."virbr1".interfaces = [];
@ -97,6 +97,7 @@ in {
enable = true; enable = true;
joinNetworks = [ joinNetworks = [
"93afae5963c547f1" "93afae5963c547f1"
passwords.zerotier.dweb2023.networkId
]; ];
}; };
} }

Binary file not shown.