diff --git a/core/packages.nix b/core/packages.nix index 413818c..213acc3 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -156,9 +156,9 @@ gparted pavucontrol #polkit-gnome - gnome.seahorse + seahorse polkit-kde-agent - gnome.gnome-keyring + gnome-keyring networkmanager ]; diff --git a/home/common/default.nix b/home/common/default.nix index 2695c30..6e13e09 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -28,11 +28,11 @@ packages = with pkgs; [ ## desktop environment - gnome.gnome-keyring + gnome-keyring opentabletdriver # gnome-calculator syncthing-tray - gnome.nautilus + nautilus # gnome-calendar gnome-secrets appimage-run @@ -41,7 +41,7 @@ # gnome-clocks pavucontrol image-roll - gnome.eog + eog peaclock cmatrix hyfetch diff --git a/home/hypr/default.nix b/home/hypr/default.nix index 24903ed..98cd217 100644 --- a/home/hypr/default.nix +++ b/home/hypr/default.nix @@ -41,11 +41,11 @@ hyprcursor brightnessctl ## gnome stuff - gnome.sushi - gnome.seahorse + sushi + seahorse networkmanagerapplet - gnome.gnome-themes-extra - gnome.gnome-control-center + gnome-themes-extra + gnome-control-center ## lib and compat xwayland @@ -58,7 +58,7 @@ dconf xdg-desktop-portal-gtk xdg-desktop-portal-gnome - # xdg-desktop-portal-hyprland + xdg-desktop-portal-hyprland ]; diff --git a/home/hypr/dunst.nix b/home/hypr/dunst.nix index 012c1c4..4833cac 100644 --- a/home/hypr/dunst.nix +++ b/home/hypr/dunst.nix @@ -4,7 +4,7 @@ enable = true; iconTheme = { name = "Adwaita-Dark"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; }; settings = { global = { diff --git a/home/hypr/hyprland.nix b/home/hypr/hyprland.nix index 037d543..aa921cd 100644 --- a/home/hypr/hyprland.nix +++ b/home/hypr/hyprland.nix @@ -13,8 +13,8 @@ xwayland.enable = true; plugins = [ - # inputs.hyprland-plugins.packages."${pkgs.system}".borders-plus-plus - # inputs.hyprland-plugins.packages."${pkgs.system}".hyprbars + #inputs.hyprland-plugins.packages."${pkgs.system}".borders-plus-plus + #inputs.hyprland-plugins.packages."${pkgs.system}".hyprbars ]; @@ -36,7 +36,7 @@ bind = [ "$shiftMod, RETURN, exec, ${pkgs.wofi}/bin/wofi" "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" - "$mod, E, exec, ${pkgs.xfce.thunar}/bin/nautilus" + "$mod, E, exec, ${pkgs.xfce.nautilus}/bin/nautilus" "$mod, B, exec, ${pkgs.firefox}/bin/firefox" "$mod, C, exec, ${pkgs.kitty}/bin/kitty --class peaclock peaclock" "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" @@ -208,16 +208,16 @@ qt = { enable = true; - platformTheme = "gnome"; + platformTheme = "adwaita"; style.name = "adwaita-dark"; }; gtk = { enable = true; - # theme = { - # package = pkgs.adwaita-dark; - # name = "adwaita-dark"; - # }; + theme = { + package = pkgs.adwaita-dark; + name = "adwaita-dark"; + }; iconTheme = { package = pkgs.flat-remix-icon-theme;