diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 6578cbf..357ba6b 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -139,7 +139,7 @@ in { aspellDicts.en aspellDicts.de unstablepkgs.skype - zoom-us + # zoom-us # broken as of 2019-10-30 unstablepkgs.bluejeans-gui thunderbird gnome3.evolution # gnome4.glib_networking diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index 6d94e8b..acc8b1b 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,20 +1,20 @@ { channelsNixosStable = { - ref = "nixos-19.03"; - rev = "aef662d2eb532eeb9976068fd1705e3cf3663054"; + ref = "nixos-19.09"; + rev = "c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "73392e79aa62e406683d6a732eb4f4101f4732be"; + rev = "7827d3f4497ed722fedca57fd4d5ca1a65c38256"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "51aa3cc4855c5964a6e71adcf7b79c1a0c23f322"; + rev = "f6501c42cdf723d8c2c50aef5b96cc54826ae18f"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "95382060ebaa19ec49a861921216b1db8460b314"; + rev = "450571056552c9311fcb2894328696b535265593"; }; } diff --git a/nix/os/profiles/graphical/system.nix b/nix/os/profiles/graphical/system.nix index b8bf258..008464c 100644 --- a/nix/os/profiles/graphical/system.nix +++ b/nix/os/profiles/graphical/system.nix @@ -68,19 +68,24 @@ }; }; + services.gvfs.enable = true; + programs.seahorse.enable = true; + programs.gpaste.enable = false; + programs.gnome-terminal.enable = false; + programs.gnome-documents.enable = false; + programs.gnome-disks.enable = false; + services.gnome3 = { - gnome-disks.enable = false; - gnome-documents.enable = false; - gnome-online-miners.enable = false; + # gnome-online-miners.enable = false; TODO: enable this again + games.enable = false; + gnome-remote-desktop.enable = false; gnome-user-share.enable = false; - gnome-terminal-server.enable = false; - gpaste.enable = false; + rygel.enable = false; sushi.enable = false; tracker.enable = false; + tracker-miners.enable = false; # FIXME: gnome should be moved to user session - seahorse.enable = true; - gvfs.enable = true; at-spi2-core.enable = true; evolution-data-server.enable = true; gnome-online-accounts.enable = true; diff --git a/nix/overlay.nix b/nix/overlay.nix index 886dfa8..eb71e23 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -71,4 +71,7 @@ in { }); rdedup = super.callPackages ./pkgs/rdedup {}; + + # TODO: facetimehd is currfently broken (https://github.com/NixOS/nixpkgs/pull/72804) + facetimehd-firmware = super.hello; } diff --git a/nix/variables/versions.tmpl.nix b/nix/variables/versions.tmpl.nix index 9f35d77..92eaa01 100644 --- a/nix/variables/versions.tmpl.nix +++ b/nix/variables/versions.tmpl.nix @@ -1,7 +1,7 @@ { channelsNixosStable = { - ref = "nixos-19.03"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-19.03 | awk '{ print $1 }' | tr -d '\n' -%>"; + ref = "nixos-19.09"; + rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-19.09 | awk '{ print $1 }' | tr -d '\n' -%>"; }; channelsNixosUnstable = { ref = "nixos-unstable";