From 3965fe943d466aa4026e302a0b5e21c0f423d1fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 09:54:05 +0800 Subject: [PATCH 1/4] Just: --fast is deprecated --- Justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Justfile b/Justfile index 2696c757..3c0318de 100644 --- a/Justfile +++ b/Justfile @@ -9,7 +9,7 @@ os host action: nixos-rebuild {{ action }} \ -I nixpkgs=${nixpkgs} \ -I nixos-config=./nix/configurations/{{ host }}.nix \ - --fast \ + --no-reexec \ --file ./default.nix \ --attr "nixosConfigurations.{{ host }}" From a3d8264350d4cb8832e59f9b7b8ea32215302197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 10:08:37 +0800 Subject: [PATCH 2/4] vanadium/home: decouple cursor config --- nix/configurations/vanadium/home/misc.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nix/configurations/vanadium/home/misc.nix b/nix/configurations/vanadium/home/misc.nix index 7fc0c785..23eea664 100644 --- a/nix/configurations/vanadium/home/misc.nix +++ b/nix/configurations/vanadium/home/misc.nix @@ -1,7 +1,6 @@ { pkgs, lib, - nixosConfig ? { }, ... }: { @@ -42,12 +41,9 @@ home.pointerCursor = { x11.enable = true; gtk.enable = true; - - inherit (nixosConfig.services.xserver.displayManager.lightdm.greeters.gtk.cursorTheme) - name - package - size - ; + name = "Posy_Cursor_Black"; + package = pkgs.posy-cursors; + size = 72; }; xresources.properties."Xft.dpi" = 150; i18n.inputMethod = { From dd7185481449451b8eec7f4b52ecbca8e05153cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 10:26:59 +0800 Subject: [PATCH 3/4] vanadium/gtk: init --- nix/configurations/vanadium.nix | 1 + nix/configurations/vanadium/home/gtk.nix | 39 +++++++++++++++++++++++ nix/configurations/vanadium/nixos/gui.nix | 24 +++++++++++--- 3 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 nix/configurations/vanadium/home/gtk.nix diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index ab470dbd..9332268b 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -151,6 +151,7 @@ in # ./vanadium/home/programs.nix ./vanadium/home/misc.nix + ./vanadium/home/gtk.nix ./vanadium/home/zen-browser.nix ./vanadium/home/firefox.nix diff --git a/nix/configurations/vanadium/home/gtk.nix b/nix/configurations/vanadium/home/gtk.nix new file mode 100644 index 00000000..52d3da5d --- /dev/null +++ b/nix/configurations/vanadium/home/gtk.nix @@ -0,0 +1,39 @@ +{ pkgs, ... }: +{ + home.packages = [ + pkgs.pantheon.elementary-sound-theme + ]; + + # Note: this would automatically recurse into gtk{2,3,4} settings + # In version prior to 25.11 it doesn't do this. + gtk.enable = true; + gtk = { + font = { + name = "Ubuntu"; + package = pkgs.ubuntu-classic; + }; + iconTheme = { + name = "Adwaita"; + package = pkgs.gnome-themes-extra; + }; + theme = { + name = "Adwaita"; + package = pkgs.gnome-themes-extra; + }; + + # TODO: open an issue, why are the types inconsistent? ew. + # TODO: kitty doesn't react to this, which is annoying + gtk2.extraConfig = '' + gtk-sound-theme-name = "elementary" + ''; + gtk3.extraConfig = { + gtk-sound-theme-name = "elementary"; + }; + gtk4.extraConfig = { + gtk-sound-theme-name = "elementary"; + }; + }; + dconf.settings = { + "org/gnome/desktop/sound".theme-name = "elementary"; + }; +} diff --git a/nix/configurations/vanadium/nixos/gui.nix b/nix/configurations/vanadium/nixos/gui.nix index 836883ad..b9b1f6b4 100644 --- a/nix/configurations/vanadium/nixos/gui.nix +++ b/nix/configurations/vanadium/nixos/gui.nix @@ -15,13 +15,29 @@ autoRepeatInterval = 40; }; + environment.systemPackages = [ + pkgs.pantheon.elementary-sound-theme + ]; services.xserver.displayManager.lightdm = { enable = true; background = "#000000"; - greeters.gtk.cursorTheme = { - name = "Posy_Cursor_Black"; - package = pkgs.posy-cursors; - size = 72; + greeters.gtk = { + iconTheme = { + name = "Adwaita"; + package = pkgs.gnome-themes-extra; + }; + theme = { + name = "Adwaita"; + package = pkgs.gnome-themes-extra; + }; + cursorTheme = { + name = "Posy_Cursor_Black"; + package = pkgs.posy-cursors; + size = 72; + }; + extraConfig = '' + gtk-sound-theme-name = elementary + ''; }; }; From 0482e57583ef0788c602fa004d58101f698ab4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 10:32:08 +0800 Subject: [PATCH 4/4] vanadium/kitty: use elementary bell sound --- nix/configurations/vanadium/home/gtk.nix | 1 - nix/configurations/vanadium/home/programs.nix | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nix/configurations/vanadium/home/gtk.nix b/nix/configurations/vanadium/home/gtk.nix index 52d3da5d..f059868e 100644 --- a/nix/configurations/vanadium/home/gtk.nix +++ b/nix/configurations/vanadium/home/gtk.nix @@ -22,7 +22,6 @@ }; # TODO: open an issue, why are the types inconsistent? ew. - # TODO: kitty doesn't react to this, which is annoying gtk2.extraConfig = '' gtk-sound-theme-name = "elementary" ''; diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index 09805558..b85e86d2 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -122,6 +122,7 @@ # audio utilities pkgs.helvum pkgs.pavucontrol + pkgs.pantheon.elementary-sound-theme ]; programs = { @@ -161,7 +162,12 @@ kitty = { enable = true; font.size = 12; # sweet spot for framework 13 - settings.shell = lib.getExe config.programs.fish.package; + settings = { + shell = lib.getExe config.programs.fish.package; + # https://github.com/kovidgoyal/kitty/issues/1866 + # https://sw.kovidgoyal.net/kitty/conf/#terminal-bell + linux_bell_theme = "elementary"; + }; }; chromium.enable = true;