diff --git a/homeConfigs/global/appearance.nix b/homeConfigs/global/appearance.nix index e70144f..dabcc6e 100644 --- a/homeConfigs/global/appearance.nix +++ b/homeConfigs/global/appearance.nix @@ -14,9 +14,9 @@ }; gtk = { - gtk4.theme = config.gtk.theme; enable = true; - theme = { package = pkgs.flat-remix-gtk; name = "Flat-Remix-GTK-Grey-Darkest"; }; + theme = { package = pkgs.magnetic-catppuccin-gtk; name = "Catppuccin-GTK-Dark"; }; + gtk4.theme = config.gtk.theme; font = { name = "Sans"; size = 11; }; }; diff --git a/homeConfigs/global/firefox.nix b/homeConfigs/global/firefox.nix index 312e781..84ab1f6 100644 --- a/homeConfigs/global/firefox.nix +++ b/homeConfigs/global/firefox.nix @@ -8,6 +8,11 @@ extensions.packages = with inputs.firefox-addons.packages."x86_64-linux"; [vimium ublock-origin]; extensions.force = true; + settings = { + "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org"; + "layout.css.prefers-color-scheme.content-override" = 0; + "browser.theme.content-theme" = 0; + }; }; }; } diff --git a/homeConfigs/global/wayland/logout.nix b/homeConfigs/global/wayland/logout.nix new file mode 100644 index 0000000..18d1573 --- /dev/null +++ b/homeConfigs/global/wayland/logout.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: +{ + programs.wleave.enable = true; + programs.wleave.settings.buttons= [ + { + action = "echo systemctl poweroff"; + keybind = "y"; + label = "shutdown"; + text = "sync and shutdown"; + } + { + action = "echo systemctl soft-reboot"; + keybind = "s"; + label = "reboot"; + text = "soft reboot2"; + } + { + action = "echo \"touch ~/.nosync && systemctl poweroff\""; + keybind = "n"; + label = "shutdown"; + text = "shutdown without syncing"; + } + ]; +} diff --git a/homeConfigs/global/wayland/waybar/global_style.nix b/homeConfigs/global/wayland/waybar/global_style.nix index 044ad63..bd4db08 100644 --- a/homeConfigs/global/wayland/waybar/global_style.nix +++ b/homeConfigs/global/wayland/waybar/global_style.nix @@ -5,6 +5,7 @@ font-family: "Iosevka Nerd Font"; font-size: 14px; background-color: transparent; + color: #cdd6f4; } .modules-right, #window { @@ -23,7 +24,6 @@ background-color: rgba(127, 132, 156, 0.3); padding: 1px 6px; border-radius: 5px; - color: #cdd6f4; transition: background-color 200ms ease; } diff --git a/homeConfigs/modules/sync.nix b/homeConfigs/modules/sync.nix index 4bff5b3..9afbfbb 100644 --- a/homeConfigs/modules/sync.nix +++ b/homeConfigs/modules/sync.nix @@ -42,7 +42,6 @@ in }; }; config = lib.mkIf config.mods.sync.enable { - home.packages = with pkgs;[ unison ]; home.file.".unison/default.prf" = { text = (lib.strings.concatStrings [''