drop gnome modules (#66)
Some checks are pending
flakehub / flakehub-publish (push) Waiting to run
git-mirror / gitlab-sync (push) Waiting to run
nix-build / default-build (push) Waiting to run
nix-build / fallarbor-build (push) Waiting to run
nix-build / lavaridge-build (push) Waiting to run
nix-build / mauville-build (push) Waiting to run
nix-build / petalburg-build (push) Waiting to run
nix-build / rustboro-build (push) Waiting to run
nix-check / fmt-check (push) Waiting to run
nix-check / eval-check (push) Waiting to run

* home/gnome: remove module

* home/gnome: remove option

* nixos/gnome: remove module

* nixos/gnome: remove option

* gnome: remove option references

* gnome: don't import nonexisting modules
This commit is contained in:
Aly Raffauf 2024-07-28 15:56:41 -04:00 committed by GitHub
parent f3bb8a906d
commit 59ba881046
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 4 additions and 178 deletions

View file

@ -8,8 +8,7 @@
programs.firefox = {
enable = true;
nativeMessagingHosts =
lib.optionals (config.ar.home.apps.keepassxc.enable) [pkgs.keepassxc]
++ lib.optionals (config.ar.home.desktop.gnome.enable) [pkgs.gnome-browser-connector];
lib.optional (config.ar.home.apps.keepassxc.enable) pkgs.keepassxc;
};
};
}

View file

@ -50,10 +50,7 @@
"terminal.integrated.fontSize" = lib.mkDefault 14;
"update.mode" = "none";
"window.menuBarVisibility" = "hidden";
"window.titleBarStyle" =
if config.ar.home.desktop.gnome.enable
then "custom"
else "native";
"window.titleBarStyle" = lib.mkDefault "native";
"window.zoomPerWindow" = false;
"workbench.colorTheme" =
if config.ar.home.theme.darkMode

View file

@ -5,7 +5,6 @@
...
}: {
imports = [
./gnome
./hyprland
./sway
./wayland
@ -13,8 +12,7 @@
config =
lib.mkIf (
config.ar.home.desktop.gnome.enable
|| config.ar.home.desktop.hyprland.enable
config.ar.home.desktop.hyprland.enable
|| config.ar.home.desktop.sway.enable
) {
dconf = {

View file

@ -1,92 +0,0 @@
{
config,
lib,
pkgs,
...
}: {
config = lib.mkIf config.ar.home.desktop.gnome.enable {
dconf = {
enable = true;
settings = {
"org/gnome/desktop/datetime".automatic-timezone = true;
"org/gnome/desktop/interface" = {
clock-format = "12h";
enable-hot-corners = true;
};
"org/gnome/desktop/peripherals/touchpad".tap-to-click = true;
"org/gnome/desktop/search-providers".enabled = "['org.gnome.Calendar.desktop', 'org.gnome.Weather.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calculator.desktop', 'org.gnome.Characters.desktop', 'org.gnome.clocks.desktop']";
"org/gnome/desktop/wm/preferences".auto-raise = true;
"org/gnome/mutter" = {
dynamic-workspaces = true;
edge-tiling = true;
workspaces-only-on-primary = true;
};
"org/gnome/shell".enabled-extensions = [
"appindicatorsupport@rgcjonas.gmail.com"
"blur-my-shell@aunetx"
"gsconnect@andyholmes.github.io"
"nightthemeswitcher@romainvigier.fr"
"noannoyance-fork@vrba.dev"
"tailscale-status@maxgallup.github.com"
"tiling-assistant@leleat-on-github"
"drive-menu@gnome-shell-extensions.gcampax.github.com"
];
"org/gnome/shell/extensions/blur-my-shell/overview".style-components = 3;
"org/gnome/shell/extensions/blur-my-shell/panel" = {
blur = false;
customize = true;
override-background = false;
override-background-dynamically = false;
style-panel = 0;
unblur-in-overview = true;
};
"org/gnome/system/location".enabled = true;
};
};
home.packages = [
(pkgs.writeShellScriptBin "gcs-toggle" ''
# Get current color scheme
color_scheme=$(${lib.getExe' pkgs.glib "gsettings"} get org.gnome.desktop.interface color-scheme)
# Toggle between light and dark color schemes
if [ "$color_scheme" == "'default'" ] || [ "$color_scheme" == "'prefer-light'" ]; then
color_scheme="'prefer-dark'"
else
color_scheme="'prefer-light'"
fi
# Apply the updated color scheme
${lib.getExe' pkgs.glib "gsettings"} set org.gnome.desktop.interface color-scheme $color_scheme
'')
];
programs.gnome-shell = {
enable = true;
extensions = [
{package = pkgs.gnomeExtensions.appindicator;}
{package = pkgs.gnomeExtensions.blur-my-shell;}
{package = pkgs.gnomeExtensions.gsconnect;}
{package = pkgs.gnomeExtensions.light-shell;}
{package = pkgs.gnomeExtensions.night-theme-switcher;}
{package = pkgs.gnomeExtensions.noannoyance-fork;}
{package = pkgs.gnomeExtensions.tailscale-status;}
{package = pkgs.gnomeExtensions.tiling-assistant;}
];
};
xdg.mimeApps.defaultApplications = {
"x-scheme-handler/sms" = "org.gnome.Shell.Extensions.GSConnect.desktop";
"x-scheme-handler/tel" = "org.gnome.Shell.Extensions.GSConnect.desktop";
};
};
}

View file

@ -107,12 +107,6 @@ in {
};
desktop = {
gnome.enable = lib.mkOption {
description = "GNOME with sane defaults.";
default = osConfig.ar.desktop.gnome.enable;
type = lib.types.bool;
};
hyprland = {
enable = lib.mkOption {
description = "Hyprland with full desktop session components.";

View file

@ -5,7 +5,6 @@
...
}: {
imports = [
./gnome
./greetd
./hyprland
./sway
@ -14,8 +13,7 @@
config =
lib.mkIf (
config.ar.desktop.gnome.enable
|| config.ar.desktop.hyprland.enable
config.ar.desktop.hyprland.enable
|| config.ar.desktop.steam.enable
|| config.ar.desktop.sway.enable
) {

View file

@ -1,66 +0,0 @@
{
config,
lib,
pkgs,
...
}: {
config = lib.mkIf config.ar.desktop.gnome.enable {
nixpkgs.overlays = [
# GNOME 46: triple-buffering-v4-46
(final: prev: {
gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: {
mutter = gnomePrev.mutter.overrideAttrs (old: {
src = pkgs.fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "vanvugt";
repo = "mutter";
rev = "triple-buffering-v4-46";
hash = "sha256-nz1Enw1NjxLEF3JUG0qknJgf4328W/VvdMjJmoOEMYs=";
};
});
});
})
];
security.pam.services = {
login.fprintAuth = false;
gdm = {
enableGnomeKeyring = true;
gnupg.enable = true;
kwallet.enable = true;
};
gdm-fingerprint = lib.mkIf (config.services.fprintd.enable) {
text = ''
auth required pam_shells.so
auth requisite pam_nologin.so
auth requisite pam_faillock.so preauth
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth optional pam_permit.so
auth required pam_env.so
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so
account include login
password required pam_deny.so
session include login
session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';
};
};
# Enable GNOME and GDM.
services = {
gnome.tracker-miners.enable = true;
udev.packages = with pkgs; [gnome.gnome-settings-daemon];
xserver = {
desktopManager.gnome.enable = true;
displayManager.gdm.enable = true;
};
};
};
}

View file

@ -13,8 +13,6 @@
};
desktop = {
gnome.enable = lib.mkEnableOption "GNOME desktop session.";
greetd = {
enable = lib.mkEnableOption "Greetd display manager.";