update ultrastable, misc gnome stuff

This commit is contained in:
Vinzenz Schroeter 2023-11-24 14:32:58 +01:00
parent 50b0025f12
commit 2600e6a9fb
3 changed files with 194 additions and 183 deletions

View file

@ -25,7 +25,7 @@ in {
tracker-miners.enable = false; tracker-miners.enable = false;
tracker.enable = false; tracker.enable = false;
sushi.enable = true; sushi.enable = true;
#gnome-remote-desktop.enable = true; gnome-remote-desktop.enable = true;
}; };
}; };
@ -41,12 +41,11 @@ in {
epiphany # web browser epiphany # web browser
evince # document viewer evince # document viewer
geary # email client geary # email client
seahorse # password manager #seahorse # password manager
gnome-clocks gnome-clocks
gnome-maps gnome-maps
gnome-weather gnome-weather
gnome-music gnome-music
pkgs.gnome-connections
]; ];
}; };
} }

View file

@ -4,7 +4,7 @@
... ...
}: let }: let
unstable-commit-sha = "fa804edfb7869c9fb230e174182a8a1a7e512c40"; unstable-commit-sha = "fa804edfb7869c9fb230e174182a8a1a7e512c40";
ultrastable-commit-sha = "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857"; ultrastable-commit-sha = "8f1180704ac35baded1a74164365ac7cdfba6f38";
in { in {
options.my.allowUnfreePackages = lib.mkOption { options.my.allowUnfreePackages = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;

View file

@ -1,8 +1,14 @@
{ {
config, config,
osConfig,
pkgs, pkgs,
lib,
... ...
}: { }: let
isGnomeEnabled = osConfig.my.desktop.enableGnome;
in
lib.mkMerge [
{
home.packages = with pkgs; [ home.packages = with pkgs; [
keepassxc keepassxc
unstable.insync unstable.insync
@ -190,4 +196,10 @@
}; };
}; };
}; };
} }
(lib.mkIf isGnomeEnabled {
home.packages = with pkgs; [
fractal
];
})
]