From e08b57898a9697e3a0f195daeb3f813c33bb77b4 Mon Sep 17 00:00:00 2001 From: "Agatha V. Lovelace" Date: Wed, 25 Oct 2023 13:34:55 +0200 Subject: [PATCH] Visual tweaks --- common/fragments/graphical/bspwm.nix | 1 - common/fragments/graphical/default.nix | 6 +++++- common/fragments/graphical/picom.nix | 9 ++++++++- common/fragments/graphical/spotify.nix | 2 +- common/fragments/graphical/theme.nix | 10 ++++++++-- flake.lock | 24 ++++++++++++------------ 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/common/fragments/graphical/bspwm.nix b/common/fragments/graphical/bspwm.nix index d105998..c2004f6 100644 --- a/common/fragments/graphical/bspwm.nix +++ b/common/fragments/graphical/bspwm.nix @@ -48,7 +48,6 @@ follow = true; }; "Yubico Authenticator".state = "floating"; - "firefox:Places".state = "floating"; }; }; diff --git a/common/fragments/graphical/default.nix b/common/fragments/graphical/default.nix index e4167e5..4f34421 100644 --- a/common/fragments/graphical/default.nix +++ b/common/fragments/graphical/default.nix @@ -51,7 +51,6 @@ gnome.nautilus gnome.totem hyperfine - lxappearance magic-wormhole neofetch nil @@ -137,6 +136,11 @@ : "/html " ''; + # Fix for apps that expect fonts in the usual location + home.file.".local/share/fonts".source = + config.home-manager.users.agatha.lib.file.mkOutOfStoreSymlink + "/run/current-system/sw/share/X11/fonts"; + programs.direnv.enable = true; home.sessionVariables = { "DIRENV_LOG_FORMAT" = ""; }; diff --git a/common/fragments/graphical/picom.nix b/common/fragments/graphical/picom.nix index 8edb0a1..cd62346 100644 --- a/common/fragments/graphical/picom.nix +++ b/common/fragments/graphical/picom.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: { +{ pkgs, ... }: { home-manager.users.agatha = { services.picom = { enable = true; @@ -43,6 +43,8 @@ "class_g = 'firefox-nightly' && argb" "class_g = 'firefox' && argb" "_GTK_FRAME_EXTENTS@:c" + "_NET_FRAME_EXTENTS@:c && WM_WINDOW_ROLE@:s = 'Popup'" + "override_redirect = true" ]; # Fade @@ -79,9 +81,14 @@ background-exclude = [ "window_type = 'dock'" "window_type = 'desktop'" + "window_type = 'dropdown_menu'" + "window_type = 'popup_menu'" + "window_type = 'tooltip'" "_GTK_FRAME_EXTENTS@:c" + "_NET_FRAME_EXTENTS@:c && WM_WINDOW_ROLE@:s = 'Popup'" "class_g = 'firefox-nightly' && argb" "class_g = 'firefox' && argb" + "override_redirect = true" ]; }; }; diff --git a/common/fragments/graphical/spotify.nix b/common/fragments/graphical/spotify.nix index 7149c4e..f4dd775 100644 --- a/common/fragments/graphical/spotify.nix +++ b/common/fragments/graphical/spotify.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: { +{ pkgs, ... }: { programs.spicetify = with pkgs.spicetify-pkgs; { enable = true; diff --git a/common/fragments/graphical/theme.nix b/common/fragments/graphical/theme.nix index 8042342..e81da0f 100644 --- a/common/fragments/graphical/theme.nix +++ b/common/fragments/graphical/theme.nix @@ -36,8 +36,8 @@ recursive = true; source = pkgs.fetchgit { url = "https://github.com/ZorinOS/zorin-desktop-themes.git"; - rev = "6708d5148545c6d9a99712f63b5efe5a5c0eb2d9"; - sha256 = "sha256-3KEPP39dCr0ZjyqbAb/isoGdeiySDTvHL9k4oxcw19M="; + rev = "4edec9606ee60d40d6cebae9a5cf5ca52a9b694c"; + sha256 = "sha256-onsQeEuideN8dikcVNnq8v22ccln6I2hXP3jFPg8Hr0="; sparseCheckout = [ "ZorinPurple-Dark" "ZorinPurple-Light" ]; }; }; @@ -52,6 +52,12 @@ "ZorinPurple-Dark"; }; + dconf.settings."org/gnome/desktop/interface".color-scheme = + if config.environment.graphical.theme.light then + "prefer-light" + else + "prefer-dark"; + programs.helix.settings.theme = if config.environment.graphical.theme.light then "paramount-light" diff --git a/flake.lock b/flake.lock index 80478df..c505dcd 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1696354652, - "narHash": "sha256-Axbr9jIerxTsLhONYmSRbtA+W1+D4j8PcYYtidyNVEc=", + "lastModified": 1696800008, + "narHash": "sha256-dQ2Xf1K5qH18J7h3pzx4ffp6n1nwN+2L8jv6OBXPLzQ=", "owner": "AgathaSorceress", "repo": "colorpickle", - "rev": "4612d3de1692c98e79e2de848c5776b412377bd1", + "rev": "a1a21aebbc9b9716136ab9cc6f77bf5346f8e7ba", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1696295907, - "narHash": "sha256-GFeo5NpbFQjVeu2lv/B/pfZY/+SIt0KRHjh26s0bXAY=", + "lastModified": 1697893116, + "narHash": "sha256-KVA6ybNgqVpM4JEkvJE5ujucqvAUCsQGdxZYIasRp/8=", "owner": "helix-editor", "repo": "helix", - "rev": "75c0a5ceb32d8a503915a93ccc1b64c8ad1cba8b", + "rev": "31f50bf5bf0d49af7359533e0865e878184c5225", "type": "github" }, "original": { @@ -465,11 +465,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1696261572, - "narHash": "sha256-s8TtSYJ1LBpuITXjbPLUPyxzAKw35LhETcajJjCS5f0=", + "lastModified": 1697915759, + "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb", + "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", "type": "github" }, "original": { @@ -524,11 +524,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1696039360, - "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", + "lastModified": 1697777081, + "narHash": "sha256-n2vQARhKevRGyeo+LAa8g+CdUQsdH/caNk8jnylcPhY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", + "rev": "679cadfdfed2b90311a247b2d6ef6dfd3d6cab73", "type": "github" }, "original": {