A little more prose

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1787189302,
+        "lastModified": 1787169825,
-        "narHash": "sha256-cUM75Rob89qTxJvqVRF8GUewOriqQtLiyiy5xfd1fMM=",
+        "narHash": "sha256-3MmWHAzeoFHfwjUCQC01olBN+MC4xoSuR7D0bpPr+EE=",
         "owner": "sadjow",
         "repo": "claude-code-nix",
-        "rev": "8fb8cbab6345583e0b68ca7dbbbad08a0a348145",
+        "rev": "f575914388682670df73e80c9caf82063b659699",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779969295,
+        "lastModified": 1787176219,
-        "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
+        "narHash": "sha256-djoRr6jBpe35q/0JwAvXpFXg1Ktf+X54NU2RLR7wnHw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
+        "rev": "c53d643b3737e2fcd04e6cb3b3580ef50b2087a0",
         "type": "github"
       },
       "original": {
@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779604987,
+        "lastModified": 1786852476,
-        "narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=",
+        "narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "8fba98c80b48fa013820e0163c5096922fea4ddd",
+        "rev": "c7962dc97b45129df8d751bedaf37beb5a17706e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -70,7 +70,7 @@
           extraSpecialArgs = { claude-code = claude-code.packages.aarch64-darwin.default; };
         };
       homeConfigurations.home =
-        let pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
+        let pkgs = nixpkgs.legacyPackages.x86_64-linux;
             modules = modules-for-system pkgs;
         in home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
@@ -89,70 +89,6 @@
 
           extraSpecialArgs = { claude-code = claude-code.packages.x86_64-linux.default; };
         };
-      homeConfigurations.home-laptop =
+      packages.aarch64-darwin.default = modules-for-system nixpkgs.legacyPackages.aarch64-darwin;
-        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,7 +189,6 @@ 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
@@ -494,14 +493,10 @@ 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 = ''
+      extraConfig = builtins.readFile ./wezterm.lua;
-        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
@@ -726,9 +721,8 @@ 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
+#+BEGIN_SRC nix :tangle target/desktop/ghostty.nix
   {pkgs, ...}: {
     programs.ghostty = {
       enable = true;
@@ -851,8 +845,6 @@ Turn off some default settings that I don't find useful.
 
 #+BEGIN_SRC elisp
   (setopt save-interprogram-paste-before-kill t)
-  (setopt kill-whole-line t)
-  (column-number-mode t)
   (setopt enable-recursive-minibuffers t)
   (setopt line-spacing 0.15)
 
@@ -907,6 +899,22 @@ least this setting is correct.
   (setopt sentence-end-double-space nil)
 #+end_src
 
+I kill whole lines *way* more than partial lines. If the cursor is at the front of a line, this will
+just kill the whole line instead of requiring two ~C-k C-k~ presses to make it happen. I'm not sure
+when I'd ever want it to kill the line *without* the trailing newline, but I guess the one time ever
+that I do, I'll have to press two more keys :(
+
+#+begin_src elisp
+  (setopt kill-whole-line t)
+#+end_src
+
+Show column numbers in the modeline. Now that I think about it, I'm not sure why I want this. I
+guess I could try turning it off someday?
+
+#+begin_src elisp
+  (column-number-mode t)
+#+end_src
+
 Make sure which-key mode is always on. The on-the-fly keymap help it gives is indespensable.
 
 #+BEGIN_SRC elisp
@@ -2281,16 +2289,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
@@ -2330,14 +2338,13 @@ 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 = "(defvar my-base-font-size ${if pkgs.stdenv.isDarwin then "130" else "100"})" +
+      extraConfig = builtins.readFile ./emacs-theme.el;
-                    builtins.readFile ./emacs-theme.el;
     };
   }
 #+END_SRC
@@ -2349,7 +2356,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 my-base-font-size)
+  (set-face-attribute 'default 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 'fixed-pitch nil :font "Iosevka Term SS14" :height 130)
-  (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height my-base-font-size)
+  (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height 130)
 #+END_SRC