declare GDK_SCALE in host cfg

homeManagerModules/defaultApps.nix

@@ -3,107 +3,106 @@
   lib,
   pkgs,
   ...
-}: {
+}: let
-  config = let
+  cfg = config.ar.home.defaultApps;
-    cfg = config.ar.home.defaultApps;
+  inherit
-    inherit
+    (import ./mimetypes.nix)
-      (import ./mimetypes.nix)
+    audioFiles
-      audioFiles
+    browserFiles
-      browserFiles
+    documentFiles
-      documentFiles
+    editorFiles
-      editorFiles
+    imageFiles
-      imageFiles
+    videoFiles
-      videoFiles
+    ;
-      ;
+in {
-  in
+  config = lib.mkIf cfg.enable {
-    lib.mkIf cfg.enable {
+    dconf = {
-      dconf = {
+      enable = true;
-        enable = true;
+      settings = {
-        settings = {
+        "org/cinnamon/desktop/applications/terminal".exec = "${lib.getExe cfg.terminal}";
-          "org/cinnamon/desktop/applications/terminal".exec = "${lib.getExe cfg.terminal}";
+        "org/cinnamon/desktop/default-applications/terminal".exec = "${lib.getExe cfg.terminal}";
-          "org/cinnamon/desktop/default-applications/terminal".exec = "${lib.getExe cfg.terminal}";
-        };
-      };
-
-      home = {
-        packages = with cfg; [
-          audioPlayer
-          editor
-          fileManager
-          imageViewer
-          pdfViewer
-          terminal
-          terminalEditor
-          videoPlayer
-          webBrowser
-        ];
-
-        sessionVariables = {
-          BROWSER = "${lib.getExe cfg.webBrowser}";
-          EDITOR = "${lib.getExe cfg.terminalEditor}";
-          TERMINAL = "${lib.getExe cfg.terminal}";
-        };
-      };
-
-      xdg = {
-        mimeApps = {
-          enable = true;
-
-          defaultApplications = let
-            mkDefaults = files: desktopFile: lib.genAttrs files (_: [desktopFile]);
-            audioTypes =
-              mkDefaults audioFiles
-              "defaultAudioPlayer.desktop";
-
-            browserTypes =
-              mkDefaults browserFiles
-              "defaultWebBrowser.desktop";
-
-            documentTypes =
-              mkDefaults documentFiles
-              "defaultPdfViewer.desktop";
-
-            editorTypes =
-              mkDefaults editorFiles
-              "defaultEditor.desktop";
-
-            folderTypes = {"inode/directory" = "defaultFileManager.desktop";};
-
-            imageTypes =
-              mkDefaults imageFiles
-              "defaultImageViewer.desktop";
-
-            videoTypes =
-              mkDefaults videoFiles
-              "defaultVideoPlayer.desktop";
-          in
-            audioTypes
-            // browserTypes
-            // documentTypes
-            // editorTypes
-            // folderTypes
-            // imageTypes
-            // videoTypes;
-        };
-
-        desktopEntries = let
-          mkDefaultEntry = name: package: {
-            name = "Default ${name}";
-            exec = "${lib.getExe package} %U";
-            terminal = false;
-            settings = {
-              NoDisplay = "true";
-            };
-          };
-        in {
-          defaultAudioPlayer = mkDefaultEntry "Audio Player" cfg.audioPlayer;
-          defaultEditor = mkDefaultEntry "Editor" cfg.editor;
-          defaultFileManager = mkDefaultEntry "File Manager" cfg.fileManager;
-          defaultImageViewer = mkDefaultEntry "Image Viewer" cfg.imageViewer;
-          defaultPdfViewer = mkDefaultEntry "PDF Viewer" cfg.pdfViewer;
-          defaultVideoPlayer = mkDefaultEntry "Video Player" cfg.videoPlayer;
-          defaultWebBrowser = mkDefaultEntry "Web Browser" cfg.webBrowser;
-        };
       };
     };
+
+    home = {
+      packages = with cfg; [
+        audioPlayer
+        editor
+        fileManager
+        imageViewer
+        pdfViewer
+        terminal
+        terminalEditor
+        videoPlayer
+        webBrowser
+      ];
+
+      sessionVariables = {
+        BROWSER = "${lib.getExe cfg.webBrowser}";
+        EDITOR = "${lib.getExe cfg.terminalEditor}";
+        TERMINAL = "${lib.getExe cfg.terminal}";
+      };
+    };
+
+    xdg = {
+      mimeApps = {
+        enable = true;
+
+        defaultApplications = let
+          mkDefaults = files: desktopFile: lib.genAttrs files (_: [desktopFile]);
+          audioTypes =
+            mkDefaults audioFiles
+            "defaultAudioPlayer.desktop";
+
+          browserTypes =
+            mkDefaults browserFiles
+            "defaultWebBrowser.desktop";
+
+          documentTypes =
+            mkDefaults documentFiles
+            "defaultPdfViewer.desktop";
+
+          editorTypes =
+            mkDefaults editorFiles
+            "defaultEditor.desktop";
+
+          folderTypes = {"inode/directory" = "defaultFileManager.desktop";};
+
+          imageTypes =
+            mkDefaults imageFiles
+            "defaultImageViewer.desktop";
+
+          videoTypes =
+            mkDefaults videoFiles
+            "defaultVideoPlayer.desktop";
+        in
+          audioTypes
+          // browserTypes
+          // documentTypes
+          // editorTypes
+          // folderTypes
+          // imageTypes
+          // videoTypes;
+      };
+
+      desktopEntries = let
+        mkDefaultEntry = name: package: {
+          name = "Default ${name}";
+          exec = "${lib.getExe package} %U";
+          terminal = false;
+          settings = {
+            NoDisplay = "true";
+          };
+        };
+      in {
+        defaultAudioPlayer = mkDefaultEntry "Audio Player" cfg.audioPlayer;
+        defaultEditor = mkDefaultEntry "Editor" cfg.editor;
+        defaultFileManager = mkDefaultEntry "File Manager" cfg.fileManager;
+        defaultImageViewer = mkDefaultEntry "Image Viewer" cfg.imageViewer;
+        defaultPdfViewer = mkDefaultEntry "PDF Viewer" cfg.pdfViewer;
+        defaultVideoPlayer = mkDefaultEntry "Video Player" cfg.videoPlayer;
+        defaultWebBrowser = mkDefaultEntry "Web Browser" cfg.webBrowser;
+      };
+    };
+  };
 }

homeManagerModules/desktop/hyprland/default.nix

@@ -102,8 +102,6 @@
           region = "${bin} -m region -o ${folder}";
         };
 
-        gdk_scale = "1.5";
-
         clamshell = pkgs.writeShellScript "hyprland-clamshell" ''
           NUM_MONITORS=$(${hyprctl} monitors all | grep Monitor | wc --lines)
           if [ "$1" == "on" ]; then
@@ -194,9 +192,6 @@
             force_zero_scaling = true
           }
 
-          # toolkit-specific scale
-          env = GDK_SCALE,${gdk_scale}
-
           # Some default env vars.
           env = XCURSOR_SIZE,${toString config.home.pointerCursor.size}
           env = QT_QPA_PLATFORMTHEME,qt6ct

hosts/fallarbor/default.nix

@@ -18,6 +18,7 @@
     systemd-boot.enable = true;
   };
 
+  environment.variables.GDK_SCALE = "1.5";
   networking.hostName = "fallarbor";
   system.stateVersion = "24.05";
 

hosts/lavaridge/default.nix

@@ -19,8 +19,8 @@
     systemd-boot.enable = true;
   };
 
+  environment.variables.GDK_SCALE = "1.5";
   networking.hostName = "lavaridge";
-
   system.stateVersion = "24.05";
 
   ar = {

hosts/mandarin/default.nix

@@ -26,6 +26,7 @@
     };
   };
 
+  environment.variables.GDK_SCALE = "1.25";
   hardware.enableAllFirmware = true;
   networking.hostName = "mandarin";
 

hosts/mauville/default.nix

@@ -91,8 +91,8 @@ in {
     };
   };
 
+  environment.variables.GDK_SCALE = "1.25";
   system.stateVersion = "23.11";
-
   zramSwap.memoryPercent = 100;
 
   ar = {

hosts/petalburg/default.nix

@@ -18,8 +18,8 @@
     systemd-boot.enable = true;
   };
 
+  environment.variables.GDK_SCALE = "2";
   networking.hostName = "petalburg";
-
   system.stateVersion = "24.05";
 
   ar = {

hosts/rustboro/default.nix

@@ -19,6 +19,7 @@
     systemd-boot.enable = true;
   };
 
+  environment.variables.GDK_SCALE = "1.25";
   networking.hostName = "rustboro";
   system.stateVersion = "24.05";
   zramSwap.memoryPercent = 100;