diff --git a/profiles/applications-setup.nix b/profiles/applications-setup.nix index 97930b4..65d9bcb 100644 --- a/profiles/applications-setup.nix +++ b/profiles/applications-setup.nix @@ -24,7 +24,7 @@ if value ? desktop then [ "${value.desktop}.desktop" ] else value) { "inode/directory" = fm; "text/html" = browser; - "image/*" = { desktop = "org.gnome.eog"; }; + "image/*" = { desktop = "org.kde.gwenview"; }; "application/zip" = archive; "application/rar" = archive; "application/7z" = archive; diff --git a/profiles/workspace/gnome3/default.nix b/profiles/workspace/gnome3/default.nix index 54f7ff2..18c6c9f 100644 --- a/profiles/workspace/gnome3/default.nix +++ b/profiles/workspace/gnome3/default.nix @@ -16,7 +16,7 @@ environment.systemPackages = [ pkgs.pass-secret-service ]; - environment.gnome.excludePackages = [ pkgs.gnome-console ]; + environment.gnome.excludePackages = [ pkgs.gnome-console pkgs.gnome.evince pkgs.gnome.eog ]; services.dbus.packages = [ pkgs.pass-secret-service ]; xdg.portal.extraPortals = [ pkgs.pass-secret-service ]; @@ -31,18 +31,10 @@ }) (state.directories ++ cache.directories ++ derivative.directories))); defaultApplications = { - fm = { - cmd = "${pkgs.gnome.nautilus}/bin/nautilus"; - desktop = "org.gnome.Nautilus"; - }; monitor = { cmd = "${pkgs.gnome.gnome-system-monitor}/bin/gnome-system-monitor"; desktop = "gnome-system-monitor"; }; - archive = { - cmd = "${pkgs.gnome.file-roller}/bin/file-roller"; - desktop = "org.gnome.FileRoller"; - }; }; home-manager.users.balsoft = { diff --git a/profiles/workspace/kde/qt.nix b/profiles/workspace/kde/qt.nix index 296e971..3e633a6 100644 --- a/profiles/workspace/kde/qt.nix +++ b/profiles/workspace/kde/qt.nix @@ -18,8 +18,21 @@ with pkgs.my-lib; { KDEDIRS = "/run/current-system/sw:/run/current-system/sw/share/kservices5:/run/current-system/sw/share/kservicetypes5:/run/current-system/sw/share/kxmlgui5"; }; + + defaultApplications = { + fm = { + cmd = "${pkgs.dolphin}/bin/dolphin"; + desktop = "org.kde.dolphin"; + }; + archive = { + cmd = "${pkgs.ark}/bin/ark"; + desktop = "org.kde.ark"; + }; + }; + home-manager.users.balsoft = let fonts = config.themes.fonts; in { + home.packages = [ pkgs.ark pkgs.dolphin ]; xdg.configFile."kdeglobals".text = with (thmDec config.themes.colors); lib.generators.toGitINI { "Colors:Button" = { diff --git a/profiles/workspace/sway/default.nix b/profiles/workspace/sway/default.nix index efe65e8..909c70d 100755 --- a/profiles/workspace/sway/default.nix +++ b/profiles/workspace/sway/default.nix @@ -53,7 +53,7 @@ in { colors = rec { background = thm.base00; unfocused = { - text = thm.base02; + text = thm.base03; border = thm.base01; background = thm.base00; childBorder = thm.base01;