diff options
Diffstat (limited to 'users/seth/desktop')
| -rw-r--r-- | users/seth/desktop/default.nix | 24 | ||||
| -rw-r--r-- | users/seth/desktop/gnome.nix | 73 | ||||
| -rw-r--r-- | users/seth/desktop/plasma.nix | 14 |
3 files changed, 49 insertions, 62 deletions
diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix index 474ad6e..d8a0e74 100644 --- a/users/seth/desktop/default.nix +++ b/users/seth/desktop/default.nix @@ -1,6 +1,22 @@ -_: { - imports = [ - ./gnome.nix - ./plasma.nix +{ + pkgs, + desktop, + ... +}: { + imports = + [ + ../programs/mangohud + ] + ++ ( + if (desktop == "gnome") + then [./gnome.nix] + else [./plasma.nix] + ); + + home.packages = with pkgs; [ + discord + element-desktop + spotify + steam ]; } diff --git a/users/seth/desktop/gnome.nix b/users/seth/desktop/gnome.nix index 40cbe99..482dae6 100644 --- a/users/seth/desktop/gnome.nix +++ b/users/seth/desktop/gnome.nix @@ -1,49 +1,30 @@ -{ - config, - pkgs, - ... -}: let - inherit (config.seth) desktop; - homePackages = - if desktop == "gnome" - then with pkgs; [adw-gtk3] ++ (with pkgs.gnomeExtensions; [appindicator blur-my-shell caffeine]) - else []; - dconfSettings = - if desktop == "gnome" - then { - "org/gnome/shell" = { - disable-user-extensions = false; - enabled-extensions = [ - ]; - favorite-apps = [ - "firefox.desktop" - "org.gnome.Nautilus.desktop" - "discord.desktop" - ]; - }; +{pkgs, ...}: { + home.packages = with pkgs; [adw-gtk3] ++ (with pkgs.gnomeExtensions; [appindicator blur-my-shell caffeine]); - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - }; - } - else {}; + dconf.settings = { + "org/gnome/shell" = { + disable-user-extensions = false; + enabled-extensions = [ + ]; + favorite-apps = [ + "firefox.desktop" + "org.gnome.Nautilus.desktop" + "discord.desktop" + ]; + }; + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + }; + }; - gtkConfig = - if desktop == "gnome" - then { - enable = true; - - theme = { - name = "adw-gtk3"; - package = pkgs.adw-gtk3; - }; - } - else {}; -in { - home.packages = homePackages; - dconf.settings = dconfSettings; - gtk = gtkConfig; + gtk = { + enable = true; + theme = { + name = "adw-gtk3"; + package = pkgs.adw-gtk3; + }; + }; } diff --git a/users/seth/desktop/plasma.nix b/users/seth/desktop/plasma.nix index 760df60..97e427f 100644 --- a/users/seth/desktop/plasma.nix +++ b/users/seth/desktop/plasma.nix @@ -1,13 +1,3 @@ -{ - config, - pkgs, - ... -}: let - inherit (config.seth) desktop; - homePackages = - if desktop == "plasma" - then with pkgs; [catppuccin-kde] - else []; -in { - home.packages = homePackages; +{pkgs, ...}: { + home.packages = with pkgs; [catppuccin-kde]; } |