diff --git a/home/opdavies/hosts/lemp11.nix b/home/opdavies/hosts/lemp11.nix index b46c522d..c49b4a04 100644 --- a/home/opdavies/hosts/lemp11.nix +++ b/home/opdavies/hosts/lemp11.nix @@ -2,7 +2,6 @@ { homeManagerModules = { - gtk.enable = true; tmux-sessionizer.enable = true; }; } diff --git a/home/opdavies/hosts/t480.nix b/home/opdavies/hosts/t480.nix index c2fe3e06..6a0f9024 100644 --- a/home/opdavies/hosts/t480.nix +++ b/home/opdavies/hosts/t480.nix @@ -2,7 +2,6 @@ { homeManagerModules = { - gtk.enable = true; newsboat.enable = true; notes = { diff --git a/home/opdavies/hosts/t490.nix b/home/opdavies/hosts/t490.nix index a5ea699f..8a6097bf 100644 --- a/home/opdavies/hosts/t490.nix +++ b/home/opdavies/hosts/t490.nix @@ -2,8 +2,6 @@ { homeManagerModules = { - gtk.enable = true; - notes = { enable = true; directory = "$HOME/Documents/wiki/notes"; diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index de43d029..8ff36709 100644 --- a/hosts/t480/configuration.nix +++ b/hosts/t480/configuration.nix @@ -14,6 +14,7 @@ ../../modules/mixins/flameshot.nix ../../modules/mixins/fonts.nix ../../modules/mixins/fzf.nix + ../../modules/mixins/gtk.nix ../../modules/mixins/mpv.nix ../../modules/mixins/phpactor ../../modules/mixins/pipewire.nix diff --git a/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix deleted file mode 100644 index 5cd22e71..00000000 --- a/modules/home-manager/desktop/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./gtk.nix - ./media - ]; -} diff --git a/modules/home-manager/desktop/gtk.nix b/modules/home-manager/desktop/gtk.nix deleted file mode 100644 index 2419d956..00000000 --- a/modules/home-manager/desktop/gtk.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -{ - options.homeManagerModules.gtk.enable = mkEnableOption "Enable gtk"; - - config = mkIf config.homeManagerModules.gtk.enable { - gtk = { - enable = true; - - theme = { - name = "Arc-Dark"; - package = pkgs.arc-theme; - }; - - iconTheme = { - name = "Arc"; - package = pkgs.arc-icon-theme; - }; - - gtk3.extraConfig.gtk-enable-animations = false; - gtk4.extraConfig.gtk-enable-animations = false; - }; - }; -} diff --git a/modules/mixins/gtk.nix b/modules/mixins/gtk.nix new file mode 100644 index 00000000..35f95b1e --- /dev/null +++ b/modules/mixins/gtk.nix @@ -0,0 +1,22 @@ +{ + home-manager.users.opdavies = + { pkgs, ... }: + { + gtk = { + enable = true; + + theme = { + name = "Arc-Dark"; + package = pkgs.arc-theme; + }; + + iconTheme = { + name = "Arc"; + package = pkgs.arc-icon-theme; + }; + + gtk3.extraConfig.gtk-enable-animations = false; + gtk4.extraConfig.gtk-enable-animations = false; + }; + }; +}