From bfdea09779715078c6b667c9c514505160bdf9f4 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 26 Nov 2021 04:02:41 +0100 Subject: [PATCH] Bump zeus to unstable --- channels.nix | 6 +- home-manager/roles/gnome.nix | 1 + nix/sources.json | 24 +++ nixos/machines/apollo/configuration.nix | 11 +- nixos/machines/zeus/configuration.nix | 22 +-- overlays/gnome-shell/default.nix | 17 -- ...hell_3.38.3-3ubuntu1_3.38.3-3ubuntu2.patch | 153 ------------------ overlays/pkgSets.nix | 2 +- 8 files changed, 39 insertions(+), 197 deletions(-) delete mode 100644 overlays/gnome-shell/default.nix delete mode 100644 overlays/gnome-shell/gnome-shell_3.38.3-3ubuntu1_3.38.3-3ubuntu2.patch diff --git a/channels.nix b/channels.nix index f6c12233..201a3140 100644 --- a/channels.nix +++ b/channels.nix @@ -3,6 +3,10 @@ let nixpkgs-channel = "nixos-21.05"; home-manager-channel = "home-manager-21.05"; }; + nixos-21-11 = { + nixpkgs-channel = "nixos-unstable"; + home-manager-channel = "home-manager-21.11"; + }; unstable = { nixpkgs-channel = "nixos-unstable"; home-manager-channel = "home-manager-master"; @@ -11,6 +15,6 @@ in rec { hera = nixos-21-05; apollo = nixos-21-05; - zeus = nixos-21-05; + zeus = nixos-21-11; chor-cloud = hera; } diff --git a/home-manager/roles/gnome.nix b/home-manager/roles/gnome.nix index e0bb5aa4..50378a5d 100644 --- a/home-manager/roles/gnome.nix +++ b/home-manager/roles/gnome.nix @@ -130,6 +130,7 @@ in }; "org/gnome/shell" = { + disable-extension-version-validation = true; disable-user-extensions = false; enabled-extensions = [ "gTile@vibou" diff --git a/nix/sources.json b/nix/sources.json index afbebe5d..cd982a57 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -29,6 +29,18 @@ "url": "https://github.com/nix-community/home-manager/archive/bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "home-manager-21.11": { + "branch": "release-21.11", + "description": "Manage a user environment using Nix", + "homepage": "", + "owner": "nix-community", + "repo": "home-manager", + "rev": "bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1", + "sha256": "0nznlb2xgkvdav6d4qls2w81m3p3h4hdbwbp2nwqkiszkp7j1bln", + "type": "tarball", + "url": "https://github.com/nix-community/home-manager/archive/bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "kassandra": { "branch": "main", "ref": "main", @@ -74,6 +86,18 @@ "url": "https://github.com/NixOS/nixpkgs/archive/91e6a9a6568f751bb10222a937507e7e151a035e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "nixos-21.11": { + "branch": "nixos-21.11", + "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", + "homepage": null, + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de", + "sha256": "0f06zcc8mh934fya0hwzklmga238yxiyfp183y48vyzkdsg7xgn0", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "nixos-hardware": { "branch": "master", "description": "A collection of NixOS modules covering hardware quirks.", diff --git a/nixos/machines/apollo/configuration.nix b/nixos/machines/apollo/configuration.nix index efe12830..503ca3ba 100644 --- a/nixos/machines/apollo/configuration.nix +++ b/nixos/machines/apollo/configuration.nix @@ -132,16 +132,7 @@ in }; gdm.enable = true; }; - desktopManager.gnome = { - enable = true; - extraGSettingsOverrides = '' - [com.ubuntu.login-screen] - background-repeat='no-repeat' - background-size='cover' - background-color='#0000ee' - background-picture-uri='file:///home/maralorn/media/images/wallpapers/orga/gdm.jpg' - ''; - }; + desktopManager.gnome.enable = true; }; gnome = { evolution-data-server.enable = lib.mkForce false; diff --git a/nixos/machines/zeus/configuration.nix b/nixos/machines/zeus/configuration.nix index 6aec23ef..c1cd3e68 100644 --- a/nixos/machines/zeus/configuration.nix +++ b/nixos/machines/zeus/configuration.nix @@ -41,8 +41,6 @@ in machine-id.source = "/disk/persist/machine-id"; }; - boot.kernelPackages = pkgs.linuxPackages_testing; - systemd.services."activate-home-manager" = { path = [ pkgs.nix pkgs.dbus ]; script = '' @@ -70,9 +68,11 @@ in "d /home/maralorn/.config 700 maralorn users - -" "Z /home/maralorn - maralorn users - -" "d /disk/volatile/maralorn 700 maralorn users - -" - "d /disk/persist/var/lib/bluetooth - - - - -" + "d /disk/persist/var/lib/bluetooth 770 root users - -" + "d /disk/persist/var/lib/waydroid - - - - -" "d /tmp/scans/scans 777 ftp ftp - -" "L+ /var/lib/bluetooth - - - - /disk/persist/var/lib/bluetooth" + "L+ /var/lib/waydroid - - - - /disk/persist/var/lib/waydroid" "L+ /root/.ssh - - - - /disk/persist/root/.ssh" ]; @@ -147,6 +147,8 @@ in }; security.rtkit.enable = true; + boot.kernelPackages = pkgs.linuxPackages_xanmod; + virtualisation.waydroid.enable = true; services = { #teamviewer.enable = true; pipewire.enable = lib.mkForce false; @@ -194,8 +196,7 @@ in user = "maralorn"; openDefaultPorts = true; configDir = "/disk/persist/syncthing"; - declarative = syncthing.declarativeWith [ "hera" "apollo" ] "/disk/persist/maralorn/media"; - }; + } // syncthing.declarativeWith [ "hera" "apollo" ] "/disk/persist/maralorn/media"; xserver = { enable = true; displayManager = { @@ -205,16 +206,7 @@ in }; gdm.enable = true; }; - desktopManager.gnome = { - enable = true; - extraGSettingsOverrides = '' - [com.ubuntu.login-screen] - background-repeat='no-repeat' - background-size='cover' - background-color='#443388' - background-picture-uri='file:///disk/volatile/gdm.jpg' - ''; - }; + desktopManager.gnome.enable = true; }; gnome = { evolution-data-server.enable = lib.mkForce false; diff --git a/overlays/gnome-shell/default.nix b/overlays/gnome-shell/default.nix deleted file mode 100644 index c06a0d68..00000000 --- a/overlays/gnome-shell/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -self: super: { - gnome = super.gnome.overrideScope' ( - selfg: superg: { - gnome-shell = superg.gnome-shell.overrideAttrs ( - old: { - patches = (old.patches or [ ]) ++ [ - ( - self.substituteAll { - src = ./gnome-shell_3.38.3-3ubuntu1_3.38.3-3ubuntu2.patch; - } - ) - ]; - } - ); - } - ); -} diff --git a/overlays/gnome-shell/gnome-shell_3.38.3-3ubuntu1_3.38.3-3ubuntu2.patch b/overlays/gnome-shell/gnome-shell_3.38.3-3ubuntu1_3.38.3-3ubuntu2.patch deleted file mode 100644 index cdb2b98c..00000000 --- a/overlays/gnome-shell/gnome-shell_3.38.3-3ubuntu1_3.38.3-3ubuntu2.patch +++ /dev/null @@ -1,153 +0,0 @@ ---- /dev/null -+++ gnome-shell-3.38.3/data/com.ubuntu.login-screen.gschema.xml.in -@@ -0,0 +1,70 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ '' -+ -+ Sets the background image for the login screen. -+ -+ -+ URI to use for the background image. Note that the backend only -+ supports local (file://) URIs. -+ It overrides the value defined in the default style sheet. -+ -+ -+ -+ '' -+ -+ The background-color property sets the background color. -+ -+ -+ The background-color property sets the background color to use when -+ the background picture URI is missing or when it doesn't cover the whole background. -+ It overrides the value defined in the default style sheet. -+ -+ -+ -+ 'default' -+ -+ The background-repeat property sets if/how the background image will be repeated. -+ -+ -+ The background-repeat property sets if/how a background image will be repeated. -+ By default, a background-image is repeated both vertically and horizontally. -+ -+ It overrides the value defined in the default style sheet. -+ -+ -+ -+ 'default' -+ -+ The background-size property specifies the size of the background image. -+ -+ -+ The background-size property specifies the size of the background images. -+ -+ There are three keywords you can use with this property: -+ auto: The background image is displayed in its original size; -+ cover: Resize the background image to cover the entire container, even if it has to stretch the image or cut a little bit off one of the edges; -+ contain: Resize the background image to make sure the image is fully visible. -+ -+ It overrides the value defined in the default style sheet. -+ -+ -+ -+ ---- gnome-shell-3.38.3.orig/data/meson.build -+++ gnome-shell-3.38.3/data/meson.build -@@ -85,6 +85,12 @@ schema = configure_file( - configuration: schemaconf, - install_dir: schemadir - ) -+schemaubuntu = configure_file( -+ input: 'com.ubuntu.login-screen.gschema.xml.in', -+ output: 'com.ubuntu.login-screen.gschema.xml', -+ configuration: schemaconf, -+ install_dir: schemadir -+) - install_data('00_org.gnome.shell.gschema.override', install_dir: schemadir) - - overrides_migration_conf = configuration_data() -@@ -122,7 +128,7 @@ endif - - # for unit tests - gnome.compile_schemas() only looks in srcdir - custom_target('compile-schemas', -- input: schema, -+ input: [schema, schemaubuntu], - output: 'gschemas.compiled', - command: [find_program('glib-compile-schemas'), meson.current_build_dir()], - build_by_default: true) ---- gnome-shell-3.38.3.orig/js/ui/screenShield.js -+++ gnome-shell-3.38.3/js/ui/screenShield.js -@@ -26,6 +26,12 @@ const DISABLE_LOCK_KEY = 'disable-lock-s - - const LOCKED_STATE_STR = 'screenShield.locked'; - -+const LOGINSCREEN_SCHEMA = 'com.ubuntu.login-screen'; -+const LOGINSCREEN_BACKGROUND_COLOR_KEY = 'background-color'; -+const LOGINSCREEN_BACKGROUND_PICTURE_URI_KEY = 'background-picture-uri'; -+const LOGINSCREEN_BACKGROUND_REPEAT_KEY = 'background-repeat'; -+const LOGINSCREEN_BACKGROUND_SIZE_KEY = 'background-size'; -+ - // ScreenShield animation time - // - STANDARD_FADE_TIME is used when the session goes idle - // - MANUAL_FADE_TIME is used for lowering the shield when asked by the user, -@@ -119,6 +125,13 @@ var ScreenShield = class { - this._lockSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA }); - this._lockSettings.connect('changed::%s'.format(DISABLE_LOCK_KEY), this._syncInhibitor.bind(this)); - -+ this._loginscreenSettings = new Gio.Settings({ schema_id: LOGINSCREEN_SCHEMA }); -+ this._loginscreenSettings.connect('changed::%s'.format(LOGINSCREEN_BACKGROUND_COLOR_KEY), this._refreshBackground.bind(this)); -+ this._loginscreenSettings.connect('changed::%s'.format(LOGINSCREEN_BACKGROUND_PICTURE_URI_KEY), this._refreshBackground.bind(this)); -+ this._loginscreenSettings.connect('changed::%s'.format(LOGINSCREEN_BACKGROUND_REPEAT_KEY), this._refreshBackground.bind(this)); -+ this._loginscreenSettings.connect('changed::%s'.format(LOGINSCREEN_BACKGROUND_SIZE_KEY), this._refreshBackground.bind(this)); -+ this._refreshBackground() -+ - this._isModal = false; - this._isGreeter = false; - this._isActive = false; -@@ -196,6 +209,26 @@ var ScreenShield = class { - return this._isModal; - } - -+ _refreshBackground() { -+ let inline_style = []; -+ -+ let backgroundColor = this._loginscreenSettings.get_string(LOGINSCREEN_BACKGROUND_COLOR_KEY); -+ let backgroundPictureUri = this._loginscreenSettings.get_string(LOGINSCREEN_BACKGROUND_PICTURE_URI_KEY); -+ let backgroundRepeat = this._loginscreenSettings.get_string(LOGINSCREEN_BACKGROUND_REPEAT_KEY); -+ let backgroundSize = this._loginscreenSettings.get_string(LOGINSCREEN_BACKGROUND_SIZE_KEY); -+ -+ if (backgroundColor != "") -+ inline_style.push("background-color: " + backgroundColor); -+ if (backgroundPictureUri != "") -+ inline_style.push("background-image: url(" + backgroundPictureUri + ")"); -+ if (backgroundRepeat != "default") -+ inline_style.push("background-repeat: " + backgroundRepeat); -+ if (backgroundSize != "default") -+ inline_style.push("background-size: " + backgroundSize); -+ -+ this._lockDialogGroup.set_style(inline_style.join('; ')); -+ } -+ - _syncInhibitor() { - let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY) || - this._settings.get_boolean(SUSPEND_LOCK_ENABLED_KEY); diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix index 2e106e27..9ab64cb1 100644 --- a/overlays/pkgSets.nix +++ b/overlays/pkgSets.nix @@ -46,7 +46,7 @@ self: super: { caffeine dash-to-panel ; executor = self.gnomeExtensions.executor.overrideAttrs (old: { - buildCommand = old.buildCommand + '' + postInstall = (old.postInstall or "") + '' substituteInPlace $out/share/gnome-shell/extensions/executor@raujonas.github.io/extension.js --replace "'/bin/bash'" "'bash'" ''; });