Update flake.lock 2025-04-28

.sops.yaml

@@ -1,17 +1,15 @@
 keys:
   - &primary age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg
   - &aspi-ssh age1q8lc5340gz5xw2f57nglrss68wv0j0hf36py2pdtrl6ky3yrq9qqk0njr4
-  - &pianonix-ssh age1tguyu2yd5xv8rgjjl50cq6dq5rr7umqgv098dgre4u9wyj30ea7sexw62c
   - &builder-ssh age1kw4kmdm45zprvdkrrpvgq966l7585vhusmum083qlwnr0xxgd3uqatcyja
   - &kardorf-ssh age15lxw97z03q40xrdscnxqqugh5ky5aqrerg2t2rphkcqm6rnllurq8v98q5
 
 creation_rules:
-  - path_regex: hosts/common/secrets.yaml$
+  - path_regex: hosts/secrets-common.yaml$
     key_groups:
     - age:
       - *primary
       - *aspi-ssh
-      - *pianonix-ssh
       - *kardorf-ssh
 
   - path_regex: hosts/builder/secrets.yaml$
@@ -19,9 +17,3 @@ creation_rules:
     - age:
       - *primary
       - *builder-ssh
-
-  - path_regex: hosts/pianonix/secrets*
-    key_groups:
-    - age:
-      - *primary
-      - *pianonix-ssh

Readme.org

@@ -1,7 +1,12 @@
 #+title: My dotfiles
 
-My dotfiles for which I am using =nix=.
-The structure is managed by [[https://snowfall.org/guides/lib/quickstart/][Snowfall lib]]
+* Quick start for home-manger only (no need to pull this repo)
+- Install nix using the https://github.com/DeterminateSystems/nix-installer
+- Then run
+ #+begin_src shell
+nix run nixpkgs#home-manager -- switch --flake git+https://gitlab.julian-mutter.de/julian/dotfiles.git#julian@quickstart
+ #+end_src 
+- Done
 
 * Machine selection
 =home-manager= automatically searches for =user= or =user@hostname= config in the flake, so specify one of those or you will have to manually specify them:

features-nixos/global/nix.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  outputs,
-  ...
-}: {
+{outputs, ...}: {
   # Apply overlays
   nixpkgs = {
     # TODO: apply this to hm and nixos without duplicate code
@@ -32,10 +28,12 @@
     automatic = true;
     dates = "weekly";
     options = "--delete-older-than 30d";
+    persistent = true;
   };
   nix.optimise = {
     automatic = true;
     dates = ["weekly"]; # Optional; allows customizing optimisation schedule
+    persistent = true;
   };
 
   programs.nix-ld.enable = true;

features-nixos/global/sops.nix

@@ -1,4 +1,5 @@
 {
+  pwd,
   inputs,
   config,
   ...
@@ -18,5 +19,5 @@ in {
     generateKey = false; # TODO: building should not work without secrets!?
   };
 
-  sops.defaultSopsFile = ../secrets.yaml;
+  sops.defaultSopsFile = "${pwd}/hosts/secrets-common.yaml";
 }

features-nixos/optional/wireshark.nix

@@ -0,0 +1,9 @@
+{
+  programs.wireshark = {
+    enable = true;
+    dumpcap.enable = true;
+    usbmon.enable = true;
+  };
+
+  users.users.julian.extraGroups = ["wireshark"];
+}

features-nixos/users/julian/default.nix

@@ -1,4 +1,5 @@
 {
+  pwd,
   pkgs,
   config,
   lib,
@@ -29,7 +30,7 @@ in {
     ];
 
     openssh.authorizedKeys.keys = lib.splitString "\n" (
-      builtins.readFile ../../../../homes/julian/ssh.pub
+      builtins.readFile ./ssh.pub
     );
     # hashedPasswordFile = config.sops.secrets.julian-password.path;
     hashedPassword = "$y$j9T$N33kLJQbV8soUoCbDkpwA1$r/yahJDgOPo4GGOrAi6BUG5zLTzmaBrA5NQ4nno561A";
@@ -40,11 +41,11 @@ in {
   };
 
   sops.secrets.julian-password = {
-    sopsFile = ../../secrets.yaml;
+    sopsFile = "${pwd}/hosts/secrets-common.yaml";
     neededForUsers = true;
   };
 
-  home-manager.users.julian = import ../../../../homes/julian/${config.networking.hostName}.nix;
+  home-manager.users.julian = import "${pwd}/homes/julian/${config.networking.hostName}.nix";
 
   security.pam.services.swaylock = {}; # Make swaylock unlocking work
 }

flake.nix

@@ -19,6 +19,10 @@
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -72,10 +76,6 @@
         import nixpkgs {
           inherit system;
           config.allowUnfree = true;
-          config.permittedInsecurePackages = [
-            "olm-3.2.16"
-          ];
-          warn-dirty = false;
         }
     );
   in {
@@ -85,75 +85,40 @@
     homeManagerModules = import ./modules/home-manager;
 
     overlays = import ./overlays {inherit inputs outputs;};
-    # hydraJobs = import ./hydra.nix { inherit inputs outputs; }; # TODO add hydra jobs here?
 
-    packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;});
+    packages = forEachSystem (pkgs: import ./packages {inherit pkgs;});
     devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
     formatter = forEachSystem (pkgs: pkgs.alejandra); # nix fmt *
 
     nixosConfigurations = {
       # Main laptop
       aspi = lib.nixosSystem {
-        modules = [./hosts/aspi];
+        modules = [
+          ./hosts/aspi
+        ];
         specialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
-      # Piano raspberry pi
-      # pianonix = lib.nixosSystem {
-      #   modules = [./hosts/pianonix];
-      #   specialArgs = {
-      #     inherit inputs outputs;
-      #   };
-      # };
       kardorf = lib.nixosSystem {
         modules = [./hosts/kardorf];
         specialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
       builder = lib.nixosSystem {
         modules = [./hosts/builder];
         specialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
     };
 
     # Standalone HM
     homeConfigurations = {
-      # Main laptop
-      "julian@aspi" = lib.homeManagerConfiguration {
-        modules = [
-          ./homes/julian/aspi.nix
-          ./homes/julian/hm-standalone-config.nix
-        ];
-        pkgs = pkgsFor.x86_64-linux;
-        extraSpecialArgs = {
-          inherit inputs outputs;
-        };
-      };
-      # Media server (RPi)
-      # "julian@pianonix" = lib.homeManagerConfiguration {
-      #   modules = [
-      #     ./homes/julian/pianonix.nix
-      #     ./homes/julian/hm-standalone-config.nix
-      #   ];
-      #   pkgs = pkgsFor.aarch64-linux;
-      #   extraSpecialArgs = {
-      #     inherit inputs outputs;
-      #   };
-      # };
-      "julian@kardorf" = lib.homeManagerConfiguration {
-        modules = [
-          ./homes/julian/kardorf.nix
-          ./homes/julian/hm-standalone-config.nix
-        ];
-        pkgs = pkgsFor.x86_64-linux;
-        extraSpecialArgs = {
-          inherit inputs outputs;
-        };
-      };
       "julian@v3ms" = lib.homeManagerConfiguration {
         modules = [
           ./homes/julian/v3ms
@@ -162,32 +127,24 @@
         pkgs = pkgsFor.x86_64-linux;
         extraSpecialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
-      "julian@v3ms07" = lib.homeManagerConfiguration {
+      "julian@quickstart" = lib.homeManagerConfiguration {
         modules = [
-          ./homes/julian/v3ms07
+          ./homes/julian/quickstart.nix
           ./homes/julian/hm-standalone-config.nix
         ];
         pkgs = pkgsFor.x86_64-linux;
         extraSpecialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
     };
 
     # deploy-rs node configuration
     deploy.nodes = {
-      # pianonix = {
-      #   hostname = "pianonix.local";
-      #   profiles.system = {
-      #     sshUser = "root";
-      #     user = "root";
-      #     path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pianonix;
-      #     confirmTimeout = 90; # default: 30s; raspberrypi takes a little longer restarting services
-      #   };
-      # };
-
       builder = {
         hostname = "builder.julian-mutter.de";
         profiles.system = {
@@ -198,15 +155,5 @@
         };
       };
     };
-
-    # substitutes: nixos-generate --flake .#pianonix -f sd-aarch64 --system aarch64-linux
-    pianonix-image = inputs.nixos-generators.nixosGenerate {
-      system = "aarch64-linux";
-      format = "sd-aarch64";
-      modules = [./hosts/pianonix];
-      specialArgs = {
-        inherit inputs outputs;
-      };
-    };
   };
 }

homes/julian/features/fish/default.nix

@@ -27,6 +27,11 @@ with lib; {
     enableFishIntegration = true;
   };
 
+  programs.zoxide = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
   programs.fish = {
     enable = true;
 
@@ -38,14 +43,14 @@ with lib; {
         cd $argv
       '';
       run = ''
-        nix run nixpkgs#"$argv[1]" -- $argv[2..-1]
+        nix run --impure nixpkgs#"$argv[1]" -- $argv[2..-1]
       '';
       shell = ''
         set args
         for arg in $argv
             set args $args nixpkgs#$arg
         end
-        nix shell $args
+        nix shell --impure $args
       '';
       fish_user_key_bindings = ''
         bind ctrl-space 'zi; commandline -f repaint'

homes/julian/features/fonts/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   pkgs,
-  config,
   ...
 }:
 with lib; {

homes/julian/features/hyprland/default.nix

@@ -183,6 +183,16 @@ in {
       };
     };
 
+    # Disable animations for selection, fixes screenshots
+    extraConfig = ''
+      # layerrule {
+      #   name = no_anim_for_selection
+      #   no_anim = on
+      #   match:namespace = selection
+      # }
+      layerrule = noanim, selection
+    '';
+
     settings = {
       "$mod" = "SUPER";
 
@@ -281,6 +291,7 @@ in {
         "workspace 1, class:firefox"
         "workspace 8, class:Zotero"
         "workspace 9, class:nheko"
+        "workspace 9, class:Element"
         "workspace 9, class:discord"
         "workspace 9, class:org.telegram.desktop"
         "workspace 10, class:thunderbird"

homes/julian/features/neovim/default.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   inputs,
   ...
@@ -91,7 +90,7 @@
       # Code formatting
       conform-nvim = {
         enable = true;
-        settings.formatters_by_ft = with pkgs; {
+        settings.formatters_by_ft = {
           lua = ["stylua"];
           python = ["black"];
           nix = ["nixfmt"];

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

@@ -19,7 +19,6 @@
     links2 # Tui web-browser
     lnav # log analyzing tool
     mc # Tui file browser
-    # nix-index
     nmap
     p7zip # unzip 7zip archives
     parted

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

@@ -30,6 +30,7 @@
     telegram-desktop # telegram
     # schildichat-desktop # not updated regularly
     nheko
+    element-desktop
     evince # Simple pdf reader, good for focusing on document content
     firefox
     # geogebra
@@ -51,7 +52,6 @@
     # rustdesk
     tor-browser
     rusty-path-of-building # Path of Building for poe1 and poe2
-    # frajul.pob-dev-version # Path of Building
     vlc
     wineWowPackages.stable # 32-bit and 64-bit wine
     winetricks
@@ -68,6 +68,5 @@
     ## My scripts
     frajul.open-messaging
     frajul.xwacomcalibrate
-    frajul.pob2-frajul
   ];
 }

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

@@ -1,4 +1,9 @@
 {pkgs, ...}: {
+  programs.opencode = {
+    enable = true;
+    package = pkgs.unstable.opencode;
+  };
+
   home.packages = with pkgs; [
     watchexec # Run command when any file in current dir changes
     android-tools # adb
@@ -63,7 +68,8 @@
 
     ## My scripts
     frajul.deploy-to-pianopi
-    frajul.rtklib
+    frajul.smath-studio
+    # frajul.rtklib
 
     (pkgs.writeShellScriptBin "matlab-rsp" ''
       matlab -desktop -sd "/home/julian/git/uwa-channel-model" -softwareopengl

homes/julian/features/yazi/default.nix

@@ -3,9 +3,6 @@
   inputs,
   ...
 }: {
-  programs.zoxide.enable = true;
-  programs.zoxide.enableFishIntegration = true;
-
   home.packages = with pkgs; [
     exiftool
     unar # extract archives

homes/julian/global/default.nix

@@ -2,6 +2,7 @@
   lib,
   pkgs,
   config,
+  inputs,
   outputs,
   ...
 }: {
@@ -9,6 +10,7 @@
     [
       ../features/fonts
       ../features/nix-helper
+      inputs.nix-index-database.homeModules.default # nix-locate
     ]
     ++ (builtins.attrValues outputs.homeManagerModules);
 
@@ -24,13 +26,28 @@
     };
   };
 
+  # To allow unfree with 'nix run'
+  xdg.configFile."nixpkgs/config.nix".text = ''
+    { allowUnfree = true; }
+  '';
+
   colorscheme.name = "catppuccin-mocha";
 
   # systemd.user.startServices = "sd-switch"; # TODO: what is this
 
+  # Expire old hm generations
+  hm-expire = {
+    enable = true;
+    dates = "weekly";
+    expire = "-30 days";
+  };
+
   programs = {
     home-manager.enable = true;
     git.enable = true;
+
+    nix-index.enable = true; # allows command-not-found
+    nix-index-database.comma.enable = true;
   };
 
   home = {

homes/julian/hm-standalone-config.nix

@@ -13,6 +13,20 @@
     };
   };
 
+  # Expire old hm generations
+  hm-expire = {
+    enable = true;
+    dates = "weekly";
+    expire = "-30 days";
+  };
+
+  # Remove unused packets
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    persistent = true;
+  };
+
   # Setup binary caches
   nix.settings = {
     substituters = [

homes/julian/pianonix.nix

@@ -1,62 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./global
-
-    ./features/fish
-    ./features/topgrade
-    ./features/neovim
-    ./features/wezterm
-    ./features/yazi
-    ./features/gtk
-  ];
-
-  hostName = "pianonix";
-  is-nixos = true;
-  terminal = "wezterm";
-
-  # services.syncthing.tray.enable = true;
-  # services.syncthing.tray.command = "syncthingtray --wait"; # Wait for tray to become available
-
-  home.packages = with pkgs; [
-    music-reader
-    sheet-organizer
-
-    xournalpp
-    musescore
-
-    onboard
-  ];
-
-  programs.firefox = {
-    enable = true;
-
-    profiles.default = {
-      isDefault = true;
-
-      settings = {
-        "browser.startup.homepage" = "https://sheets.julian-mutter.de";
-        "browser.startup.page" = 1; # 0=blank, 1=home page, 3=restore previous session
-      };
-    };
-  };
-
-  programs.chromium = {
-    enable = true;
-
-    # commandLineArgs = [
-    #   "--homepage=https://sheets.julian-mutter.de"
-    #   "--no-first-run"
-    # ];
-  };
-
-  # Autostart link
-  home.file = {
-    # ".config/autostart/sheet-organizer.desktop".source = "${pkgs.sheet-organizer}/share/applications/sheet-organizer.desktop";
-    ".config/autostart/firefox.desktop".source = "${pkgs.firefox}/share/applications/firefox.desktop";
-    ".config/autostart/onboard.desktop".source = "${pkgs.onboard}/share/applications/onboard.desktop";
-    # ".config/autostart/chromium.desktop".source = "${pkgs.chromium}/share/applications/chromium.desktop";
-    ".config/sheet-organizer/config.toml".text = ''
-      working_directory = "/home/julian/Klavier"
-    '';
-  };
-}

homes/julian/quickstart.nix

@@ -0,0 +1,32 @@
+# Quick configuration for setting up basic things on a standalone home-manager device
+# If you want to adapt it to a specific device, copy this file with the correct hostname
+{pkgs, ...}: {
+  imports = [
+    ./global
+
+    ./features/fish
+    ./features/direnv
+    ./features/neovim
+    ./features/yazi
+    ./features/emacs
+    ./features/nix-helper
+    ./features/tmux
+  ];
+
+  is-nixos = false;
+
+  home.sessionPath = ["/snap/bin"];
+
+  # Essential packages
+  home.packages = with pkgs; [
+    bat
+    dust
+    fd
+    ripgrep
+    fzf
+    lazygit
+    mc
+    tree
+    wget
+  ];
+}

homes/julian/v3ms/default.nix

@@ -14,6 +14,7 @@
     ../features/emacs
     ../features/nix-helper
     ../features/qt-distrobox
+    ../features/tmux
   ];
 
   hostName = "aspi";

homes/julian/v3ms/packages.nix

@@ -39,4 +39,5 @@ with pkgs; [
   devbox # reproducible dev envs based on nix
 
   mysql80
+  devenv
 ]

homes/julian/v3ms07.nix

@@ -1,16 +0,0 @@
-{
-  imports = [
-    ../global
-
-    ../features/fish
-    ../features/direnv
-    ../features/neovim
-    ../features/yazi
-    ../features/emacs
-    ../features/nix-helper
-  ];
-
-  is-nixos = false;
-
-  home.sessionPath = ["/snap/bin"];
-}

hosts/aspi/default.nix

@@ -1,29 +1,28 @@
-{
+{pwd, ...}: {
   imports = [
     ./hardware-configuration.nix
 
-    ../common/global
-    ../common/users/julian
-    ../common/users/yukari
-    ../common/users/pob
-    ../common/optional/binarycaches.nix
+    "${pwd}/features-nixos/global"
+    "${pwd}/features-nixos/users/julian"
+    "${pwd}/features-nixos/optional/binarycaches.nix"
 
-    ../common/optional/remote-builder.nix
-    ../common/optional/boot-efi.nix
+    "${pwd}/features-nixos/optional/remote-builder.nix"
+    "${pwd}/features-nixos/optional/boot-efi.nix"
 
-    ../common/optional/greetd.nix
-    ../common/optional/authentication.nix
-    ../common/optional/pcmanfm.nix
-    ../common/optional/pipewire.nix
+    "${pwd}/features-nixos/optional/greetd.nix"
+    "${pwd}/features-nixos/optional/authentication.nix"
+    "${pwd}/features-nixos/optional/pcmanfm.nix"
+    "${pwd}/features-nixos/optional/pipewire.nix"
 
-    ../common/optional/gamemode.nix
-    ../common/optional/virtualbox.nix
+    "${pwd}/features-nixos/optional/gamemode.nix"
+    "${pwd}/features-nixos/optional/virtualbox.nix"
 
-    ../common/optional/podman.nix
-    ../common/optional/wireguard.nix
-    ../common/optional/flatpak.nix
+    "${pwd}/features-nixos/optional/podman.nix"
+    "${pwd}/features-nixos/optional/wireguard.nix"
+    "${pwd}/features-nixos/optional/wireshark.nix"
+    "${pwd}/features-nixos/optional/flatpak.nix"
 
-    ../common/optional/avahi.nix
+    "${pwd}/features-nixos/optional/avahi.nix"
   ];
 
   networking.hostName = "aspi";

hosts/builder/default.nix

@@ -2,6 +2,7 @@
 # or
 # deploy .#builder
 {
+  pwd,
   config,
   pkgs,
   ...
@@ -9,11 +10,11 @@
   imports = [
     ./hardware-configuration.nix
 
-    ../common/global/fish.nix # fish for admin
-    ../common/global/locale.nix
-    ../common/global/nix.nix
-    ../common/global/sops.nix
-    ../common/global/root.nix
+    "${pwd}/features-nixos/global/fish.nix" # fish for admin
+    "${pwd}/features-nixos/global/locale.nix"
+    "${pwd}/features-nixos/global/nix.nix"
+    "${pwd}/features-nixos/global/sops.nix"
+    "${pwd}/features-nixos/global/root.nix"
   ];
 
   networking.hostName = "builder";
@@ -101,10 +102,17 @@
   };
 
   # Ollama used by open-webui as llm backend
-  # services.ollama = {
-  #   enable = true;
-  #   # acceleration = "rocm";
-  # };
+  services.ollama = {
+    enable = true;
+    # acceleration = "rocm";
+    openFirewall = true;
+  };
+
+  services.nextjs-ollama-llm-ui = {
+    enable = true;
+    hostname = "192.168.3.118";
+    port = 3001;
+  };
   # services.open-webui = {
   #   enable = true;
   #   port = 8080;
@@ -114,6 +122,7 @@
 
   networking.firewall.allowedTCPPorts = [
     80
+    3001 # ollama-ui
   ];
 
   services.openssh = {
@@ -168,7 +177,7 @@
     minimumDiskFreeEvaluator = 4; # in GB
   };
 
-  # add builder itself as build machine so system emulation is properly supported
+  # add builder itpwd as build machine so system emulation is properly supported
   # nix.distributedBuilds = true;
   nix.buildMachines = [
     {

hosts/common/users/pob/default.nix

@@ -1,28 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
-  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-in {
-  users.mutableUsers = false;
-  users.users.pob = {
-    description = "A helper user to use another profile for some applications";
-    group = "pob";
-    isNormalUser = true;
-    shell = pkgs.fish;
-    extraGroups = ifTheyExist [
-      "networkmanager"
-    ];
-    packages = with pkgs; [
-      firefox
-      wineWowPackages.stable # 32-bit and 64-bit wine
-      winetricks
-    ];
-  };
-  users.groups.pob = {};
-
-  security.sudo.extraConfig = ''
-    julian ALL=(pob) NOPASSWD: ALL
-  '';
-}

hosts/common/users/yukari/default.nix

@@ -1,97 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  outputs,
-  ...
-}: let
-  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-in {
-  users.mutableUsers = false;
-  users.users.yukari = {
-    description = "Yukari";
-    group = "yukari";
-    isNormalUser = true;
-    shell = pkgs.fish;
-    extraGroups = ifTheyExist [
-      "networkmanager"
-      "audio"
-      "network"
-      "video"
-      "podman"
-      "docker"
-      "git"
-      "gamemode"
-    ];
-
-    createHome = true;
-    hashedPassword = "$y$j9T$rGuTL0rfiy7ht8L58BGCw0$fN.KwHjYlIitFEPHndKvV06ezgeWzP3/58o1kkviZwB";
-    packages = [pkgs.home-manager];
-  };
-  users.groups.yukari = {};
-
-  home-manager.users.yukari = {
-    imports =
-      [
-        ../../../../homes/julian/features/fonts
-        ../../../../homes/julian/features/suites/cli
-      ]
-      ++ (builtins.attrValues outputs.homeManagerModules);
-
-    home = {
-      username = lib.mkDefault "yukari";
-      homeDirectory = lib.mkDefault "/home/${config.home.username}";
-      stateVersion = lib.mkDefault "23.11";
-
-      sessionPath = ["$HOME/.local/bin"];
-
-      packages = with pkgs; [
-        arandr
-        calibre # ebook manager and viewer
-        # digikam
-        discord
-        discord-ptb # in case discord updates take their time
-        # dvdisaster
-        # element-desktop
-        # rocketchat-desktop
-        thunderbird
-        telegram-desktop # telegram
-        # schildichat-desktop # not updated regularly
-        nheko
-        evince # Simple pdf reader, good for focusing on document content
-        firefox
-        vivaldi
-        # geogebra
-        cheese
-        handbrake
-        # kitty # Terminal, already available as feature
-        libnotify
-        libreoffice
-        mate.engrampa
-        nomacs # Image viewer
-        kdePackages.okular # Pdf reader with many features, good for commenting documents
-        pavucontrol
-        qalculate-gtk # Nice gui calculator
-        qpdfview
-        # qutebrowser
-        # realvnc-vnc-viewer
-        # rustdesk
-        tor-browser
-        # frajul.pob-dev-version # Path of Building
-        vlc
-        wineWowPackages.stable # 32-bit and 64-bit wine
-        winetricks
-        xclip # x11 clipboard access from terminal
-        xfce.mousepad # simple text editor
-        xournalpp # Edit pdf files
-        zoom-us # Video conferencing
-        zotero # Manage papers and other sources
-        pdfpc # Present slides in pdf form
-      ];
-    };
-    programs = {
-      home-manager.enable = true;
-      git.enable = true;
-    };
-  };
-}

hosts/kardorf/default.nix

@@ -1,30 +1,31 @@
-{pkgs, ...}: {
+{
+  pwd,
+  pkgs,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
 
-    ../common/global
-    ../common/users/julian
-    ../common/users/wolfi
-    ../common/optional/binarycaches.nix
+    "${pwd}/features-nixos/global"
+    "${pwd}/features-nixos/users/julian"
+    "${pwd}/features-nixos/users/wolfi"
+    "${pwd}/features-nixos/optional/binarycaches.nix"
 
-    # ../common/optional/xserver.nix
-    ../common/optional/remote-builder.nix
-    ../common/optional/boot-efi.nix
+    "${pwd}/features-nixos/optional/remote-builder.nix"
+    "${pwd}/features-nixos/optional/boot-efi.nix"
 
-    ../common/optional/greetd.nix
-    ../common/optional/authentication.nix
-    ../common/optional/pcmanfm.nix
-    ../common/optional/pipewire.nix
+    "${pwd}/features-nixos/optional/greetd.nix"
+    "${pwd}/features-nixos/optional/authentication.nix"
+    "${pwd}/features-nixos/optional/pcmanfm.nix"
+    "${pwd}/features-nixos/optional/pipewire.nix"
 
-    ../common/optional/virtualbox.nix
+    "${pwd}/features-nixos/optional/openssh.nix"
 
-    # ../common/optional/gdm.nix
-    # ../common/optional/i3.nix
+    "${pwd}/features-nixos/optional/virtualbox.nix"
 
-    ../common/optional/openssh.nix
-
-    ../common/optional/podman.nix
-    ../common/optional/flatpak.nix
+    "${pwd}/features-nixos/optional/podman.nix"
+    "${pwd}/features-nixos/optional/wireshark.nix"
+    "${pwd}/features-nixos/optional/flatpak.nix"
   ];
 
   networking.hostName = "kardorf";

hosts/pianonix/default.nix

@@ -1,276 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-{
-  lib,
-  inputs,
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    inputs.nixos-hardware.nixosModules.raspberry-pi-4
-
-    ./hardware-configuration.nix
-
-    ../common/global
-    ../common/users/julian
-    ../common/optional/binarycaches.nix
-
-    ../common/optional/pipewire.nix
-    ../common/optional/remote-builder.nix
-    ../common/optional/pcmanfm.nix
-    ../common/optional/redshift.nix
-    ../common/optional/authentication.nix
-
-    ../common/optional/avahi.nix
-  ];
-
-  environment.systemPackages = [
-    (pkgs.python3.withPackages (p:
-      with p; [
-        numpy
-        pillow
-        flask
-        rpi-gpio
-        webcolors
-        psutil
-        mido
-        rtmidi-python
-        spidev
-        waitress
-        websockets
-        werkzeug
-
-        pkgs.frajul.rpi-ws281x-python
-      ]))
-  ];
-
-  # disko.devices.disk.main.device = "/dev/mmcblk1";
-
-  # enabled by fish, disabling speeds up builds
-  documentation.man.generateCaches = false;
-
-  # networking.enableIPv6 = false; # This only leads to issues with avahi
-  # services.avahi.ipv6 = false;
-
-  hardware.raspberry-pi."4".bluetooth.enable = true;
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-  services.blueman.enable = true; # bluetooth gui
-  # raspberry pi specific
-  # systemd.services.btattach = {
-  #   before = [ "bluetooth.service" ];
-  #   after = [ "dev-ttyAMA0.device" ];
-  #   wantedBy = [ "multi-user.target" ];
-  #   serviceConfig = {
-  #     ExecStart = "${pkgs.bluez}/bin/btattach -B /dev/ttyAMA0 -P bcm -S 3000000";
-  #   };
-  # };
-  # networking.wireless.enable = true;
-  # networking.wireless.secretsFile = config.sops.secrets."wifi/pianonix".path;
-  # networking.wireless.networks = {
-  #   "SMARTments".pskRaw = "ext:PSK";
-  # };
-
-  # networking.networkmanager.enable = lib.mkForce false;
-
-  services.gnome.at-spi2-core.enable = true; # for onboard
-
-  networking.hostName = "pianonix";
-  system.stateVersion = "22.11";
-
-  sops.secrets."vnc-passwd" = {
-    owner = config.users.users.julian.name;
-    sopsFile = ./secrets-vnc-passwd.bin;
-    format = "binary";
-  };
-  sops.secrets."wifi/pianonix" = {};
-  sops.secrets."syncthing/pianonix/key" = {};
-  sops.secrets."syncthing/pianonix/cert" = {};
-  # sops.secrets."syncthing/public-keys/aspi-nix" = { };
-  # sops.secrets."syncthing/public-keys/pianonix" = { };
-
-  sops.secrets."wg-config" = {
-    sopsFile = ./secrets-wg-config.bin;
-    format = "binary";
-  };
-
-  networking.wg-quick.interfaces = {
-    home = {
-      configFile = config.sops.secrets."wg-config".path;
-      autostart = true; # This interface is started on boot
-    };
-  };
-
-  modules = {
-    syncthing = {
-      enable = true;
-      overrideSettings = true;
-    };
-  };
-
-  # Enable the Desktop Environment.
-  # services.xserver.displayManager.lightdm.enable = true;
-  services.displayManager.defaultSession = "xfce";
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "julian";
-  };
-
-  systemd.services.x11vnc = {
-    description = "Run x11vnc server";
-    after = ["display-manager.service"];
-    wantedBy = ["multi-user.target"];
-    serviceConfig = {
-      ExecStart = "${pkgs.x11vnc}/bin/x11vnc -rfbauth ${
-        config.sops.secrets."vnc-passwd".path
-      } -forever -loop -noxdamage -repeat -rfbport 5900 -shared";
-      User = config.users.users.julian.name;
-      Restart = "on-failure";
-      Environment = "DISPLAY=:0";
-    };
-  };
-
-  boot.loader.timeout = lib.mkForce 1; # Set boot loader timeout to 1s
-
-  # De-facto disable network manager, which is enabled by gnome
-  # networking.networkmanager.unmanaged = [ "*" ];
-  services.xserver.enable = true;
-  services.xserver.desktopManager = {
-    xfce = {
-      enable = true;
-    };
-  };
-
-  services.xserver.displayManager.sessionCommands = ''
-    # Prevent screen from going blank or turning off (values in min)
-    ${pkgs.xfce.xfconf}/bin/xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/blank-on-ac -s 0
-    ${pkgs.xfce.xfconf}/bin/xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/dpms-on-ac-sleep -s 0
-    ${pkgs.xfce.xfconf}/bin/xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/dpms-on-ac-off -s 0
-  '';
-
-  services.xserver.xautolock.enable = false;
-  services.xserver.desktopManager.xfce.enableScreensaver = false;
-
-  # xdg.portal.lxqt.enable = true;
-
-  services.openssh = {
-    enable = true;
-    # require public key authentication for better security
-    settings.PasswordAuthentication = false;
-    settings.KbdInteractiveAuthentication = false;
-    settings.PermitRootLogin = "yes";
-  };
-  users.users."root".openssh.authorizedKeys.keys = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVk/m4ydcYXzHxTWeNw2MlwxKU+JirTVOeHsYR4wdTokwYyNWZ3/zPcU4+XekSRatwJW1LJYrZ1Y5IJkobzgnOvYVI7SXZ1Tbzb1kAcnChSt+Dp/pKdMPZ8yY3PTFZh+R5F3rWFA/YZqTRhh0vuxPIVbLl7zOPExWwYGn9crkZaYZvKHVvgE5660hXo9pxbUKsSs+DIy/AE7gfKiZLusY95nk9T/jZ7Vmhl0UsF0RiDsfxgE664/vEKe8b+82kKCDt5nJVe8THSrjaw4+NUhef6R8UoUO1/Pn4TKq3Gil3Z36wPEPdkw2lYzX+d1EFyaC3hZJedSUfdFliPOejIbNvvhPBBD1wAGxxyuJZB5KLwWN7/efwCgw45buLbVfUuwwug7K7GK84A3yzqClbZKKv8rYdO04UG64A+Taq2LeyxQIDjygTgGk/1j/0Neb1RO0FbjlbTeNMZ54P+u7BTEcikJCsbFeseWDtYzupQtLt96KMbcdRgHy0CTGqFHE+my8= julian@julian-aspi"
-  ];
-
-  services.syncthing.key = config.sops.secrets."syncthing/pianonix/key".path;
-  services.syncthing.cert = config.sops.secrets."syncthing/pianonix/cert".path;
-  services.syncthing.settings = {
-    devices = {
-      "aspi-nix" = {
-        id = "DM5QRYU-ILJ4XYB-4V6NZDG-RAMVOND-3RSDSYR-52TW6RW-3XIU333-T7FNAA3";
-      };
-      "pianonix" = {
-        id = "FD3XSFW-7LQSCIQ-KHZPLNQ-7VZYGKH-RJ2ZKTJ-BG67NRH-36TQIZM-CXDYWAH";
-      };
-    };
-    folders = {
-      "Klavier" = {
-        path = "/home/julian/Klavier";
-        id = "flc3m-q4gp2";
-        devices = [
-          "aspi-nix"
-          "pianonix"
-        ];
-      };
-    };
-  };
-
-  networking.firewall.enable = false;
-  networking.firewall.allowedTCPPorts = [
-    5900 # for vnc
-  ];
-
-  # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!
-  # If no user is logged in, the machine will power down after 20 minutes.
-  systemd.targets.sleep.enable = false;
-  systemd.targets.suspend.enable = false;
-  systemd.targets.hibernate.enable = false;
-  systemd.targets.hybrid-sleep.enable = false;
-
-  ## Raspberry pi specific config
-  # hardware.raspberry-pi."4" = {
-  #   fkms-3d.enable = true;
-  #   touch-ft5406.enable = true;
-  # };
-  # Prevent host becoming unreachable on wifi after some time (for raspberry pi)
-  networking.networkmanager.wifi.powersave = false;
-  # Enable audio devices on raspberry pi
-  # boot.kernelParams = [
-  #   "snd_bcm2835.enable_hdmi=1"
-  #   "snd_bcm2835.enable_headphones=1"
-  # ];
-  # boot.loader.raspberryPi.firmwareConfig = ''
-  #   dtparam=audio=on
-  # '';
-
-  ## Enable SPI
-  hardware.raspberry-pi."4".apply-overlays-dtmerge.enable = true;
-  hardware.deviceTree = {
-    enable = true;
-    filter = lib.mkForce "*-rpi-4*.dtb";
-    overlays = [
-      {
-        name = "spi";
-        dtboFile = ./spi0-0cs.dtbo;
-      }
-    ];
-  };
-
-  users.groups.spi = {};
-
-  # services.udev.extraRules = ''
-  #   SUBSYSTEM=="spidev", KERNEL=="spidev0.0", GROUP="spi", MODE="0660"
-  # '';
-
-  ## Use GPIO as non-root
-  # Create gpio group
-  users.groups.gpio = {};
-
-  # Change permissions gpio devices
-  services.udev.extraRules = ''
-    SUBSYSTEM=="spidev", KERNEL=="spidev0.0", GROUP="spi", MODE="0660"
-
-    SUBSYSTEM=="bcm2835-gpiomem", KERNEL=="gpiomem", GROUP="gpio",MODE="0660"
-    SUBSYSTEM=="gpio", KERNEL=="gpiochip*", ACTION=="add", RUN+="${pkgs.bash}/bin/bash -c 'chown root:gpio /sys/class/gpio/export /sys/class/gpio/unexport ; chmod 220 /sys/class/gpio/export /sys/class/gpio/unexport'"
-    SUBSYSTEM=="gpio", KERNEL=="gpio*", ACTION=="add",RUN+="${pkgs.bash}/bin/bash -c 'chown root:gpio /sys%p/active_low /sys%p/direction /sys%p/edge /sys%p/value ; chmod 660 /sys%p/active_low /sys%p/direction /sys%p/edge /sys%p/value'"
-  '';
-
-  # Add user to group
-  users.users.julian.extraGroups = ["gpio"];
-
-  ## My own Piano LED Visualizer
-  services.piano-led-visualizer.enable = true;
-
-  ## Crude fix for avahi
-  systemd.timers.avahiRestart = {
-    description = "Restart avahi-daemon every 5 minutes";
-    wantedBy = ["timers.target"];
-    timerConfig = {
-      OnBootSec = "5min";
-      OnUnitActiveSec = "5min";
-      Unit = "avahiRestart.service";
-    };
-  };
-
-  systemd.services.avahiRestart = {
-    description = "Restart avahi-daemon service";
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.systemd}/bin/systemctl restart avahi-daemon.service";
-    };
-  };
-}

hosts/pianonix/hardware-configuration.nix

@@ -1,41 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
-
-  boot.initrd.availableKernelModules = ["xhci_pci"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
-  boot.blacklistedKernelModules = ["snd_bcm2835"]; # Disables sound, required for ws281x to work
-  # boot.supportedFilesystems = lib.mkForce [
-  #   # remove zfs, since its incompatible with latest kernel
-  #   "vfat"
-  #   "ext4"
-  # ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/NIXOS_SD";
-    fsType = "ext4";
-  };
-
-  swapDevices = [];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.end0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-}

hosts/pianonix/secrets-vnc-passwd.bin

@@ -1,19 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:13hToequR4A=,iv:U7a6mIOYanQjozPrL92edFrhdyuSJj14pqVa2tGE/zA=,tag:uyeE3dj7NTKPi0jNLkFMLA==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXWEFYNThYQkpuTW10MjNM\nU3pWYmE5UnBPUzhQSTltc3hXdk9EWkg5czI0CmxnK3FuYitGci9ndnRCZms4a0lD\nOWh4alF1MEtJUis5YVNyYXRLbVppNnMKLS0tIEQ5WVVIMzlIV0pnc2ZWMnc5bjE4\nR3lpbzJiRmljcWI4SWlOS2svZVBSYnMKYIfhDjNZPDxmws3Z3P55K7V/NHiukQ0u\n00Kk603U+1JhgfJBk0Y3tMo//vKCHQj87wtZoqDLEN7Gu+ZtHhkhow==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tguyu2yd5xv8rgjjl50cq6dq5rr7umqgv098dgre4u9wyj30ea7sexw62c",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjSVpBR1NPY0svSWNWYzFC\nZE1uTjZTRm9XM24wcXByajVDYUJ4Y3FmNUc0CkJMMXRtUE5mSjYwU25MYy9xNFlP\ndUNmYmJ5RVF0dG5LYjA4L1NnNEtCMVEKLS0tIFl0Slovd2NiWjg1VXJ1VDJwTWJQ\nTWFZeW1ZYisvenVycWYwZ1lkOXBaVVUKqGu6Q8IbiUAzazLKN95uAtmXJMPzx02u\nr/R8q7ugG8lX5pWX3H3P7vtBz57Oo3rWlRpUhN/4+PpijkJNUyr3XQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2024-12-01T16:14:57Z",
-		"mac": "ENC[AES256_GCM,data:zKz8OX1yi68Qn3X6HwdbgTCr/3ZVBh5Wz4KUACmWG3XhOEVi8uoDEdAxfKMDBqNzXLeDmxxTKj6TMLkk68ozDYJqu0OevVritnZqvBTr9VKGpMPBFN3DuaeqSZ6wjHGbce1iqO0kusnwopRbEWHmr/lZxiXTNgLPdN+p5Aszi54=,iv:resppfGPecKvKwqNwqecDBcXGhcTWSGZis8hf1jT0Us=,tag:V80P25Pr4HD9pUUrQHZSQg==,type:str]",
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.8.1"
-	}
-}

hosts/pianonix/secrets-wg-config.bin

@@ -1,19 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:SFc3K1hvBjeCS6ikLZl3vIPFJqsUrZZi9yO9tVuv14exKhOuK17HN/d+cYMtVxGwqQ/biFdXYdP8/sfTPwwZgd/wRLT2xRDMOg5ru7kj8sEhcOEYmrgYRLo3ImdWANFaxelWOmjEvzphTQ7guvXTo7BACUA9AygYa9Ou9bklYImWhOCsk8e9uz5afLZXscidiqUqqFuJNo3QGMDEAxFI2YC3OpLwEj5zlsI4AXEEHRVUxU1sVtspdolDaeiFIs/JW4jLu/2la6JyGJUluYXAThzL1LO39NA/MSNskMSedatz89vnCd9CP6Q3eT93vrUYAEY=,iv:e+tWIlHm4NH1w8AQAw6tvgCX9XOiroE1XmrSua3Bcg4=,tag:RwGpKtG9JzQ3TgcnzEV5Rg==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTYTFjRnpPVDAvQ0ZHZU0v\neEduOTVockFoZGhuMmZNd0w3bVFCVUQzUlI4CmZTaktOQWxrTDNpYXlPTm9SdlZZ\nN0dURmlHVFlHSjZpbkpGb09lTmVzWm8KLS0tIDhMWlFIRWFkQjcya0hjeUdUSklB\nbWlqNlVoR1BnWG9TM0RhWnI4a0J4YUEKGWIX77EVXYFVyA2u6CkF1cGfwd4Gq0Vb\nNqrlMUYEDZ5nO/eLWsAt2kj1/YFjkGw0iI02HLRHdxQ59vFyl3CS1Q==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tguyu2yd5xv8rgjjl50cq6dq5rr7umqgv098dgre4u9wyj30ea7sexw62c",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsNlZGdktzSGp0bzIyUjlR\nUU9LSXRrZTgxcEZwczhidWVOdGRnRFYrOVZZCmx3VzM4V2dsWmZpUWxNUG82MzU2\nT3dmQjRwdmRJbTJxVm9vQjJKU3JXSncKLS0tIFlhYy9uQW5aa1E0K3Q1RUFSQkZP\nR29sY3RCYVg5bGdqMU1uc0E3Szhmb0kKFzKHUVNDdHWfycb7xWeAyIVlC4ab7ivR\nVlfmbPAXq2THw/s4zk/ckfE5RP82a1aX4++XRa7fm5KXpI8vExjJ5A==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2025-10-14T06:56:31Z",
-		"mac": "ENC[AES256_GCM,data:DrcOET5U6veg0qhcBjQQ5neCdTUufMxhIz4ZQzvzd+YxKfAqaq8R1PW5VVlUjhDBaUH9i3J1Wj6X4E600uhayY0E9I5VqfO84hqlosfZWPiWPO8prK46Y7R3Ybdh9uvWQxiaSxy8KHXsdDgsBFLlmLe/QvsDSUv56rPofkm06vg=,iv:XBFP8ANpsszeXqQIE/v7+GmZGlFtxgE/EtgL/Cc3x+8=,tag:ZJgO+hLuwIatE55wo94RVw==,type:str]",
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.11.0"
-	}
-}

hosts/secrets-common.yaml

@@ -1,14 +1,8 @@
 #ENC[AES256_GCM,data:NSxfTl2hTXEoGl23aQnElG+df/1YzA==,iv:+oy9oITMGzdM2muDUPjwxJqUu1Bdyregl65/0hiulZ0=,tag:VKjforpyahKj0ktIN36gNw==,type:comment]
 julian-password: ENC[AES256_GCM,data:tgeu4uVI91j34+Gfzy2Uckmopj9bJNWiu65W0cdA76Kly3LH7RqXCq4rNM4DCwrsX3k9WdOlGX6T9edIjJgmbbe6MkeH7oQwiA==,iv:GE6zfSHymkAewjry7fofURz70az608+hja385LLeCIY=,tag:FqTopL5DyM3DTpa7AoGPDg==,type:str]
-wifi:
-    pianonix: ENC[AES256_GCM,data:Ty1wElfVj+CU9bTbpuYIk2dA4fgFm59PkQGqvODn51Q=,iv:bLomyTlOW2Z4rPbue7Klo6Jt5lR+44AuL+dIMFgDNAE=,tag:DuH2ayeb19dkPi9xmbAu3A==,type:str]
 syncthing:
     public-keys:
         aspi-nix: ENC[AES256_GCM,data:ZTykdQCyh4DMuQUCy1DSKsGNxxn1dinaqztpDdJY53pkWcW4YcWRHk94iGJQZgG1oLfr3AB2S3J6b9w2WuV3,iv:9z2ovHzq6JjRtHzNMIQtcUCinIjG/ImSGqqC7KPhpuw=,tag:No2LCjD+XXB77Su+s98MIA==,type:str]
-        pianonix: ENC[AES256_GCM,data:pUJPXH47VG363aIoxZwmbVe3uBoO7EO2TflK4f761C7PwD0tFNthZt9HRE6gQXAMQMF6qWzNK3CNGspSzKsE,iv:E89oz8BG5iQW/mRzdxSrYewGeVLiCrTcAF+c9ny6gPc=,tag:rLqwUmFDsaOMClR1tbE1sA==,type:str]
-    pianonix:
-        key: ENC[AES256_GCM,data:IaCXIRDMWCHj3lTKpkLg1Nd3pX4bktWg4WjZPGKgTBCLVkMi/SDtlaoNhDz+a+Vt6jYTXHS4exFnIVJ878nWSrA1sD2NHXmfsMh1kkLhub68qv0M33dBXvgX0vQ51Z1WMoti73yDUjJH8Ym5yF/SCg2+RbkVf+4pe2hSlAzwkGP6YC2rbCE5sZG31C55MkaGC6zwo2ZpZXdVhCW845SqAc11cF/OeEHb9B1FS3rd+El7rlJHrIEVQTkomNLshcspb13H0z3vNhtfu9pPkGxee8Hp/hEhFQ+waWBAg4w15yKihjHJmhzdjhDHCilvwYaceb7b5OwARuuiruQ+cJ40bdnStDpi2ouP8QJjEi7tmKWeplZ0X70PVZJFH/e/mTH5,iv:3hQMB4ka31w3chXXwjl/1IHF8ES/RobZVeugMC3ddlU=,tag:j8wwrNQUQbCEGtcriSpc4g==,type:str]
-        cert: ENC[AES256_GCM,data:v9LO8qpeGDDV6I+AJU5iTYKKBV6qgr1ddwLvBVEOYyvmtPNeqaatYaK6vMBCabBIhxQu2NC96pREvWu1UHbxaMWvSCT1TzrIPrcFm+gKCH6PIPhqcnQpdGa3OYn01ohThpLp8hEmVUpJ0FO/AnE1QHK0VfPqJ3S0uHLjSCBJtxLmcBWNVvlcTU/P68QIQkrYAQRAtz9aDS+JNpUKhwCJBgjpY1Thj8Lj/fpc1t0qWo3BKIL3eW5iSlUW0iEriFS0bkMr4Bi9mNqpO26l1eZ3IXFJy/7pkqhmXXW83qOaF9AFXgg41p1Kjw4G6isB/obuhR7Z4oQ/AtkSU0wxHP4mF0AWrvC7/YGlrDG9aPYUEWOexTTBHkm89PhgEa69sekbzac7mYYFi/MIdU34ks4oc8ZIChWpT+V66mbo4f+3mn7raih5SLnyEMS7ENBes9cQC7SghSpB7D8c/2+q74A5aEZHUWRhqiDEx9IggP43SiWuNnb/HyZw16RUB7xnQKPs7LzAVlLC6M7ZETUmyEDEWWOsDY8+0Li4wuD3z4WXLAD9nP43TMx4GNoafjG+0Gu05hSR8fWv8strRCtIWjzK3wMaD9VT/cbt2oqOBkJcaqIW8+lM+ktk1WsD4Kc1DQ4q5O2oMrdPOWI9xZOs7DQTFshLHuvxutN05vgEUovI1vbMOl7SIzUW8YUY9PN0ofC7zwQlEJxfOdqT0nwv9vmqikSMP6V3jXgP5OnPb4KVx8G27X0oCjN++dJgDxdkh2JiLR9JaJHNmYPtLlP7hU4NsBpRpd9ObxRlv+uIbF2o0I8PGXMo3IVnRjrFDrRyoth2UJ+YUMGCVuonoS+nZLMCNz1xwRMaZBYjSEESmxc2Ilwdu3XTzd1KF282UvumBpRwcNxvsmPhI84v/XV8TJE8Z7YxyO3RYBQHD5+OuHOHKTtlajnKpSp/m0p0QR7rrGFoDuDKp+Z81MKz8wz3/8GG+sDh0pgniUfNyrmLroLPdT6nj0brvSVWYmOIJHDHKqM+6HZok5PyS+uHlb5dzwnmrd9OmhmwPVdkP5s=,iv:X9VNz2nsN4ywu3E0c+agwZCl43I4bt6jHz0jMoMFTJQ=,tag:RZUWa4h5JoIiZaDrYgcAeg==,type:str]
 sops:
     age:
         - recipient: age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg
@@ -47,7 +41,7 @@ sops:
             VXhoN0VyWkVxMEJPQ3orVUNDK21rRU0KvnmuFxcCpP+LZg7v5jaStw9F0owVrQl9
             AkIq7GUJh7xewLxcVZfiBRpXMhw/mM8LYnd2KGP8R/TfYg+v0//+5A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-04-23T07:00:17Z"
-    mac: ENC[AES256_GCM,data:JgaTIRbzD0hs2o86xUlQrPN2cPXvsuTH/zKG5xbQIDaYcEvD/mkuVa3hfnYKrA91kWg2Y1DgEi9583+o6UCl/+ldY4ptu+xpnYfyQFdhM4rB+KoP/pDt8vQKQ3zAX8fpAkugCgTTbuvm3TfQ1nt98V8boyhCn4JHNC1T0j7ZtZI=,iv:G3YJOLeDWDKuANo2mxS2JAdrRaonD87CU9BpCZZrlRs=,tag:mcKIdP5cSQUwNL2tcv/o6g==,type:str]
+    lastmodified: "2026-03-23T19:37:41Z"
+    mac: ENC[AES256_GCM,data:nd4HHv/KfoLj5qGINngvWZX9XdYqtmJnUREo0BOO2JZgYR3AVw0ppmGhj1RFy1bVKdfll/fMoD5tGNc3UQJPB0j2g/1pj47AF44V0d1J79RP6dwov30rr0QnsXVt7P9EOFL/W6TRugYO9J7LZs+tpsSALfwNPTfnulSJQtaJdG4=,iv:EKfq4eKyv1HeMy/zS+V3OKpdL9IVjE5mg8iuz8OPgso=,tag:W8+CZLnYuNbnKRS1kqhY0w==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.1
+    version: 3.11.0

modules/home-manager/default.nix

@@ -5,4 +5,5 @@
   colors = import ./colors.nix;
   hostname = import ./hostname.nix;
   non-nixos = import ./non-nixos.nix;
+  hm-expire = import ./hm-expire.nix;
 }

modules/home-manager/hm-expire.nix

@@ -0,0 +1,46 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.hm-expire;
+in {
+  options.hm-expire = {
+    enable = lib.mkEnableOption "Whether to enable hm-expire";
+    dates = lib.mkOption {
+      type = lib.types.str;
+      default = "weekly";
+    };
+    expire = lib.mkOption {
+      type = lib.types.str;
+      default = "-30 days";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    # This creates a user-level systemd service
+    systemd.user.services.cleanup-home-manager = {
+      Unit = {
+        Description = "Cleanup old Home Manager generations";
+      };
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.bash}/bin/bash -c '${pkgs.home-manager}/bin/home-manager expire-generations \"${cfg.expire}\"'";
+      };
+    };
+
+    systemd.user.timers.cleanup-home-manager = {
+      Unit = {
+        Description = "Weekly cleanup of Home Manager generations";
+      };
+      Timer = {
+        OnCalendar = cfg.dates;
+        Persistent = true;
+      };
+      Install = {
+        WantedBy = ["timers.target"];
+      };
+    };
+  };
+}

overlays/default.nix

@@ -2,19 +2,19 @@
   # For every flake input, aliases 'pkgs.inputs.${flake}' to
   # 'inputs.${flake}.packages.${pkgs.system}' or
   # 'inputs.${flake}.legacyPackages.${pkgs.system}'
-  flake-inputs = final: _: {
-    inputs =
-      builtins.mapAttrs (
-        _: flake: let
-          legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
-          packages = (flake.packages or {}).${final.system} or {};
-        in
-          if legacyPackages != {}
-          then legacyPackages
-          else packages
-      )
-      inputs;
-  };
+  # flake-inputs = final: _: {
+  #   inputs =
+  #     builtins.mapAttrs (
+  #       _: flake: let
+  #         legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
+  #         packages = (flake.packages or {}).${final.system} or {};
+  #       in
+  #         if legacyPackages != {}
+  #         then legacyPackages
+  #         else packages
+  #     )
+  #     inputs;
+  # };
 
   input-flake-packages = final: prev: {
     sheet-organizer = inputs.sheet-organizer.packages.${prev.system}.default; # TODO: change sheet-organizer package output
@@ -22,15 +22,15 @@
   };
 
   # Adds my custom packages, available as pkgs.frajul.xyz
-  my-pkgs = final: prev: {frajul = import ../pkgs {pkgs = final;};};
+  frajul-pkgs = final: prev: {frajul = import ../packages {pkgs = final;};};
 
   nixpkgs-stable-unstable = final: prev: {
     unstable = import inputs.nixpkgs-unstable {
-      system = prev.system;
+      system = prev.stdenv.hostPlatform.system;
       config.allowUnfree = true;
     };
     stable = import inputs.nixpkgs {
-      system = prev.system;
+      system = prev.stdenv.hostPlatform.system;
       config.allowUnfree = true;
     };
   };

packages/default.nix

@@ -10,11 +10,10 @@
   sos = pkgs.callPackage ./sos {};
   xwacomcalibrate = pkgs.callPackage ./xwacomcalibrate {};
   acer-battery-health-mode = pkgs.callPackage ./acer-battery-health-mode {};
-  pob2 = pkgs.callPackage ./pob2 {};
   wl-ocr = pkgs.callPackage ./wl-ocr {};
   rtklib = pkgs.qt6Packages.callPackage ./rtklib {};
   typst-languagetool = pkgs.callPackage ./typst-languagetool {};
-  pob2-frajul = pkgs.callPackage ./pob2-frajul {};
+  smath-studio = pkgs.callPackage ./smath-studio.nix {};
 
   # rpi-ws281x-python = pkgs.callPackage ./rpi-ws281x-python {};
   # piano-led-visualizer = pkgs.callPackage ./piano-led-visualizer {};

packages/open-messaging/default.nix

@@ -1,6 +1,6 @@
 {
   writeShellApplication,
-  nheko,
+  element-desktop,
   telegram-desktop,
   thunderbird,
   discord, # TODO: discord not available for aarch64, this leads to flake evaluation for this arch fail.
@@ -9,7 +9,7 @@ writeShellApplication {
   name = "open-messaging";
 
   runtimeInputs = [
-    nheko
+    element-desktop
     telegram-desktop
     thunderbird
     discord
@@ -18,7 +18,7 @@ writeShellApplication {
   text = ''
     thunderbird &
     sleep 0.1
-    nheko &
+    element-desktop &
     sleep 0.1
     Telegram &
     sleep 0.1

packages/smath-studio.nix

@@ -0,0 +1,35 @@
+{
+  appimageTools,
+  fetchurl,
+  libgdiplus,
+}: let
+  pname = "smath-studio";
+  version = "1.3.0.9126";
+
+  src = fetchurl {
+    url = "https://smath.com/en-US/files/Download/cqSek/SMathStudioDesktop.1_3_0_9126.x86_64.ubuntu-22_04.glibc2.35.AppImage";
+    hash = "sha256-4FpdFGPFaPDK6WWSJHVtxcC8auaNkGmHyUtbegij6cQ=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+in
+  appimageTools.wrapType2 {
+    inherit pname version src;
+
+    extraPkgs = pkgs:
+      with pkgs; [
+        gtk2
+      ];
+
+    profile = ''
+      export LD_PRELOAD="${libgdiplus}/lib/libgdiplus.so.0"
+    '';
+
+    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
+    '';
+  }

pkgs/pob2-frajul/default.nix

@@ -1,16 +0,0 @@
-{
-  writeShellApplication,
-  xhost,
-}:
-writeShellApplication {
-  name = "pob2-frajul";
-
-  runtimeInputs = [
-    xhost
-  ];
-
-  text = ''
-    xhost +
-    sudo -u pob -i sh /home/pob/pob2.sh
-  '';
-}

pkgs/pob2/default.nix

@@ -1,88 +0,0 @@
-{
-  pkgs,
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  unzip,
-  ...
-}: let
-  data = stdenv.mkDerivation (finalAttrs: {
-    pname = "path-of-building-data";
-    version = "dev-version";
-
-    src = fetchFromGitHub {
-      owner = "PathOfBuildingCommunity";
-      repo = "PathOfBuilding-PoE2";
-      rev = "3c579af5612d2137d37558d40d797801b5bbaa69";
-      hash = "sha256-hRS4k2V9Ze6dc7BMA0iZxjCOZgqPa3Cu7gRZiVLrFR4=";
-    };
-
-    nativeBuildInputs = [unzip];
-
-    buildCommand = ''
-      # I have absolutely no idea how this file is generated
-      # and I don't think I want to know. The Flatpak also does this.
-      unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua
-
-      # Install the actual data
-      cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out
-
-      # Pretend this is an official build so we don't get the ugly "dev mode" warning
-      substituteInPlace $out/manifest.xml --replace '<Version' '<Version platform="nixos"'
-      touch $out/installed.cfg
-
-      # Completely stub out the update check
-      chmod +w $out/src/UpdateCheck.lua
-      echo 'return "none"' > $out/src/UpdateCheck.lua
-    '';
-  });
-in
-  stdenv.mkDerivation {
-    pname = "path-of-building-2";
-    version = "${data.version}-unstable-2023-04-09";
-
-    src = fetchFromGitHub {
-      owner = "ernstp";
-      repo = "pobfrontend";
-      rev = "9faa19aa362f975737169824c1578d5011487c18";
-      hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk=";
-    };
-
-    nativeBuildInputs = with pkgs; [
-      meson
-      ninja
-      pkg-config
-      kdePackages.qttools
-      kdePackages.wrapQtAppsHook
-    ];
-    buildInputs = with pkgs; [
-      kdePackages.qtbase
-      luajit
-      luajit.pkgs.lua-curl
-    ];
-
-    installPhase = ''
-      runHook preInstall
-      install -Dm555 pobfrontend $out/bin/pobfrontend
-      runHook postInstall
-    '';
-
-    preFixup = ''
-      qtWrapperArgs+=(
-        --set LUA_PATH "$LUA_PATH"
-        --set LUA_CPATH "$LUA_CPATH"
-        --chdir "${data}"
-      )
-    '';
-
-    passthru.data = data;
-
-    meta = {
-      description = "Offline build planner for Path of Exile";
-      homepage = "https://pathofbuilding.community/";
-      license = lib.licenses.mit;
-      maintainers = [lib.maintainers.k900];
-      mainProgram = "pobfrontend";
-      broken = stdenv.isDarwin; # doesn't find uic6 for some reason
-    };
-  }