openscad & kitty

enable nvim openscad and switch to kitty

home/default.nix

@@ -52,7 +52,7 @@
       sops
     ];
 
-    stateVersion = "23.11";
+    stateVersion = "26.05";
   };
 
   programs.home-manager.enable = true;

home/programs/alacritty.nix

@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    fira-code
-  ];
-
-  programs.alacritty = {
-    enable = true;
-
-    settings.font = {
-      size = 8;
-      normal.family = "Fira Code";
-      bold.family = "Fira Code";
-      italic.family = "Fira Code";
-    };
-  };
-}

home/programs/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./3dprint.nix
-    ./alacritty.nix
     ./anki.nix
     ./calibre.nix
     ./digikam.nix
@@ -11,6 +10,7 @@
     ./hyprlock.nix
     ./imv.nix
     ./inkscape.nix
+    ./kitty.nix
     ./libreoffice.nix
     ./messenger.nix
     ./nixvim

home/programs/filebrowser.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   home.packages = with pkgs; [
@@ -8,8 +8,57 @@
     kdePackages.baloo
     nautilus
     udisks
-    yazi
   ];
   xdg.configFile."menus/applications.menu".source =
     "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
+
+  # ── Yazi ──────────────────────────────────────────────────────────────
+  programs.yazi = {
+    enable = true;
+    package = inputs.yazi.packages.${pkgs.stdenv.hostPlatform.system}.default;
+    enableZshIntegration = true;
+    settings = {
+      yazi = {
+        ratio = [
+          1
+          4
+          3
+        ];
+        sort_by = "natural";
+        sort_sensitive = true;
+        sort_reverse = false;
+        sort_dir_first = true;
+        linemode = "none";
+        show_hidden = true;
+        show_symlink = true;
+      };
+
+      preview = {
+        image_filter = "lanczos3";
+        image_quality = 90;
+        tab_size = 1;
+        max_width = 600;
+        max_height = 900;
+        cache_dir = "";
+        ueberzug_scale = 1;
+        ueberzug_offset = [
+          0
+          0
+          0
+          0
+        ];
+      };
+
+      tasks = {
+        micro_workers = 5;
+        macro_workers = 10;
+        bizarre_retry = 5;
+      };
+    };
+  };
+
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+  };
 }

home/programs/kitty.nix

@@ -11,6 +11,11 @@
 
   programs.kitty = {
     enable = true;
+    font = {
+      size = 6;
+      name = "Fira Code";
+      package = pkgs.fira-code;
+    };
     settings = {
       clear_all_shortcuts = true;
       enabled_layouts = "splits:slit_axis=horizontal,stack";

home/programs/nixvim/plugins/conform.nix

@@ -50,12 +50,6 @@
           tex = [
             "tex-fmt"
           ];
-          openscad = [
-            "squeeze_blanks"
-            "trim_whitespace"
-            "trim_newlines"
-            "scadstyle"
-          ];
           "_" = [
             "squeeze_blanks"
             "trim_whitespace"
@@ -103,15 +97,6 @@
           tex-fmt = {
             command = "tex-fmt";
           };
-          scadstyle = {
-            "inherit" = true;
-            prepend_args = [
-              "--indent-type"
-              "Spaces"
-              "--indent-width"
-              "2"
-            ];
-          };
         };
       };
     };

home/programs/nixvim/plugins/openscad.nix

@@ -1,5 +1,17 @@
 { ... }:
 
 {
-  programs.nixvim.plugins.openscad.enable = true;
+  programs.nixvim.plugins.openscad = {
+    enable = true;
+    luaConfig.post = ''
+      vim.g.openscad_fuzzy_finder = 'skim'
+      -- when the pdf_command is run, the last argument will be the pdf filename
+      vim.g.openscad_pdf_command = 'zathura'
+      vim.g.openscad_cheatsheet_window_blend = 15 --%
+      vim.g.openscad_load_snippets = false
+      -- should the openscad project automatically be opened on startup
+      vim.g.openscad_auto_open = false
+      vim.g.openscad_default_mappings = true
+    '';
+  };
 }

home/programs/river/default.nix

@@ -66,7 +66,7 @@
         };
         map = {
           normal = {
-            "Super+Shift Return" = "spawn alacritty";
+            "Super+Shift Return" = "spawn kitty";
             # System
             "Super P" = "spawn 'rofi -show drun'";
             "Super+Shift C" = "close";

home/themes/catppuccin/default.nix

@@ -14,7 +14,7 @@ in
     ./hyprlock.nix
     ./nvim.nix
     ./taskwarrior.nix
-    # ./qt.nix
+    ./qt.nix
   ];
 
   catppuccin = {
@@ -22,12 +22,12 @@ in
     flavor = "mocha";
     accent = "pink";
 
-    alacritty.enable = true;
     anki.enable = true;
     element-desktop.enable = true;
     firefox.enable = true;
     fzf.enable = true;
     imv.enable = true;
+    kitty.enable = true;
     lazygit.enable = true;
     rofi.enable = true;
     spotify-player.enable = true;