diff --git a/Justfile b/Justfile index 3c0318de..2696c757 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 \ - --no-reexec \ + --fast \ --file ./default.nix \ --attr "nixosConfigurations.{{ host }}" diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 9332268b..ab470dbd 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -151,7 +151,6 @@ 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 deleted file mode 100644 index f059868e..00000000 --- a/nix/configurations/vanadium/home/gtk.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ 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. - 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/home/misc.nix b/nix/configurations/vanadium/home/misc.nix index 23eea664..7fc0c785 100644 --- a/nix/configurations/vanadium/home/misc.nix +++ b/nix/configurations/vanadium/home/misc.nix @@ -1,6 +1,7 @@ { pkgs, lib, + nixosConfig ? { }, ... }: { @@ -41,9 +42,12 @@ home.pointerCursor = { x11.enable = true; gtk.enable = true; - name = "Posy_Cursor_Black"; - package = pkgs.posy-cursors; - size = 72; + + inherit (nixosConfig.services.xserver.displayManager.lightdm.greeters.gtk.cursorTheme) + name + package + size + ; }; xresources.properties."Xft.dpi" = 150; i18n.inputMethod = { diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index b85e86d2..09805558 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -122,7 +122,6 @@ # audio utilities pkgs.helvum pkgs.pavucontrol - pkgs.pantheon.elementary-sound-theme ]; programs = { @@ -162,12 +161,7 @@ kitty = { enable = true; font.size = 12; # sweet spot for framework 13 - 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"; - }; + settings.shell = lib.getExe config.programs.fish.package; }; chromium.enable = true; diff --git a/nix/configurations/vanadium/nixos/gui.nix b/nix/configurations/vanadium/nixos/gui.nix index b9b1f6b4..836883ad 100644 --- a/nix/configurations/vanadium/nixos/gui.nix +++ b/nix/configurations/vanadium/nixos/gui.nix @@ -15,29 +15,13 @@ autoRepeatInterval = 40; }; - environment.systemPackages = [ - pkgs.pantheon.elementary-sound-theme - ]; services.xserver.displayManager.lightdm = { enable = true; background = "#000000"; - 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 - ''; + greeters.gtk.cursorTheme = { + name = "Posy_Cursor_Black"; + package = pkgs.posy-cursors; + size = 72; }; };