From 16b2c563531b647a6741d7c720bd90116229dafd Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 May 2023 18:30:42 -0400 Subject: [PATCH] Merge udiskie and gtk with hyprland --- desktop/default.nix | 2 -- desktop/gtk/default.nix | 25 ------------------------- desktop/hyprland/default.nix | 25 +++++++++++++++++++++++++ desktop/udiskie/default.nix | 7 ------- 4 files changed, 25 insertions(+), 34 deletions(-) delete mode 100644 desktop/gtk/default.nix delete mode 100644 desktop/udiskie/default.nix diff --git a/desktop/default.nix b/desktop/default.nix index 0fcc6971..9d1e5ae5 100644 --- a/desktop/default.nix +++ b/desktop/default.nix @@ -6,14 +6,12 @@ ./dunst ./fcitx5-mozc ./fonts - ./gtk ./hyprland ./nwg-dock ./pipewire ./rofi ./stylix ./swaylock - ./udiskie ./waybar ./xdg-user-dirs ]; diff --git a/desktop/gtk/default.nix b/desktop/gtk/default.nix deleted file mode 100644 index e84772dc..00000000 --- a/desktop/gtk/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, ... }: - -{ - home-manager.sharedModules = [{ - gtk = { - enable = true; - cursorTheme = { - package = pkgs.phinger-cursors; - name = "phinger-cursors"; - }; - gtk3.extraConfig = { - gtk-decoration-layout = "menu:"; - gtk-xft-antialias = 1; - gtk-xft-hinting = 1; - gtk-xft-hintstyle = "hintfull"; - gtk-xft-rgba = "rgb"; - gtk-recent-files-enabled = false; - }; - iconTheme = { - package = pkgs.fluent-icon-theme; - name = "Fluent-dark"; - }; - }; - }]; -} diff --git a/desktop/hyprland/default.nix b/desktop/hyprland/default.nix index 258464dd..b507ec93 100644 --- a/desktop/hyprland/default.nix +++ b/desktop/hyprland/default.nix @@ -2,6 +2,7 @@ { programs.hyprland.enable = true; + services.udisks2.enable = true; services.xserver = { enable = true; @@ -211,5 +212,29 @@ "Xft.rgba" = "rgb"; }; + gtk = { + enable = true; + + cursorTheme = { + package = pkgs.phinger-cursors; + name = "phinger-cursors"; + }; + + gtk3.extraConfig = { + gtk-decoration-layout = "menu:"; + gtk-xft-antialias = 1; + gtk-xft-hinting = 1; + gtk-xft-hintstyle = "hintfull"; + gtk-xft-rgba = "rgb"; + gtk-recent-files-enabled = false; + }; + + iconTheme = { + package = pkgs.fluent-icon-theme; + name = "Fluent-dark"; + }; + }; + + services.udiskie.enable = true; }]; } diff --git a/desktop/udiskie/default.nix b/desktop/udiskie/default.nix deleted file mode 100644 index dcad4e26..00000000 --- a/desktop/udiskie/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - services.udisks2.enable = true; - - home-manager.sharedModules = [{ - services.udiskie.enable = true; - }]; -}