Update flake.lock 2025-04-28

.sops.yaml

@@ -1,7 +1,7 @@
 keys:
   - &primary age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg
   - &aspi-ssh age1q8lc5340gz5xw2f57nglrss68wv0j0hf36py2pdtrl6ky3yrq9qqk0njr4
-  - &builder-ssh age1kw4kmdm45zprvdkrrpvgq966l7585vhusmum083qlwnr0xxgd3uqatcyja
+  - &builder-ssh age1vwanu6jm80jzwe78jzz7z9vuzlg94tl7rpdg34vjmxcrnhddxu9q5zaf49
   - &kardorf-ssh age15lxw97z03q40xrdscnxqqugh5ky5aqrerg2t2rphkcqm6rnllurq8v98q5
 
 creation_rules:

Readme.org

@@ -42,5 +42,5 @@ sops updatekeys secrets/*
 - Set password for root
   
 #+begin_src sh
-nix run github:nix-community/nixos-anywhere -- --flake .#builder --target-host root@<ip>
+nix run github:nix-community/nixos-anywhere -- --flake git+https://gitlab.julian-mutter.de/julian/dotfiles.git#builder --target-host root@<ip>
 #+end_src

features-nixos/global/locale.nix

@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
@@ -23,4 +23,18 @@
   console.keyMap = "de";
 
   time.timeZone = "Europe/Berlin";
+
+  ## Japanese input, env vars and servic start are configured in hyprland config
+  ## Configure via program fcitx5-configuration
+  ## There, add the mozc input for japanese
+  ## This could also be done declaratively in this config, see: https://wiki.nixos.org/wiki/Fcitx5
+  i18n.inputMethod = {
+    enable = true;
+    type = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-mozc
+      fcitx5-gtk # Ensures IME works in GTK applications
+    ];
+    fcitx5.waylandFrontend = true; # compability with wayland
+  };
 }

features-nixos/optional/binarycaches.nix

@@ -18,7 +18,7 @@
     trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      "binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
+      "binarycache.julian-mutter.de:7RB4Sif4WQU76XWIsRJ2KtKa45zg1QOTHEkUhi/JBe8="
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
       "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="

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.nix

@@ -25,6 +25,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    vortix = {
+      url = "github:Harry-kp/vortix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     home-manager = {
       url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";

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/hyprland/hyprland.lua

@@ -7,6 +7,7 @@ hl.on("hyprland.start", function()
 	-- hl.exec_cmd("waybar")
 	hl.exec_cmd("env QT_QPA_PLATFORMTHEME=qt5ct noctalia-shell") -- env ensures noctalia works alongside kde
 	hl.exec_cmd("firefox")
+	hl.exec_cmd("fcitx5 -d -r")
 end)
 hl.on("config.reloaded", function()
 	hl.exec_cmd("correct-workspace-locations")
@@ -18,6 +19,10 @@ end)
 
 -- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Environment-variables/
 hl.env("TERMINAL", terminal) -- e.g. for emacs
+-- Use fcitx for optional japanese input
+hl.env("XMODIFIERS", "@im=fcitx")
+hl.env("QT_IM_MODULE", "fcitx")
+hl.env("SDL_IM_MODULE", "fcitx")
 
 -----------------------
 ----- PERMISSIONS -----

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

@@ -18,6 +18,11 @@
   };
 
   home.packages = with pkgs; [
+    (anki.withAddons [
+      ankiAddons.anki-connect
+      ankiAddons.passfail2
+      ankiAddons.review-heatmap
+    ])
     arandr
     calibre # ebook manager and viewer
     # digikam

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

@@ -1,10 +1,18 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   programs.opencode = {
     enable = true;
     package = pkgs.unstable.opencode;
   };
 
   home.packages = with pkgs; [
+    inputs.vortix.packages.${pkgs.system}.default # tui for wireguard
+
+    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";
@@ -31,6 +32,9 @@
 
   # networking.firewall.checkReversePath = false; # Makes wg interface with all ips work
 
+  programs.ausweisapp.enable = true;
+  programs.ausweisapp.openFirewall = true; # for pairing with smartphone
+
   modules = {
     syncthing = {
       enable = true;

hosts/builder/default.nix

@@ -32,7 +32,7 @@
     secretsFile = ./secrets.yaml;
   };
   frajul.gitea-runner = {
-    enable = false;
+    enable = true;
     secretsFile = ./secrets.yaml;
   };
 
@@ -181,9 +181,10 @@
   };
 
   # =========== Binary Cache ==========
+  sops.secrets."nix_serve_key".sopsFile = ./secrets.yaml;
   services.nix-serve = {
     enable = true;
-    secretKeyFile = "/var/cache-priv-key.pem";
+    secretKeyFile = config.sops.secrets."nix_serve_key".path;
   };
 
   # =========== Binary Cache with attic ==========

hosts/builder/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINgH+4xJMk4K5uBIq4hKwar4wt6GYCRE3Z2S4HETc4TK root@builder

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";
@@ -35,6 +36,16 @@
   # Not using the drivers leads to way better results
   # services.xserver.videoDrivers = [ "nvidia" ];
 
+  programs.ausweisapp.enable = true;
+  programs.ausweisapp.openFirewall = true; # for pairing with smartphone
+
+  modules = {
+    syncthing = {
+      enable = true;
+      overrideSettings = false;
+    };
+  };
+
   networking.networkmanager.insertNameservers = ["192.168.3.252"];
 
   programs.kdeconnect.enable = true;

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"];
+    };
   }