diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 8b8b9c6..2fc9a60 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -6,8 +6,8 @@ packages', ... }: let - pkgsUnstable = pkgs.callPackage nodeFlake.inputs.nixpkgs-unstable.outPath {}; - pkgsMaster = pkgs.callPackage nodeFlake.inputs.nixpkgs-master.outPath {}; + pkgsMaster = nodeFlake.inputs.nixpkgs-master.${pkgs.system}; + pkgsUnstableSmall = nodeFlake.inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system}; in { imports = [ ../profiles/common.nix @@ -40,6 +40,11 @@ in { home.sessionVariables.GOPATH = "$HOME/src/go"; 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 = [] ++ (with pkgs; [ @@ -174,8 +179,7 @@ in { # Document Processing and Management mendeley evince - pkgsUnstable.logseq - # (pkgsUnstable.logseq.override (_: {electron = pkgs.electron_20;})) + (logseq.override (_: {electron = pkgs.electron_20;})) # File Synchronzation dropbox @@ -227,7 +231,7 @@ in { # openshot-qt # introduces python: screenkey - pkgsUnstable.ledger-live-desktop + pkgsUnstableSmall.ledger-live-desktop ]); systemd.user.startServices = true; diff --git a/nix/home-manager/profiles/wayland-desktop.nix b/nix/home-manager/profiles/wayland-desktop.nix index 4d00c62..c213410 100644 --- a/nix/home-manager/profiles/wayland-desktop.nix +++ b/nix/home-manager/profiles/wayland-desktop.nix @@ -9,6 +9,7 @@ inherit (import ../lib.nix {}) mkSimpleTrayService; 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}; wayprompt = nixpkgs-wayland'.wayprompt; @@ -60,7 +61,7 @@ in { # xdg-desktop-portal xdg-desktop-portal-wlr # grim - (signal-desktop.overrideAttrs (old: { + (nixpkgs-unstable-small.signal-desktop.overrideAttrs (old: { preFixup = old.preFixup + '' gappsWrapperArgs+=( --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; })) .overrideAttrs(old: { diff --git a/nix/home-manager/programs/waybar.nix b/nix/home-manager/programs/waybar.nix index 00c91fb..c228404 100644 --- a/nix/home-manager/programs/waybar.nix +++ b/nix/home-manager/programs/waybar.nix @@ -4,6 +4,7 @@ home.packages = [ # required by any bar that has a tray plugin pkgs.libappindicator-gtk3 + pkgs.libdbusmenu-gtk3 ]; programs.waybar = { diff --git a/nix/os/devices/steveej-t14/system.nix b/nix/os/devices/steveej-t14/system.nix index 5f7fbf8..e91c806 100644 --- a/nix/os/devices/steveej-t14/system.nix +++ b/nix/os/devices/steveej-t14/system.nix @@ -19,7 +19,7 @@ in { ]; extra-experimental-features = ["impure-derivations"]; - system-features = ["recursive-nix"]; + system-features = ["recursive-nix" "big-parallel"]; }; networking.bridges."virbr1".interfaces = []; @@ -97,6 +97,7 @@ in { enable = true; joinNetworks = [ "93afae5963c547f1" + passwords.zerotier.dweb2023.networkId ]; }; } diff --git a/nix/variables/passwords.crypt.nix b/nix/variables/passwords.crypt.nix index 1cd71a9..c86ddb1 100644 Binary files a/nix/variables/passwords.crypt.nix and b/nix/variables/passwords.crypt.nix differ