From 26c427d416e20c0ab2827a0651e42004a8361d70 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Mon, 1 Jul 2024 20:16:34 +0100 Subject: [PATCH] Add KvLibadwaita theme to GNOME --- flake.lock | 17 +++++++++++++++++ flake.nix | 6 +++++- modules/desktop/gnome.nix | 18 +++++++++++++++++- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 56619c8..86f9f39 100644 --- a/flake.lock +++ b/flake.lock @@ -368,6 +368,22 @@ "type": "github" } }, + "kvlibadwaita": { + "flake": false, + "locked": { + "lastModified": 1710621848, + "narHash": "sha256-xBl6zmpqTAH5MIT5iNAdW6kdOcB5MY0Dtrb95hdYpwA=", + "owner": "GabePoel", + "repo": "KvLibadwaita", + "rev": "87c1ef9f44ec48855fd09ddab041007277e30e37", + "type": "github" + }, + "original": { + "owner": "GabePoel", + "repo": "KvLibadwaita", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -565,6 +581,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "gitea-github-theme": "gitea-github-theme", "home-manager": "home-manager_2", + "kvlibadwaita": "kvlibadwaita", "nixos-hardware": "nixos-hardware", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs_3", diff --git a/flake.nix b/flake.nix index 89061c0..b9bdfc7 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,10 @@ url = "git+ssh://git@git.vimium.com/jordan/gitea-github-theme.git?ref=main"; flake = false; }; + kvlibadwaita = { + url = "github:GabePoel/KvLibadwaita"; + flake = false; + }; nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; @@ -47,7 +51,7 @@ }; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, agenix, deploy-rs, disko, home-manager, nixos-hardware, nixos-mailserver, secrets, ... }: + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, agenix, deploy-rs, disko, home-manager, nixos-hardware, nixos-mailserver, ... }: let mkPkgsForSystem = system: inputs.nixpkgs; overlays = [ diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix index 4f93ad9..bf4f47a 100644 --- a/modules/desktop/gnome.nix +++ b/modules/desktop/gnome.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, inputs, lib, pkgs, ... }: let cfg = config.modules.desktop.gnome; in { @@ -164,6 +164,18 @@ in { }; }; + environment.sessionVariables = { + QT_STYLE_OVERRIDE = lib.mkForce "kvantum"; + QT_WAYLAND_DECORATION = lib.mkForce "adwaita"; + }; + + home.configFile = { + "Kvantum/kvantum.kvconfig".text = lib.generators.toINI {} { + General.theme = "KvLibadwaitaDark"; + }; + "Kvantum/KvLibadwaita".source = "${inputs.kvlibadwaita}/src/KvLibadwaita"; + }; + user.packages = with pkgs; [ authenticator # bottles @@ -219,7 +231,11 @@ in { # gnomeExtensions.window-is-ready-remover # gnomeExtensions.worksets # gnomeExtensions.workspace-matrix + unstable.kdePackages.qtstyleplugin-kvantum + unstable.libsForQt5.qtstyleplugin-kvantum unstable.morewaita-icon-theme + unstable.qadwaitadecorations + unstable.qadwaitadecorations-qt6 ] ++ (if config.virtualisation.podman.enable then [ pods ] else []);