atuin: configure accept on enter

features-nixos/optional/solokey.nix

@@ -0,0 +1,7 @@
+# config to make solokey1 work for ssh
+{...}: {
+  # services.pcscd.enable = true;
+
+  services.gnome.gcr-ssh-agent.enable = false;
+  programs.ssh.startAgent = true;
+}

flake.lock

@@ -90,11 +90,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1781627888,
+        "lastModified": 1785518313,
-        "narHash": "sha256-5yHuAh9k7rT7rtf3uRaXkiUyYvQE9oaCgzhprLm2mr8=",
+        "narHash": "sha256-anlq3YQDCsNrkNlu3HTg4dEIpRugwnyAVUxoPcBmA/U=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "6d3087eedff75a715b40c0e124ba15d2dd7bec28",
+        "rev": "b974715a27b49fadbf3bf6d85e26bcb3109daa6d",
         "type": "github"
       },
       "original": {
@@ -307,11 +307,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784350909,
+        "lastModified": 1785119570,
-        "narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=",
+        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3",
+        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
         "type": "github"
       },
       "original": {
@@ -430,11 +430,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784440659,
+        "lastModified": 1785650611,
-        "narHash": "sha256-Q5kNLlWngt7TaIIZoxDKWMHjiSaNRVqr70FqWCRRfr4=",
+        "narHash": "sha256-q4kR7g+pCcz6NASvoVPYu+CWWUurX03wogtBqGmR4h0=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "4f8d52a3598b0dc7db7a5e7b419e3edd9d1ecfdb",
+        "rev": "dbc756c9d7287de19b3e0e38c928c47510d42c3e",
         "type": "github"
       },
       "original": {
@@ -505,11 +505,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1784310968,
+        "lastModified": 1785232496,
-        "narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=",
+        "narHash": "sha256-65EQYIRRpTdpH8lUiB6Mvo5uBkG60aBIzAJuALfx+O0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "779c32a00155994c86cde8213a8dd4df139d4355",
+        "rev": "2e790b0a6be8ec2b76174ac0931b8ff11919ec98",
         "type": "github"
       },
       "original": {
@@ -536,11 +536,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1784356753,
+        "lastModified": 1785571196,
-        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
+        "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
+        "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06",
         "type": "github"
       },
       "original": {
@@ -593,11 +593,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1784280462,
+        "lastModified": 1785599192,
-        "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=",
+        "narHash": "sha256-dg4RTtDxnXY13UkJNdhmgTUTl0n/IJBlCigfO7nutZw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f",
+        "rev": "6d65bfc1bcef2ef39a239d38e577e92a89fb0f07",
         "type": "github"
       },
       "original": {
@@ -625,11 +625,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1784356753,
+        "lastModified": 1785571196,
-        "narHash": "sha256-zupdTm41be2fY8cexroEOGjopl3F2Gqs3gk7ieqaM3s=",
+        "narHash": "sha256-xwSqxTsama0YTtS78+4YyCm6jJg09v78QWfP1cAyoVA=",
-        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
+        "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1036777.61b7c44c4073/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1045728.148bab9c1c3c/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -662,11 +662,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1784456694,
+        "lastModified": 1785707827,
-        "narHash": "sha256-WjF2/HV1swc1Fwug/8Hf4jtCCQeQqdSVIT6peWB8CGs=",
+        "narHash": "sha256-H70rICsCS/cx4KR1Qryln9HJd0iVekP+8or3OCKvPT0=",
         "owner": "noctalia-dev",
         "repo": "noctalia",
-        "rev": "98f0d2b4afc2b1389d8480ce64e7f30957ff3800",
+        "rev": "5aae077a3563da6fda3fc2a2b8ce9162e3a42019",
         "type": "github"
       },
       "original": {
@@ -786,11 +786,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1784060273,
+        "lastModified": 1785677223,
-        "narHash": "sha256-14rIy2kTs5CufmDpgJrwkR+7IzuCAXyLYDAx6ixfRFc=",
+        "narHash": "sha256-3b7nQjZtdjawE+9Hreelj21B9Ef0XIoWLOsoPfv8Umk=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "2245fa9e16034149b6501834b99863a486e94725",
+        "rev": "2cb783b643c6655a01f684f272448690c9a1f529",
         "type": "github"
       },
       "original": {
@@ -990,11 +990,11 @@
     "yazi-flavors": {
       "flake": false,
       "locked": {
-        "lastModified": 1782552321,
+        "lastModified": 1785237721,
-        "narHash": "sha256-erZI0H5TxqFu2P917juL5PIB3LC0oJGKPcB1VibJDqo=",
+        "narHash": "sha256-rEoCpbb1wmvzJJXtQ6dDkBIUw/W3VWwJGBkjWhYTgYk=",
         "owner": "yazi-rs",
         "repo": "flavors",
-        "rev": "4770a3467169bfdb0a3b11601921aaf27c100630",
+        "rev": "1a5f7877c770ff4db380b0b78e0e1a2cb4206103",
         "type": "github"
       },
       "original": {

homes/julian/features/fish/default.nix

@@ -32,6 +32,30 @@ with lib; {
     enableFishIntegration = true;
   };
 
+  programs.atuin = {
+    enable = true;
+    enableFishIntegration = true;
+    daemon.enable = true;
+    settings = {
+      auto_sync = false;
+      enter_accept = true; # execute directly on enter
+      ai = {
+        enabled = true;
+        capabilites = {
+          enable_file_tools = false;
+          enable_command_execution = false;
+          enable_history_output = false;
+          enable_history_search = true;
+        };
+        opening = {
+          # The context sent to the ai
+          send_cwd = false;
+          send_last_command = false;
+        };
+      };
+    };
+  };
+
   programs.fish = {
     enable = true;
 

homes/julian/features/suites/development/default.nix

@@ -5,6 +5,8 @@
   };
 
   home.packages = with pkgs; [
+    worktrunk # interface for git worktrees
+
     watchexec # Run command when any file in current dir changes
     android-tools # adb
     # shellcheck # Check bash scripts for common errors

hosts/aspi/default.nix

@@ -24,6 +24,7 @@
     "${pwd}/features-nixos/optional/k9s"
 
     "${pwd}/features-nixos/optional/avahi.nix"
+    "${pwd}/features-nixos/optional/solokey.nix"
   ];
 
   networking.hostName = "aspi";

hosts/kardorf/default.nix

@@ -27,6 +27,7 @@
     "${pwd}/features-nixos/optional/wireshark.nix"
     "${pwd}/features-nixos/optional/flatpak.nix"
     "${pwd}/features-nixos/optional/k9s"
+    "${pwd}/features-nixos/optional/solokey.nix"
   ];
 
   networking.hostName = "kardorf";

packages/smath-studio.nix

@@ -1,17 +1,19 @@
 {
+  lib,
   appimageTools,
   fetchurl,
   libgdiplus,
 }: let
   pname = "smath-studio";
-  version = "1.3.0.9126";
+  version = "1.5.0.9678";
 
   src = fetchurl {
-    url = "https://smath.com/en-US/files/Download/cqSek/SMathStudioDesktop.1_3_0_9126.x86_64.ubuntu-22_04.glibc2.35.AppImage";
+    # The code after /Download/ changes per release
-    hash = "sha256-4FpdFGPFaPDK6WWSJHVtxcC8auaNkGmHyUtbegij6cQ=";
+    url = "https://smath.com/en-US/files/Download/c4zCE/SMathStudioDesktop.1_5_0_9678.x86_64.ubuntu-22_04.glibc2.35.AppImage";
+    hash = "sha256-6lnuRnhoH6E+jIZXSgb/Pz9wE9nVAbduDHrkKCKKH+Y=";
   };
 
-  appimageContents = appimageTools.extractType2 {
+  appimageContents = appimageTools.extract {
     inherit pname version src;
   };
 in
@@ -30,6 +32,22 @@ in
     extraInstallCommands = ''
       install -m 444 -D ${appimageContents}/*.desktop -t $out/share/applications
       sed -i "s|^Exec=.*|Exec=smath-studio %U|" $out/share/applications/*.desktop
-      cp -r ${appimageContents}/usr/share/icons $out/share
+
+      # Package icons into /apps directory
+      for icon in ${appimageContents}/usr/share/icons/hicolor/*/*.png; do
+        if [ -f "$icon" ]; then
+          size=$(basename $(dirname "$icon"))
+          install -m 444 -D "$icon" "$out/share/icons/hicolor/$size/apps/smath.png"
+        fi
+      done
     '';
+
+    meta = with lib; {
+      description = "Tiny, powerful, free mathematical program with WYSIWYG editor and complete units of measurements support";
+      homepage = "https://smath.com/";
+      license = licenses.unfree; # SMath is freeware, but closed source
+      # maintainers = with maintainers; [frajul];
+      mainProgram = "smath-studio";
+      platforms = ["x86_64-linux"];
+    };
   }