fixup! nixos: frp -> cloudflared

darwin/profiles/desktop/home/default.nix

@@ -5,6 +5,7 @@
   ...
 }: {
   imports = map (n: ../../../../home/applications/${n}) [
+    "alacritty"
     "go"
     "mpv"
     "nix"
@@ -31,4 +32,11 @@
     dockutil
     gawk
   ];
+
+  # macOS don't have fontconfig
+  programs = let
+    monospace = "JetBrainsMono Nerd Font";
+  in {
+    alacritty.settings.font.normal.family = monospace;
+  };
 }

darwin/profiles/desktop/packages/window-manager.nix

@@ -21,7 +21,6 @@
     skhd = {
       enable = true;
       skhdConfig = ''
-        # FIXME
         cmd - return : open -n ${pkgs.alacritty}/Applications/Alacritty.app
 
         cmd - 1 : yabai -m space --focus 1             # Focus space

home/applications/alacritty/default.nix

@@ -0,0 +1,19 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      cursor.style = "beam";
+      font.size = 10;
+
+      # workaround for scaling in X11
+      env.WINIT_X11_SCALE_FACTOR = "1";
+
+      # for zellij on macOS
+      window.option_as_alt = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "Both";
+    };
+  };
+}

home/applications/firefox/default.nix

@@ -1,16 +1,10 @@
 {pkgs, ...}: {
   programs.firefox = {
     enable = true;
-    package = pkgs.firefox.override {
+    package = pkgs.firefox.overrides {
       extraPrefsFiles = [
-        (pkgs.fetchurl {
-          url = "https://raw.githubusercontent.com/arkenfox/user.js/126.1/user.js";
-          hash = "sha256-XRtG0iLKh8uqbeX7Rc2H6VJwZYJoNZPBlAfZEfrSCP4=";
-        })
-        # FIXME: why I cannot use `[./user-overrides.js]`?
-        (pkgs.runCommand "userjs" {} ''
-          install -Dm644 ${./user-overrides.js} $out
-        '')
+        "${pkgs.arkenfox-userjs}/user.cfg"
+        ./user-overrides.js
       ];
     };
     profiles."default" = {};

home/applications/foot/default.nix

@@ -1,12 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  programs.foot = {
-    enable = true;
-    settings = {
-      main.font = "monospace:size=10";
-    };
-  };
-}

home/applications/rofi/default.nix

@@ -7,7 +7,7 @@
     enable = true;
     package = pkgs.rofi-wayland;
     font = "monospace";
-    terminal = lib.getExe pkgs.foot;
+    terminal = lib.getExe pkgs.alacritty;
   };
 
   home.packages = with pkgs; [rofi-power-menu];

home/applications/sway/default.nix

@@ -109,7 +109,7 @@
 
           ### Execute other stuff
           # Launch applications
-          "${modifier}+Return" = "exec ${lib.getExe pkgs.foot}";
+          "${modifier}+Return" = "exec alacritty";
           "${modifier}+w" = "exec ${pkgs.xdg-utils}/bin/xdg-open http:";
           "${modifier}+e" = "exec ${pkgs.xdg-utils}/bin/xdg-open ~";
 

home/applications/thunderbird/default.nix

@@ -7,10 +7,7 @@
           url = "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/d6b18302e46349d9924c8a76951bae6efca51501/user.js";
           hash = "sha256-66B1yLQkQnydAUXD7KGt32OhWSYcdWX+BUozrgW9uAg=";
         })
-        # FIXME: why I cannot use `[./user-overrides.js]`?
-        (pkgs.runCommand "userjs" {} ''
-          install -Dm644 ${./user-overrides.js} $out
-        '')
+        ./user-overrides.js
       ];
     };
     profiles.default.isDefault = true;

nixos/profiles/common/graphical/home/default.nix

@@ -6,9 +6,9 @@
       ./xdg-mime.nix
     ]
     ++ map (n: ../../../../../home/applications/${n}) [
+      "alacritty"
       "fcitx5"
       "firefox"
-      "foot"
       "go"
       "mpv"
       "nautilus"

nixos/profiles/common/graphical/home/fonts/default.nix

@@ -26,12 +26,12 @@
   # Make GTK listen to fontconfig
   dconf.settings = {
     "org/gnome/desktop/wm/preferences" = {
-      "titlebar-font" = "Sans Bold 11";
+      "titlebar-font" = "Sans Bold";
     };
     "org/gnome/desktop/interface" = {
-      "font-name" = "Sans 11";
-      "document-font-name" = "Sans 11";
-      "monospace-font-name" = "Monospace 10";
+      "font-name" = "Sans";
+      "document-font-name" = "Sans";
+      "monospace-font-name" = "Monospace";
     };
   };
 

overlays/default.nix

@@ -4,58 +4,9 @@ let
       patches = (old.patches or []) ++ patches;
     });
 in {
-  patches = _final: prev: {
-    gnome =
-      prev.gnome
-      // {
-        # https://aur.archlinux.org/pkgbase/nautilus-typeahead
-        nautilus = prev.gnome.nautilus.overrideAttrs {
-          src = prev.fetchFromGitLab {
-            domain = "gitlab.gnome.org";
-            owner = "albertvaka";
-            repo = "nautilus";
-            rev = "f5f593bf36c41756a29d5112a10cf7ec70b8eafb";
-            hash = "sha256-PfkCY2gQ8jfPIgTRC9Xzxh4N3f2oB339Hym5RCbKwkw=";
-          };
-
-          # Enable type-ahead behavior by default
-          postPatch = ''
-            awk -i inplace '/type-ahead-search/{c++;} c==1 && /true/{sub("true", "false"); c++;} 1' data/org.gnome.nautilus.gschema.xml
-          '';
-        };
-      };
-
-    sway-unwrapped = addPatches prev.sway-unwrapped [
-      # text_input: Implement input-method popups
-      # https://github.com/swaywm/sway/pull/7226
-      (prev.fetchpatch rec {
-        name = "0001-text_input-Implement-input-method-popups.patch";
-        url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94";
-        hash = "sha256-A+rBaWMWs616WllVoo21AJaf9lxg/oCG0b9tHLfuJII=";
-      })
-      (prev.fetchpatch rec {
-        name = "0002-chore-fractal-scale-handle.patch";
-        url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94";
-        hash = "sha256-YOFm0A4uuRSuiwnvF9xbp8Wl7oGicFGnq61vLegqJ0E=";
-      })
-      (prev.fetchpatch rec {
-        name = "0003-chore-left_pt-on-method-popup.patch";
-        url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94";
-        hash = "sha256-PzhQBRpyB1WhErn05UBtBfaDW5bxnQLRKWu8jy7dEiM=";
-      })
-
-      # Tray D-Bus Menu
-      # https://github.com/swaywm/sway/pull/6249
-      (prev.fetchpatch {
-        name = "0001-Tray-Implement-dbusmenu.patch";
-        url = "https://github.com/NickHu/sway/commit/0fc5d7aed84415a77b718ca9dc3c0b3ad2c05b02.patch";
-        hash = "sha256-1KuGZGwyGJK8KO4OngS+tWKV/3Yu++bCNnp+xTrlGoY=";
-      })
-      (prev.fetchpatch {
-        name = "0002-Tray-dont-invoke-dbus-menu-when-tray-is-disabled.patch";
-        url = "https://github.com/NickHu/sway/commit/03c14421354e54332e12f78d029dcaa9919fd161.patch";
-        hash = "sha256-GhBlCnk7aB6s57wV1FNOPAt6s0oJxLgf2bMw+8ktn8A=";
-      })
-    ];
-  };
+  patches = _final: prev:
+    {}
+    // import ./nautilus.nix {inherit addPatches prev;}
+    // import ./prismlauncher.nix {inherit addPatches prev;}
+    // import ./sway.nix {inherit addPatches prev;};
 }

overlays/nautilus.nix

@@ -0,0 +1,21 @@
+{prev, ...}: {
+  gnome =
+    prev.gnome
+    // {
+      # https://aur.archlinux.org/pkgbase/nautilus-typeahead
+      nautilus = prev.gnome.nautilus.overrideAttrs {
+        src = prev.fetchFromGitLab {
+          domain = "gitlab.gnome.org";
+          owner = "albertvaka";
+          repo = "nautilus";
+          rev = "f5f593bf36c41756a29d5112a10cf7ec70b8eafb";
+          hash = "sha256-PfkCY2gQ8jfPIgTRC9Xzxh4N3f2oB339Hym5RCbKwkw=";
+        };
+
+        # Enable type-ahead behavior by default
+        postPatch = ''
+          awk -i inplace '/type-ahead-search/{c++;} c==1 && /true/{sub("true", "false"); c++;} 1' data/org.gnome.nautilus.gschema.xml
+        '';
+      };
+    };
+}

overlays/prismlauncher.nix

@@ -0,0 +1,14 @@
+{
+  addPatches,
+  prev,
+  ...
+}: {
+  prismlauncher = addPatches prev.prismlauncher [
+    # Offline mode for Prism Launcher
+    # https://github.com/Misterio77/nix-config/blob/main/overlays/offline-mode-prism-launcher.diff
+    (prev.fetchpatch {
+      url = "https://raw.githubusercontent.com/Misterio77/nix-config/ac1d7bbcafb6be75e94448c7ae7a94d460e3129d/overlays/offline-mode-prism-launcher.diff";
+      hash = "sha256-vMcAvhD0Ms4Tvwpzs/YfORc8ki7MNMurdJJ/yswfxFM=";
+    })
+  ];
+}

overlays/sway.nix

@@ -0,0 +1,38 @@
+{
+  addPatches,
+  prev,
+  ...
+}: {
+  sway-unwrapped = addPatches prev.sway-unwrapped [
+    # text_input: Implement input-method popups
+    # https://github.com/swaywm/sway/pull/7226
+    (prev.fetchpatch rec {
+      name = "0001-text_input-Implement-input-method-popups.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94";
+      hash = "sha256-A+rBaWMWs616WllVoo21AJaf9lxg/oCG0b9tHLfuJII=";
+    })
+    (prev.fetchpatch rec {
+      name = "0002-chore-fractal-scale-handle.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94";
+      hash = "sha256-YOFm0A4uuRSuiwnvF9xbp8Wl7oGicFGnq61vLegqJ0E=";
+    })
+    (prev.fetchpatch rec {
+      name = "0003-chore-left_pt-on-method-popup.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94";
+      hash = "sha256-PzhQBRpyB1WhErn05UBtBfaDW5bxnQLRKWu8jy7dEiM=";
+    })
+
+    # Tray D-Bus Menu
+    # https://github.com/swaywm/sway/pull/6249
+    (prev.fetchpatch {
+      name = "0001-Tray-Implement-dbusmenu.patch";
+      url = "https://github.com/NickHu/sway/commit/0fc5d7aed84415a77b718ca9dc3c0b3ad2c05b02.patch";
+      hash = "sha256-1KuGZGwyGJK8KO4OngS+tWKV/3Yu++bCNnp+xTrlGoY=";
+    })
+    (prev.fetchpatch {
+      name = "0002-Tray-dont-invoke-dbus-menu-when-tray-is-disabled.patch";
+      url = "https://github.com/NickHu/sway/commit/03c14421354e54332e12f78d029dcaa9919fd161.patch";
+      hash = "sha256-GhBlCnk7aB6s57wV1FNOPAt6s0oJxLgf2bMw+8ktn8A=";
+    })
+  ];
+}