diff options
| -rw-r--r-- | machines/devhell/hildr.nix | 4 | ||||
| -rw-r--r-- | machines/profpatsch/shiki.nix | 6 | ||||
| -rw-r--r-- | machines/sternenseemann/wolfgang.nix | 2 | ||||
| -rw-r--r-- | modules/core/tests.nix | 6 | ||||
| -rw-r--r-- | modules/user/aszlig/profiles/managed.nix | 2 | ||||
| -rw-r--r-- | modules/user/devhell/profiles/packages.nix | 4 | ||||
| -rw-r--r-- | modules/user/openlab/labtops.nix | 2 | ||||
| -rw-r--r-- | modules/user/profpatsch/services/dunst.nix | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/machines/devhell/hildr.nix b/machines/devhell/hildr.nix index 7ea5fd36..1a547b68 100644 --- a/machines/devhell/hildr.nix +++ b/machines/devhell/hildr.nix @@ -47,7 +47,7 @@ fsType = "vfat"; }; - swapDevices = [ + swapDevices = [ { device = "/dev/disk/by-uuid/ff725995-b9a1-453f-9e6d-ba9bd6579db6"; } ]; @@ -98,7 +98,7 @@ services = { thermald.enable = true; tftpd.enable = false; - gnome3.gnome-keyring.enable = true; + gnome.gnome-keyring.enable = true; printing = { enable = true; drivers = [ pkgs.foo2zjs pkgs.cups-brother-hl1110 ]; diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix index d24ce77e..9b5508c9 100644 --- a/machines/profpatsch/shiki.nix +++ b/machines/profpatsch/shiki.nix @@ -173,9 +173,9 @@ in { xorg.xkill # X11 application kill ]; guiPkgs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme # TODO: get themes to work. See notes.org. - gnome3.gnome_themes_standard + gnome.gnome_themes_standard pavucontrol ]; programmingTools = [ @@ -404,7 +404,7 @@ in { }; }; iconTheme = { - package = pkgs.gnome3.adwaita-icon-theme; + package = pkgs.gnome.adwaita-icon-theme; name = "Adwaita"; }; }; diff --git a/machines/sternenseemann/wolfgang.nix b/machines/sternenseemann/wolfgang.nix index b5e9efc7..8ba0d299 100644 --- a/machines/sternenseemann/wolfgang.nix +++ b/machines/sternenseemann/wolfgang.nix @@ -81,7 +81,7 @@ in { xdg_utils # xdg-open etc. networkmanagerapplet # for nm-connection-ediotr imv zathura - gnome3.nautilus + gnome.nautilus browser.pkg nix-output-monitor # TODO(sterni) depot.users.sterni.clhs-lookup diff --git a/modules/core/tests.nix b/modules/core/tests.nix index 68d64ab3..a04c7f3c 100644 --- a/modules/core/tests.nix +++ b/modules/core/tests.nix @@ -99,8 +99,8 @@ let { check = config.services.cloud-init.enable; path = ["nixos" "cloud-init"]; } - { check = config.services.codimd.enable; - path = ["nixos" "codimd"]; + { check = config.services.hedgedoc.enable; + path = ["nixos" "hedgedoc"]; } { check = config.services.consul.enable; path = ["nixos" "consul"]; @@ -240,7 +240,7 @@ let { check = config.services.glusterfs.enable; path = ["nixos" "glusterfs"]; } - { check = config.services.xserver.desktopManager.gnome3.enable; + { check = config.services.xserver.desktopManager.gnome.enable; path = ["nixos" "installed-tests"]; } { check = config.services.gocd-agent.enable; diff --git a/modules/user/aszlig/profiles/managed.nix b/modules/user/aszlig/profiles/managed.nix index 5f240778..3c2fe029 100644 --- a/modules/user/aszlig/profiles/managed.nix +++ b/modules/user/aszlig/profiles/managed.nix @@ -54,7 +54,7 @@ in { unfreeAndNonDistributablePkgs.skype ]; - i18n.consoleUseXkbConfig = true; + console.useXkbConfig = true; # Printing for the most common printers among the managed machines. services.printing.enable = true; diff --git a/modules/user/devhell/profiles/packages.nix b/modules/user/devhell/profiles/packages.nix index 1132f48b..2e456be6 100644 --- a/modules/user/devhell/profiles/packages.nix +++ b/modules/user/devhell/profiles/packages.nix @@ -127,8 +127,8 @@ in { gitinspector gitui glow - gnome3.adwaita-icon-theme - gnome3.defaultIconTheme + gnome.adwaita-icon-theme + gnome.defaultIconTheme gnufdisk gnumake gnupg diff --git a/modules/user/openlab/labtops.nix b/modules/user/openlab/labtops.nix index 14aaff05..340a23e9 100644 --- a/modules/user/openlab/labtops.nix +++ b/modules/user/openlab/labtops.nix @@ -32,7 +32,7 @@ in baseGUI = [ filezilla chromium - gnome3.gedit + gnome.gedit gmpc libreoffice vlc diff --git a/modules/user/profpatsch/services/dunst.nix b/modules/user/profpatsch/services/dunst.nix index 53758f20..55bc315b 100644 --- a/modules/user/profpatsch/services/dunst.nix +++ b/modules/user/profpatsch/services/dunst.nix @@ -26,7 +26,7 @@ let options = { package = lib.mkOption { type = lib.types.package; - example = lib.literalExample "pkgs.gnome3.adwaita-icon-theme"; + example = lib.literalExample "pkgs.gnome.adwaita-icon-theme"; description = "Package providing the theme."; }; |