update

enable nvim openscad and switch to kitty

builds/printer.nix

@@ -1,7 +1,19 @@
 { pkgs, ... }:
 
 {
-  services.printing.drivers = [ pkgs.epson-escpr ];
+  environment.systemPackages = with pkgs; [
+    gutenprint
+  ];
+
+  services.printing = {
+    enable = true;
+    listenAddresses = [ "*:631" ];
+    allowFrom = [ "all" ];
+    browsing = true;
+    defaultShared = true;
+    openFirewall = true;
+    drivers = [ pkgs.epson-escpr ];
+  };
   hardware.printers = {
     ensurePrinters = [
       {

configuration.nix

@@ -71,7 +71,6 @@ in
       defaultSession = "river";
     };
     libinput.enable = true; # Enable touchpad.
-    printing.enable = true;
   };
 
   programs = {
@@ -184,5 +183,5 @@ in
     allowUnfree = true;
     permittedInsecurePackages = [ "electron-32.3.3" ];
   };
-  system.stateVersion = "23.11";
+  system.stateVersion = "26.05";
 }

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1773403535,
+        "lastModified": 1774616169,
-        "narHash": "sha256-47MZaFrHxNO8tVUAmtVnerXUw2WWVluBOiU9MulN/yM=",
+        "narHash": "sha256-fP4bU3SOH5sefSl6EagqULFs+bXoo3h3VLQCCyJplo4=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "d45b5665cc638bad1b794350de02f4dd41b0bb47",
+        "rev": "e616c61cd9f7b05b32af266bc005fa266860dacf",
         "type": "github"
       },
       "original": {
@@ -81,6 +81,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -88,11 +106,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773962693,
+        "lastModified": 1774647770,
-        "narHash": "sha256-nf9pgktDE4E2TCavUT1vh3Nd/tfKixL1BK6P32Zp3hI=",
+        "narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9d3c1d636e7b8ab10f357cd9bee653cd400437de",
+        "rev": "02371c05a04a2876cf92e2d67a259e8f87399068",
         "type": "github"
       },
       "original": {
@@ -108,11 +126,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1773965157,
+        "lastModified": 1774656308,
-        "narHash": "sha256-u6Ceko/AQ30asd/P68Y7gD0x3LtsjiPwC31TlwVnsac=",
+        "narHash": "sha256-k+L2Q5DtNGkPy+JgfhpTxpngdxy+FVz269iNfCYVy5E=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "7e711c5abd3b0ca9c0038606edeee6bcf09b055c",
+        "rev": "114911d841b928b2b147511bec7121af310d7a23",
         "type": "github"
       },
       "original": {
@@ -124,11 +142,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1773942472,
+        "lastModified": 1774652330,
-        "narHash": "sha256-VRtGTA4WWgrVrjZg+XrnRgMcbAa0EkYkWV5Wcn76/0g=",
+        "narHash": "sha256-dqlsjRaLgD87D8YaC8842bhYziuRQ2qvTDgQDKL1ttQ=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "06befe1e348bf540bb04a8c0cafe116616e71715",
+        "rev": "f027f41e2cfba7be8c4841cb1a036827375bbd73",
         "type": "github"
       },
       "original": {
@@ -144,11 +162,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773974569,
+        "lastModified": 1774666058,
-        "narHash": "sha256-Y71Afv2mVpus+EqUj0qAwPgyaABIvEtjnUAlw5EUo3A=",
+        "narHash": "sha256-YOFC8tZvWAojaBBJHB8OD7ONUDUc9Sc8u4/TJ8s//WQ=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "5b8548f9e2cbe14146df30858bd281404957846f",
+        "rev": "4ef48e66f28308955322a92f80b6c35e42f17a1c",
         "type": "github"
       },
       "original": {
@@ -159,11 +177,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773122722,
+        "lastModified": 1773821835,
-        "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
+        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
+        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
         "type": "github"
       },
       "original": {
@@ -175,11 +193,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1773628058,
+        "lastModified": 1774273680,
-        "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=",
+        "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df",
+        "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed",
         "type": "github"
       },
       "original": {
@@ -191,11 +209,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1773821835,
+        "lastModified": 1774386573,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -207,11 +225,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1773821835,
+        "lastModified": 1774386573,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -221,6 +239,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1772419343,
+        "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -230,11 +264,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1772402258,
+        "lastModified": 1774612943,
-        "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
+        "narHash": "sha256-hRhq5cpDyBm/ZQyuzI+/YzQEVt35d/M6ko7ADfodw9s=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
+        "rev": "2b9f8e1d659d1c7664e1b85ab1620c219672696c",
         "type": "github"
       },
       "original": {
@@ -249,11 +283,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1774003391,
+        "lastModified": 1774700410,
-        "narHash": "sha256-3wzfMk2W/r0is+A6CMlHgG44hW/vIJ0NprJPNOqHYG4=",
+        "narHash": "sha256-2vvPMI78Wye6HttV+mQgX0QeaSQkNgkkbXaOXlt5uhM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "da2dd0472635372ee44134502fde664df1e5820f",
+        "rev": "560b181abe2bba9d130123a5dfa56f03c1d5be88",
         "type": "github"
       },
       "original": {
@@ -271,7 +305,29 @@
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
         "nur": "nur",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "yazi": "yazi"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "yazi",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772420823,
+        "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "sops-nix": {
@@ -281,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774154798,
+        "lastModified": 1774303811,
-        "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=",
+        "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170",
+        "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
         "type": "github"
       },
       "original": {
@@ -308,6 +364,41 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "yazi": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_5",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1774567340,
+        "narHash": "sha256-skKD1hvAvilKkK406RgNl6X/YJgkSsoZmtHmdfeoyWI=",
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "rev": "935eb6b2989f8a7ce219a2a71a539365c8dccfbb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -33,6 +33,7 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    yazi.url = "github:sxyazi/yazi";
   };
 
   outputs =
@@ -45,6 +46,7 @@
       nixvim,
       nur,
       sops-nix,
+      yazi,
       ...
     }@inputs:
     {

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;