diff --git a/desktop/gnome.nix b/desktop/gnome.nix index df96bb3..dfc1cbb 100644 --- a/desktop/gnome.nix +++ b/desktop/gnome.nix @@ -25,9 +25,9 @@ let in { environment.systemPackages = with pkgs; with gnomeExtensions; [ - gnome3.dconf-editor - gnome3.gnome-tweaks - gnome3.gnome-shell-extensions # required for user-theme + gnome.dconf-editor + gnome.gnome-tweaks + gnome.gnome-shell-extensions # required for user-theme dash-to-panel appindicator pop-shell @@ -35,21 +35,21 @@ in { services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.wayland = false; - services.xserver.desktopManager.gnome3.enable = true; - services.xserver.desktopManager.gnome3.extraGSettingsOverrides = '' + services.xserver.desktopManager.gnome.enable = true; + services.xserver.desktopManager.gnome.extraGSettingsOverrides = '' [org/gnome/desktop/input-sources] sources=[('xkb', 'gb'), ('xkb', 'mozc-jp')] ''; # exclude some default applications - environment.gnome3.excludePackages = with pkgs; [ - gnome3.gnome-weather - gnome3.gnome-calendar - gnome3.gnome-maps - gnome3.gnome-contacts - gnome3.gnome-software - gnome3.totem - gnome3.epiphany + environment.gnome.excludePackages = with pkgs; [ + gnome.gnome-weather + gnome.gnome-calendar + gnome.gnome-maps + gnome.gnome-contacts + gnome.gnome-software + gnome.totem + gnome.epiphany ]; programs.gnome-terminal.enable = false; programs.geary.enable = false; diff --git a/desktop/gtk.nix b/desktop/gtk.nix index f7d82f8..5b2ef74 100644 --- a/desktop/gtk.nix +++ b/desktop/gtk.nix @@ -1,5 +1,5 @@ { config, pkgs, ... }: { - services.dbus.packages = with pkgs; [ gnome3.dconf ]; + services.dbus.packages = with pkgs; [ gnome.dconf ]; } diff --git a/flake.lock b/flake.lock index a38a49e..ea0d4cb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1619345332, - "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", + "lastModified": 1620759905, + "narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=", "owner": "numtide", "repo": "flake-utils", - "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28", + "rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1620138697, - "narHash": "sha256-8Mgj+Fj4zGEI7oA9wbyqvdwq+46kAyd3barMIedWkho=", + "lastModified": 1620692082, + "narHash": "sha256-s/eBXs4OI47yPWNTKoAg4f/H7wMLyO+VEMmobXkzfI8=", "owner": "nix-community", "repo": "home-manager", - "rev": "64c5228c0828fff0c94c1d42f7225115c299ae08", + "rev": "23769994e8f7b212d9a257799173b120ed87736b", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1620074890, - "narHash": "sha256-4Z8Zwpg0gPvqKbSsck1g9ql4E5NClGZdjyxbYoaXA4s=", + "lastModified": 1620741912, + "narHash": "sha256-TvAEtovofPE7CQiRt2+LNmn2qeCMF1gLXAfs34a0zqA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7cb76200088f45cd24a9aa67fd2f9657943d78a4", + "rev": "ca26ea50d66737922d0edfaaf07449576ece7f8c", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "nur": { "locked": { - "lastModified": 1620161416, - "narHash": "sha256-GoKpxMWJrBMkVTvoKfRFedu7K+wUrbZUuMqTearjiu8=", + "lastModified": 1620844966, + "narHash": "sha256-CrTFpHOp71NUbv9tKmVZ5idgEbleMK7XoIQv3bcvBmE=", "owner": "nix-community", "repo": "NUR", - "rev": "ead34572175dc6de3b96b7ad6996315f84bede90", + "rev": "258c685d1e2796855524427ccf6f0a65461443e4", "type": "github" }, "original": { @@ -126,13 +126,18 @@ "ranz2nix": "ranz2nix" }, "locked": { - "narHash": "sha256-zRvlPfGChGfnrVjWuQ3D2w4iLJTbVttVIvt6BJpzwUw=", - "path": "photoprism-flake", - "type": "path" + "lastModified": 1617552772, + "narHash": "sha256-qwx9FXWyVctsQ71at/SMuQqWLqb8PsWO70rGhl89ISc=", + "owner": "felschr", + "repo": "photoprism-flake", + "rev": "506288386361021db9b8b0c878ffe317bcc8a11c", + "type": "github" }, "original": { - "path": "photoprism-flake", - "type": "path" + "owner": "felschr", + "ref": "multi-arch", + "repo": "photoprism-flake", + "type": "github" } }, "pre-commit-hooks": {