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
-  ifGraphical = lib.optionals main.info.graphical;
-  ifGraphical' = lib.optional main.info.graphical;
-in
-lib.mkIf main.info.graphical {
+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,33 +44,31 @@ lib.mkIf main.info.graphical {
       dockfmt
 
       # :lang latex
-      (ifGraphical [
-        (texlive.combine {
-          inherit (texlive)
-            scheme-medium
+      (texlive.combine {
+        inherit (texlive)
+          scheme-medium
 
-            apa7
-            apacite
-            biblatex
-            biblatex-apa
-            biblatex-chicago
-            capt-of minted
-            catchfile
-            endfloat
-            framed
-            fvextra
-            hanging
-            lipsum
-            mleftright
-            scalerel
-            threeparttable
-            upquote
-            wrapfig
-            xstring
-            ;
-        })
-        biber
-      ])
+          apa7
+          apacite
+          biblatex
+          biblatex-apa
+          biblatex-chicago
+          capt-of minted
+          catchfile
+          endfloat
+          framed
+          fvextra
+          hanging
+          lipsum
+          mleftright
+          scalerel
+          threeparttable
+          upquote
+          wrapfig
+          xstring
+          ;
+      })
+      biber
 
       # :lang markdown
       # python3Packages.grip

users/modules/global/mpris.nix

@@ -1,14 +1,12 @@
 { main, config, lib, pkgs, ... }:
-
+lib.mkIf main.info.graphical
 {
-  config = lib.mkIf main.info.graphical {
-    services = {
-      mpris-proxy.enable = true;
-      playerctld.enable = true;
-    };
-
-    home.packages = with pkgs; [
-      playerctl
-    ];
+  services = {
+    mpris-proxy.enable = true;
+    playerctld.enable = true;
   };
+
+  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,34 +1,33 @@
 { 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";
+  gtk = {
+    enable = true;
+    gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
 
-      font = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans";
-        size = 10;
-      };
-
-      iconTheme = {
-        package = pkgs.gnome.adwaita-icon-theme;
-        name = "Adwaita-dark";
-      };
-
-      theme = {
-        package = pkgs.gnome.gnome-themes-extra;
-        name = "Adwaita-dark";
-      };
+    font = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Sans";
+      size = 10;
     };
 
-    qt = {
-      enable = true;
-      style = {
-        package = pkgs.adwaita-qt;
-        name = "adwaita-dark";
-      };
-      platformTheme.name = "adwaita";
+    iconTheme = {
+      package = pkgs.gnome.adwaita-icon-theme;
+      name = "Adwaita-dark";
+    };
+
+    theme = {
+      package = pkgs.gnome.gnome-themes-extra;
+      name = "Adwaita-dark";
     };
   };
+
+  qt = {
+    enable = true;
+    style = {
+      package = pkgs.adwaita-qt;
+      name = "adwaita-dark";
+    };
+    platformTheme.name = "adwaita";
+  };
 }

users/modules/global/vim.nix

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