maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Bump zeus to unstable

Browse source
This commit is contained in:
Malte Brandy 2021-11-26 04:02:41 +01:00
parent 99aefed112
commit bfdea09779
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
8 changed files with 39 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
channels.nix
View file

@ -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;
}

1
home-manager/roles/gnome.nix
View file

@ -130,6 +130,7 @@ in
};
"org/gnome/shell" = {
disable-extension-version-validation = true;
disable-user-extensions = false;
enabled-extensions = [
"gTile@vibou"

24
nix/sources.json
View file

@ -29,6 +29,18 @@
"url": "https://github.com/nix-community/home-manager/archive/bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.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/<owner>/<repo>/archive/<rev>.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/<owner>/<repo>/archive/<rev>.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/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixos-hardware": {
"branch": "master",
"description": "A collection of NixOS modules covering hardware quirks.",

11
nixos/machines/apollo/configuration.nix
View file

@ -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;

22
nixos/machines/zeus/configuration.nix
View file

@ -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;

17
overlays/gnome-shell/default.nix
View file

@ -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;
}
)
];
}
);
}
);
}

153
overlays/gnome-shell/gnome-shell_3.38.3-3ubuntu1_3.38.3-3ubuntu2.patch
View file

@ -1,153 +0,0 @@
--- /dev/null
+++ gnome-shell-3.38.3/data/com.ubuntu.login-screen.gschema.xml.in
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <enum id="com.ubuntu.login-screen.BackgroundRepeat">
+ <value value="1" nick="default"/>
+ <value value="2" nick="repeat"/>
+ <value value="3" nick="repeat-x"/>
+ <value value="4" nick="repeat-y"/>
+ <value value="5" nick="no-repeat"/>
+ <value value="6" nick="space"/>
+ <value value="7" nick="round"/>
+ </enum>
+ <enum id="com.ubuntu.login-screen.BackgroundSize">
+ <value value="1" nick="default"/>
+ <value value="2" nick="auto"/>
+ <value value="3" nick="cover"/>
+ <value value="4" nick="contain"/>
+ </enum>
+ <schema id="com.ubuntu.login-screen" path="/com/ubuntu/login-screen/">
+ <key name="background-picture-uri" type="s">
+ <default>''</default>
+ <summary>
+ Sets the background image for the login screen.
+ </summary>
+ <description>
+ 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.
+ </description>
+ </key>
+ <key name="background-color" type="s">
+ <default>''</default>
+ <summary>
+ The background-color property sets the background color.
+ </summary>
+ <description>
+ 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.
+ </description>
+ </key>
+ <key name="background-repeat" enum="com.ubuntu.login-screen.BackgroundRepeat">
+ <default>'default'</default>
+ <summary>
+ The background-repeat property sets if/how the background image will be repeated.
+ </summary>
+ <description>
+ 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.
+ </description>
+ </key>
+ <key name="background-size" enum="com.ubuntu.login-screen.BackgroundSize">
+ <default>'default'</default>
+ <summary>
+ The background-size property specifies the size of the background image.
+ </summary>
+ <description>
+ 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.
+ </description>
+ </key>
+ </schema>
+</schemalist>
--- 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);

2
overlays/pkgSets.nix
View file

@ -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'"
'';
});