users/global: clean up graphical setup

modules/global/packages.nix

@@ -24,6 +24,7 @@
     fd
     fzf
     gptfdisk
+    gnumake
     htop
     hyfetch
     imagemagick

users/modules/global/emacs.nix

@@ -1,9 +1,6 @@
 { config, main, pkgs, lib, ... }:
-let
+lib.mkIf main.info.graphical
-  ifGraphical = lib.optionals main.info.graphical;
+{
-  ifGraphical' = lib.optional main.info.graphical;
-in
-lib.mkIf main.info.graphical {
   programs.emacs = {
     enable = true;
     extraPackages = epkgs: with epkgs; [ vterm pdf-tools emacsql-sqlite ];
@@ -24,8 +21,6 @@ lib.mkIf main.info.graphical {
       # --- Doom Emacs ---
       mlocate
 
-      gnumake
-
       # --- :tools ---
       # :tools editorconfig
       editorconfig-core-c
@@ -49,7 +44,6 @@ lib.mkIf main.info.graphical {
       dockfmt
 
       # :lang latex
-      (ifGraphical [
       (texlive.combine {
         inherit (texlive)
           scheme-medium
@@ -75,7 +69,6 @@ lib.mkIf main.info.graphical {
           ;
       })
       biber
-      ])
 
       # :lang markdown
       # python3Packages.grip

users/modules/global/mpris.nix

@@ -1,7 +1,6 @@
 { main, config, lib, pkgs, ... }:
-
+lib.mkIf main.info.graphical
 {
-  config = lib.mkIf main.info.graphical {
   services = {
     mpris-proxy.enable = true;
     playerctld.enable = true;
@@ -10,5 +9,4 @@
   home.packages = with pkgs; [
     playerctl
   ];
-  };
 }

users/modules/global/rofi.nix

@@ -1,4 +1,5 @@
-{ main, pkgs, ... }: {
+{ main, pkgs, ... }:
+{
   programs.rofi = {
     enable = main.info.graphical;
     extraConfig = {

users/modules/global/themeing.nix

@@ -1,6 +1,6 @@
 { lib, main, config, pkgs, ... }:
+lib.mkIf main.info.graphical
 {
-  config = lib.mkIf main.info.graphical {
   gtk = {
     enable = true;
     gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
@@ -30,5 +30,4 @@
     };
     platformTheme.name = "adwaita";
   };
-  };
 }

users/modules/global/vim.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.vim = {
     enable = true;
     settings = {