wip

flake.nix

@@ -67,7 +67,7 @@
           extraSpecialArgs = { kube = kube.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;
@@ -86,6 +86,69 @@
 
           extraSpecialArgs = { kube = kube.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; };
+        };
+      packages.x86_64-linux.default = modules-for-system nixpkgs.legacyPackages.x86_64-linux;
     };
 }

home.org

@@ -161,6 +161,7 @@ These programs require a full desktop environment:
       (iosevka-bin.override { variant = "Aile"; })
       (iosevka-bin.override { variant = "Etoile"; })
       (iosevka-bin.override { variant = "SGr-IosevkaTerm"; })
+      nerd-fonts.symbols-only
       keymapp
       proton-pass
       slack
@@ -447,10 +448,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
@@ -458,10 +463,7 @@ config in two blocks, so we can get lua syntax highlighting in org. First, the n
 Then the real lua config:
 
 #+BEGIN_SRC lua
-  local config = {}
+  config.font = wezterm.font("Iosevka Term", {stretch = "Expanded"})
-  config.default_prog = { '/Users/jfrikker/.nix-profile/bin/zsh', '-l' }
-  config.font_size = 13.0
-  -- config.font = wezterm.font("JetBrains Mono")
   config.inactive_pane_hsb = {
     saturation = 0.5,
     brightness = 0.5,
@@ -1148,7 +1150,7 @@ its own devil-mode-only repeat maps that don't interfere when using normal modif
      (setq cursor-type (cond
                         (org-present-mode nil)
                         ((or (and (featurep 'god-mode) god-local-mode) buffer-read-only
-                             (and meow-mode (not (eq 'insert meow--current-state)))) 'box)
+                             (and (featurep 'meow-mode) meow-mode (not (eq 'insert meow--current-state)))) 'box)
                         (t 'bar))))
 
    (add-hook 'post-command-hook 'my-god-mode-update-cursor-type)
@@ -1921,7 +1923,7 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
 
 #+BEGIN_SRC elisp
   (autoload 'claude-code-command-map "claude-code" :type 'keymap)
-  (keymap-global-set "C-c c" claude-code-command-map)
+  ;; (keymap-global-set "C-c c" claude-code-command-map)
 #+END_SRC
 * Theme
 I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
@@ -1976,16 +1978,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
@@ -2018,13 +2020,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
@@ -2036,7 +2039,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" :height 130 :width 'expanded)
+  (set-face-attribute 'default nil :font "Iosevka Term" :height my-base-font-size :width 'expanded)
-  (set-face-attribute 'fixed-pitch nil :font "Iosevka Term" :height 130 :width 'expanded)
+  (set-face-attribute 'fixed-pitch nil :font "Iosevka Term" :height my-base-font-size :width 'expanded)
-  (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