Fixing apheleia error on load

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1787169825,
+        "lastModified": 1789074092,
-        "narHash": "sha256-3MmWHAzeoFHfwjUCQC01olBN+MC4xoSuR7D0bpPr+EE=",
+        "narHash": "sha256-QCXTUbd4FuwOHO7LgJws78YTRcco4xgR8RoYgKLvd9w=",
         "owner": "sadjow",
         "repo": "claude-code-nix",
-        "rev": "f575914388682670df73e80c9caf82063b659699",
+        "rev": "1f88b393ac054378c393f914dc83d08a6ef5daeb",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787176219,
+        "lastModified": 1789144075,
-        "narHash": "sha256-djoRr6jBpe35q/0JwAvXpFXg1Ktf+X54NU2RLR7wnHw=",
+        "narHash": "sha256-zD31BI5PqEdLRCSdtlwlbAOPCdmg6sFW+/fmGRSeG3I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c53d643b3737e2fcd04e6cb3b3580ef50b2087a0",
+        "rev": "61b08afca39cc9afe69a47cdd82fbb305899b106",
         "type": "github"
       },
       "original": {
@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786852476,
+        "lastModified": 1788680125,
-        "narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=",
+        "narHash": "sha256-amGSoDobwmp4CFvCn841ws2iuitus+HUJdD/gKgsrJA=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "c7962dc97b45129df8d751bedaf37beb5a17706e",
+        "rev": "116ad1c2adb642405ef8916f6a94c8626f971344",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787101114,
+        "lastModified": 1789009968,
-        "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
+        "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
+        "rev": "d58a46e3bc02d91ebe04667f8397752a749c0024",
         "type": "github"
       },
       "original": {

flake.nix

@@ -70,7 +70,7 @@
           extraSpecialArgs = { claude-code = claude-code.packages.aarch64-darwin.default; };
         };
       homeConfigurations.home =
-        let pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        let pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
             modules = modules-for-system pkgs;
         in home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
@@ -89,6 +89,70 @@
 
           extraSpecialArgs = { claude-code = claude-code.packages.x86_64-linux.default; };
         };
-      packages.aarch64-darwin.default = modules-for-system nixpkgs.legacyPackages.aarch64-darwin;
+      homeConfigurations.home-laptop =
+        let pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
+            modules = modules-for-system pkgs;
+        in home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+          
+          modules =
+            [
+              nix-index-database.homeModules.default
+            ] ++
+            (pkgs.lib.filter 
+              (n: pkgs.lib.strings.hasSuffix ".nix" n)
+              (pkgs.lib.filesystem.listFilesRecursive "${modules}/base")) ++
+            (pkgs.lib.filter 
+              (n: pkgs.lib.strings.hasSuffix ".nix" n)
+              (pkgs.lib.filesystem.listFilesRecursive "${modules}/desktop")) ++
+            [{
+              home.stateVersion = "22.05";
+              home.username = "jfrikker";
+              home.homeDirectory = "/home/jfrikker";
+              # home.packages = [ pkgs.pinentry ];
+
+              programs.ghostty = {
+                enable = true;
+                settings = {
+                  font-family = "Iosevka Term Extended";
+                  font-size = 10;
+                };
+              };
+
+              programs.foot = {
+                enable = true;
+                settings = {
+                  main = {
+                    font = "Iosevka Term:size=10:width=expanded";
+                  };
+                };
+              };
+
+              home.pointerCursor = {
+                enable = true;
+                package = pkgs.vanilla-dmz;
+                name = "Vanilla-DMZ";
+                sway.enable = true;
+                gtk.enable = true;
+              };
+              
+              wayland.windowManager.sway = {
+                enable = true;
+                config.modifier = "Mod4";
+                # config.terminal = "${pkgs.ghostty}/bin/ghostty";
+                config.input = {
+                  "1452:628:bcm5974" = {
+                    scroll_factor = "0.4";
+                  };
+                };
+              };
+
+              programs.emacs.package = pkgs.emacs-pgtk;
+            }];
+
+          # extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
+          extraSpecialArgs = { claude-code = claude-code.packages.x86_64-linux.default; };
+        };
+      packages.x86_64-linux.default = modules-for-system nixpkgs.legacyPackages.x86_64-linux;
     };
 }

home.org

@@ -189,6 +189,7 @@ These programs require a full desktop environment:
       (iosevka-bin.override { variant = "Aile"; })
       (iosevka-bin.override { variant = "Etoile"; })
       (iosevka-bin.override { variant = "SGr-IosevkaTermSS14"; })
+      nerd-fonts.symbols-only
       keymapp
       proton-pass
       wireshark
@@ -493,10 +494,14 @@ in case I need it later.
 config in two blocks, so we can get lua syntax highlighting in org. First, the nix configuration:
 
 #+BEGIN_SRC nix :tangle target/desktop/wezterm.nix
-  {
+  {pkgs, ...}: {
     programs.wezterm = {
       enable = true;
-      extraConfig = builtins.readFile ./wezterm.lua;
+      extraConfig = ''
+        local config = {}
+        config.default_prog = { '${pkgs.zsh}/bin/zsh', '-l'}
+        config.font_size = ${if pkgs.stdenv.isDarwin then "13.0" else "10.0"}
+        '' + builtins.readFile ./wezterm.lua;
     };
   }
 #+END_SRC
@@ -721,8 +726,9 @@ Now we'll set up some keybindings:
 #+END_SRC
 
 ** Ghostty
+Disabled until I can get it working on both linux and mac (if I want to).
 
-#+BEGIN_SRC nix :tangle target/desktop/ghostty.nix
+#+BEGIN_SRC nix
   {pkgs, ...}: {
     programs.ghostty = {
       enable = true;
@@ -1263,18 +1269,12 @@ content to be.
   (setopt split-width-threshold 200)
   (setopt split-height-threshold nil)
   (setopt display-buffer-base-action
-   '((display-buffer-reuse-window display-buffer-same-window
+          '((display-buffer-reuse-window
-      display-buffer-in-previous-window
+             display-buffer-reuse-mode-window
              display-buffer-use-some-window)))
 
   (setq display-buffer-alist
-            '(((or "magit: *"
+        '(((or "\\*Flymake diagnostics .*"
-                   "magit-log*"
-                   "\\*Messages\\*"
-                   "\\*trace-output\\*"
-                   "\\*EGLOT connections\\*")
-               (jf/display-buffer-fullscreen))
-              ((or "\\*Flymake diagnostics .*"
                "\\*Embark Export: .*"
                "\\*Embark Collect .*"
                "\\*xref\\*"
@@ -1288,10 +1288,13 @@ content to be.
            (display-buffer-in-side-window)
            (side . bottom)
            (slot . 0)
-               (window-height . 0.33)
+           (window-height . 0.33))
-               (window-parameters (no-delete-other-windows . t)
+          ((or "magit: *"
-                                  (no-other-window . t)))
+               "magit-log*"
-              ((or "magit-revision: .*"
+               "\\*Messages\\*"
+               "\\*trace-output\\*"
+               "\\*EGLOT connections\\*"
+               "magit-revision: .*"
                "\\*Help\\*"
                "\\*rustfmt\\*"
                "\\*slack: .*"
@@ -1302,7 +1305,9 @@ content to be.
                "\\*List .*"
                "\\*Embark Actions\\*"
                "\\*eldoc\\*")
-               (jf/display-buffer-right))))
+           (display-buffer-reuse-window
+            display-buffer-reuse-mode-window
+            jf/display-buffer-right))))
 
   (setopt window-persistent-parameters
           (cl-list* '(no-delete-other-windows . writable)
@@ -1323,10 +1328,10 @@ This configuration affects general text editing, across all modes. First, some p
     programs.emacs = {
       enable = true;
       extraPackages = epkgs: with epkgs; [
+        apheleia
         avy
         edit-indirect
         embark
-        format-all
         god-mode
         # evil
         # evil-collection
@@ -1440,6 +1445,13 @@ Just "silently" wrap when searching at the bottom of a document.
   (bind-keys ("C-x 4 n" . edit-indirect-region))
 #+END_SRC
 
+Some auto-formatting stuff
+
+#+begin_src elisp
+  (with-eval-after-load 'apheleia
+    (push '(prisma-format "prisma" "format" "--schema" filepath) apheleia-formatters))
+#+end_src
+
 ** Workflow
 :PROPERTIES:
 :header-args:elisp: :tangle target/desktop/emacs-workflow.el
@@ -2289,16 +2301,16 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
     xdg = {
       enable = false
 ;
-      configFile."lazygit/config.yml" = {
+      # configFile."lazygit/config.yml" = {
-        enable = true;
+      #   enable = true;
-        source = pkgs.fetchFromGitHub
+      #   source = pkgs.fetchFromGitHub
-          {
+      #     {
-            owner = "catppuccin";
+      #       owner = "catppuccin";
-            repo = "lazygit";
+      #       repo = "lazygit";
-            rev = "b2ecb6d41b6f54a82104879573c538e8bdaeb0bf"; # Replace with the latest commit hash
+      #       rev = "b2ecb6d41b6f54a82104879573c538e8bdaeb0bf"; # Replace with the latest commit hash
-            sha256 = "9BBmWRcjNaJE9T0RKVEJaSnkrbMom0CLYE8PzAT6yFw=";
+      #       sha256 = "9BBmWRcjNaJE9T0RKVEJaSnkrbMom0CLYE8PzAT6yFw=";
-          } + /themes/frappe.yml;
+      #     } + /themes/frappe.yml;
-      };
+      # };
     };
   }
 #+END_SRC
@@ -2338,13 +2350,14 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
 :END:
 
 #+BEGIN_SRC nix :tangle target/desktop/emacs-theme.nix
-  {
+  {pkgs, ...}: {
     programs.emacs = {
       enable = true;
       extraPackages = epkgs: with epkgs; [
         catppuccin-theme
       ];
-      extraConfig = builtins.readFile ./emacs-theme.el;
+      extraConfig = "(defvar my-base-font-size ${if pkgs.stdenv.isDarwin then "130" else "100"})" +
+                    builtins.readFile ./emacs-theme.el;
     };
   }
 #+END_SRC
@@ -2356,7 +2369,7 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
 
   ;; (set-face-attribute 'default nil :font "JetBrainsMono Nerd Font" :height 130)
   ;; (set-face-attribute 'fixed-pitch nil :font "JetBrainsMono Nerd Font" :height 130)
-  (set-face-attribute 'default nil :font "Iosevka Term SS14" :height 130)
+  (set-face-attribute 'default nil :font "Iosevka Term SS14" :height my-base-font-size)
-  (set-face-attribute 'fixed-pitch nil :font "Iosevka Term SS14" :height 130)
+  (set-face-attribute 'fixed-pitch nil :font "Iosevka Term SS14" :height my-base-font-size)
-  (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height 130)
+  (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height my-base-font-size)
 #+END_SRC