diff --git a/home-manager/common/desktops/xfce/themes/default/default.nix b/home-manager/common/desktops/xfce/themes/default/default.nix index 81f5df5a..30b31319 100644 --- a/home-manager/common/desktops/xfce/themes/default/default.nix +++ b/home-manager/common/desktops/xfce/themes/default/default.nix @@ -1,63 +1,4 @@ # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix -{ lib, hostname, username, ... }: with lib.hm.gvariant; -let - # General Theming - font = "FontAwesome Bold 11"; - font-doc = "FontAwesome Regular 11"; - font-mono = "JetBrainsMono Nerd Font Propo Medium 11"; - - # Day Variant - day-wallpaper = "file:///etc/nixos/git/wallpapers/default/wallpaper1.png"; - day-gtk-theme = "Fluent-Light-compact"; - day-shell-theme = "Fluent-compact"; - day-icon-theme = "Papirus"; - - # Night Variant - night-wallpaper = "file:///etc/nixos/git/wallpapers/default/wallpaper1.png"; - night-gtk-theme = "Fluent-Dark-compact"; - night-shell-theme = "Fluent-Dark-compact"; - night-icon-theme = "Papirus-Dark"; -in { - # Gnome GTK Settings - gtk.theme = "${night-gtk-theme}"; - - # Gnome DCONF Settings - dconf.settings = { - "org/gnome/desktop/background" = { - picture-uri = "${day-wallpaper}"; - picture-uri-dark = "${night-wallpaper}"; - }; - - "org/gnome/shell/extensions/nightthemeswitcher/gtk-variants" = { - enabled = true; - day = "${day-gtk-theme}"; - night = "${night-gtk-theme}"; - }; - - "org/gnome/shell/extensions/nightthemeswitcher/icon-variants" = { - enabled = true; - day = "${day-icon-theme}"; - night = "${night-icon-theme}"; - }; - - "org/gnome/shell/extensions/nightthemeswitcher/shell-variants" = { - enabled = true; - day = "${day-shell-theme}"; - night = "${night-shell-theme}"; - }; - - "org/gnome/desktop/interface" = { - clock-show-date = true; - clock-show-weekday = false; - color-scheme = "prefer-light"; - font-antialiasing = "rgba"; - font-hinting = "slight"; - gtk-theme = "${day-gtk-theme}"; - icon-theme = "${night-icon-theme}"; - monospace-font-name = "${font-mono}"; - font-name = "${font}"; - document-font-name = "${font-doc}"; - show-battery-percentage = false; - }; - }; +{ + } diff --git a/home-manager/common/desktops/xfce/themes/gruvbox/default.nix b/home-manager/common/desktops/xfce/themes/gruvbox/default.nix index 8d7db077..30b31319 100644 --- a/home-manager/common/desktops/xfce/themes/gruvbox/default.nix +++ b/home-manager/common/desktops/xfce/themes/gruvbox/default.nix @@ -1,63 +1,4 @@ # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix -{ lib, hostname, username, ... }: with lib.hm.gvariant; -let - # General Theming - font = "FontAwesome Bold 11"; - font-doc = "FontAwesome Regular 11"; - font-mono = "JetBrainsMono Nerd Font Propo Medium 11"; - - # Day Variant - day-wallpaper = "file:///etc/nixos/git/wallpapers/gruvbox/wallpaper9.jpg"; - day-gtk-theme = ""; - day-shell-theme = "vimix-doder"; - day-icon-theme = "Vimix-Doder"; - - # Night Variant - night-wallpaper = "file:///etc/nixos/git/wallpapers/gruvbox/wallpaper12.jpg"; - night-gtk-theme = ""; - night-shell-theme = "Gruvbox-Dark-BL"; - night-icon-theme = "Nordzy-yellow-dark"; -in { - # Gnome GTK Settings - gtk.theme = "${night-gtk-theme}"; - - # Gnome DCONF Settings - dconf.settings = { - "org/gnome/desktop/background" = { - picture-uri = "${day-wallpaper}"; - picture-uri-dark = "${night-wallpaper}"; - }; - - "org/gnome/shell/extensions/nightthemeswitcher/gtk-variants" = { - enabled = true; - day = "${day-gtk-theme}"; - night = "${night-gtk-theme}"; - }; - - "org/gnome/shell/extensions/nightthemeswitcher/icon-variants" = { - enabled = true; - day = "${day-icon-theme}"; - night = "${night-icon-theme}"; - }; - - "org/gnome/shell/extensions/nightthemeswitcher/shell-variants" = { - enabled = true; - day = "${day-shell-theme}"; - night = "${night-shell-theme}"; - }; - - "org/gnome/desktop/interface" = { - clock-show-date = true; - clock-show-weekday = false; - color-scheme = "prefer-light"; - font-antialiasing = "rgba"; - font-hinting = "slight"; - gtk-theme = "${day-gtk-theme}"; - icon-theme = "${night-icon-theme}"; - monospace-font-name = "${font-mono}"; - font-name = "${font}"; - document-font-name = "${font-doc}"; - show-battery-percentage = false; - }; - }; +{ + } diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix index 75b284ae..4bc30c03 100644 --- a/nixos/common/desktops/xfce/default.nix +++ b/nixos/common/desktops/xfce/default.nix @@ -1,7 +1,7 @@ { lib, config, pkgs, hostname, gpu, ... }: { # Enable sound with pipewire. sound.enable = true; - hardware.pulseaudio.enable = true; + hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true;