From e8f8d8c5cfde80d6b2cfba16ee73e906830d3f91 Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Sun, 5 Jan 2025 15:39:39 +0100 Subject: [PATCH] Configure mutter experimental features via HM --- nixos-configurations/laptop/default.nix | 9 ++------- nixos-configurations/pc/default.nix | 4 ++-- nixos-configurations/shared-desktop.nix | 25 ++++++++++--------------- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/nixos-configurations/laptop/default.nix b/nixos-configurations/laptop/default.nix index 6fc5ea8..b6b5368 100644 --- a/nixos-configurations/laptop/default.nix +++ b/nixos-configurations/laptop/default.nix @@ -18,18 +18,13 @@ }; }; - services.mysql = { - enable = true; - package = pkgs.mariadb; - }; - home-manager.users.thiloho = { pkgs, ... }: { programs.git.signing.key = "3B62137A89493F7D"; home = { - stateVersion = "23.05"; + stateVersion = "24.11"; }; }; - system.stateVersion = "23.05"; + system.stateVersion = "24.11"; } diff --git a/nixos-configurations/pc/default.nix b/nixos-configurations/pc/default.nix index e934154..5746e19 100644 --- a/nixos-configurations/pc/default.nix +++ b/nixos-configurations/pc/default.nix @@ -81,8 +81,8 @@ packages = with pkgs; [ inkscape ]; - stateVersion = "23.05"; + stateVersion = "24.11"; }; }; - system.stateVersion = "23.05"; + system.stateVersion = "24.11"; } diff --git a/nixos-configurations/shared-desktop.nix b/nixos-configurations/shared-desktop.nix index 1047215..d5a032b 100644 --- a/nixos-configurations/shared-desktop.nix +++ b/nixos-configurations/shared-desktop.nix @@ -13,12 +13,6 @@ displayManager.gdm.enable = true; desktopManager.gnome = { enable = true; - extraGSettingsOverridePackages = [ pkgs.mutter ]; - # fractional scaling support - extraGSettingsOverrides = '' - [org.gnome.mutter] - experimental-features=['scale-monitor-framebuffer', 'variable-refresh-rate'] - ''; }; excludePackages = [ pkgs.xterm ]; }; @@ -35,15 +29,6 @@ enable = true; package = pkgs.mullvad-vpn; }; - postgresql = { - enable = true; - package = pkgs.postgresql_15; - authentication = lib.mkForce '' - local all all trust - host all all 0.0.0.0/0 scram-sha-256 - host all all ::1/128 scram-sha-256 - ''; - }; }; environment.gnome.excludePackages = with pkgs; [ @@ -83,6 +68,7 @@ }; programs = { + dconf.enable = true; steam.enable = true; gnupg.agent = { enable = true; @@ -110,6 +96,15 @@ ... }: { + dconf.settings = { + "org/gnome/mutter" = { + experimental-features = [ + "scale-monitor-framebuffer" + "variable-refresh-rate" + "xwayland-native-scaling" + ]; + }; + }; programs = { yt-dlp = { enable = true;