magpie/inventree: add module and configuration

CLAUDE.md

@@ -1,80 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Repository purpose
-
-Personal NixOS configuration managing multiple hosts via a single flake. Each host is a separate `nixosConfiguration` output in `flake.nix`. Home Manager is wired in as a NixOS module per host. Upstream is `nixos-25.11`.
-
-## Hosts
-
-Defined in `flake.nix` under `nixosConfigurations`:
-
-- `fuji` — x86_64 laptop, Plasma6 + Sway, intel 13th gen, dual wireguard (one in a network namespace for ProtonVPN routed via `dnscrypt-proxy`)
-- `nixy` — x86_64 workstation (also builds the `nixy_iso` installer image)
-- `mediabox` — x86_64 media server (jellyfin/qbittorrent; uses the local `modules/qbittorrent.nix`)
-- `blue` — x86_64 (no sops-nix)
-- `magpie` — **aarch64**, qemu guest, runs `simple-nixos-mailserver`; the wireguard hub other hosts dial into
-
-When adding a new host, follow the pattern in `flake.nix`: include `common/packages.nix`, `common/suspend.nix`, the host's `configuration.nix` + `hardware-configuration.nix`, `sops-nix.nixosModules.sops` (if secrets needed), and a home-manager block pointing at `home/<host>/home.nix`.
-
-## Common commands
-
-```sh
-# Rebuild the current host (uses hostname to select config)
-sudo nixos-rebuild switch --flake .#
-
-# Rebuild a specific host
-sudo nixos-rebuild switch --flake .#fuji
-
-# Test without making the new generation the default boot entry
-sudo nixos-rebuild test --flake .#fuji
-
-# Build the nixy installer ISO
-nix build .#nixosConfigurations.nixy_iso.config.system.build.isoImage
-
-# Update a single flake input
-nix flake update nixpkgs
-
-# Format Nix files (formatter is alejandra)
-nix fmt
-
-# Enter the dev shell (sops, ssh-to-age, age available)
-nix develop
-
-# Cross-build magpie (aarch64) from x86_64 — requires binfmt or remote builder
-nix build .#nixosConfigurations.magpie.config.system.build.toplevel
-```
-
-`fuji` has `boot.binfmt.emulatedSystems` for wasm32-wasi + x86_64-windows but **not** aarch64, so building magpie locally from fuji needs a remote builder or adding aarch64 to that list.
-
-## Directory layout
-
-- `<host>/configuration.nix` + `<host>/hardware-configuration.nix` — per-host NixOS config
-- `<host>/secrets/*.yaml` — sops-encrypted secrets, decrypted at activation via the host's SSH host key (`/etc/ssh/ssh_host_ed25519_key` → age)
-- `common/` — modules imported by every host (`packages.nix`, `suspend.nix`) plus shared wireguard pubkeys and `common/secrets/` for cross-host secrets like the wireguard preshared key
-- `home/<host>/home.nix` — entry point for that host's home-manager config
-- `home/common/` — shared home-manager modules (zsh, sway, i3, i3status-rust, firefox, etc.) imported from per-host `home.nix`
-- `modules/` — local NixOS modules not yet upstream-ready (currently `qbittorrent.nix`, `nextcloud.nix`)
-- `packages/` — derivations for packages built locally (`bubblewrap`, `viber`)
-
-## Architectural notes worth knowing before editing
-
-**Inputs are passed as `_module.args` to every module.** That means `configuration.nix` files receive `nvim`, `zremap`, `swaysw`, `system`, etc. as function arguments — they aren't imported explicitly. When you see an unfamiliar identifier in a host module's arg list, check `flake.nix` inputs.
-
-**sops-nix wiring.** Secrets decrypt using the host's SSH ed25519 host key converted to age. Each host's `sops.secrets.<name>` references either `./secrets/<file>.yaml` (host-local) or `../common/secrets/<file>.yaml` (shared). `config.sops.secrets.<name>.path` is the runtime decrypted path — pass it to systemd units, never read the file at eval time.
-
-**Fuji's split-tunnel ProtonVPN.** `fuji/configuration.nix` builds a `wg` network namespace, brings up `proton_wg` inside it, and runs `dnscrypt-proxy_proton` bound to that namespace. Anything that should egress over Proton must be launched with `ip netns exec wg ...`. The main-host `wg0` interface is unrelated and connects to magpie for the personal mesh (`10.100.0.0/24`).
-
-**Home-manager backup extension.** `backupFileExtension = "home_backup"` is set on most hosts — if a switch fails on file conflicts, look for `*.home_backup` files in `$HOME`.
-
-**Hardening already in place on fuji** (mirror to other hosts when relevant): nftables firewall, scudo allocator, AppArmor, sysctl hardening (kptr_restrict, dmesg_restrict, rp_filter, redirect blocking), `sudo.execWheelOnly`, `firewall.logRefusedConnections`, doas, firejail, no coredumps, `KillUserProcesses`, ro nix store mount, systemd-boot editor disabled.
-
-## Editing secrets
-
-```sh
-nix develop          # gets sops + age + ssh-to-age
-sops <host>/secrets/<file>.yaml
-```
-
-`.sops.yaml` (if present at repo root, otherwise inferred) defines which age keys may decrypt which paths. When adding a new host, derive its age pubkey from the SSH host key with `ssh-to-age` and add it to the `.sops.yaml` creation rules before re-encrypting.

flake.lock

@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778507602,
+        "lastModified": 1772665116,
-        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "narHash": "sha256-XmjUDG/J8Z8lY5DVNVUf5aoZGc400FxcjsNCqHKiKtc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "rev": "39f53203a8458c330f61cc0759fe243f0ac0d198",
         "type": "github"
       },
       "original": {
@@ -103,16 +103,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1779726825,
+        "lastModified": 1772633058,
-        "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=",
+        "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b179bde238977f7d4454fc770b1a727eaf55111c",
+        "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-26.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -140,48 +140,32 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1779971959,
+        "lastModified": 1772598333,
-        "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=",
+        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011",
+        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-26.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1779971959,
+        "lastModified": 1772598333,
-        "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=",
+        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011",
+        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-26.05",
+        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -193,11 +177,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780213167,
+        "lastModified": 1769036658,
-        "narHash": "sha256-50MzkuYn590Tk89/YivGZ8Z8ZtKRXcP+iHqpLv6TYXA=",
+        "narHash": "sha256-bia1yOQtC8A7XZRCTdLvY0Bdv4i/V6hMqb0NM/9h/jc=",
         "ref": "refs/heads/master",
-        "rev": "a5224c23744b0a89e32992442bba4cfaa8464d59",
+        "rev": "9c1eb1b999522b965ce129043c7112fc9e38c75a",
-        "revCount": 54,
+        "revCount": 52,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/nvim_flake"
       },
@@ -228,46 +212,6 @@
         "url": "https://git.project-cloud.net/asmir/project-cloud"
       }
     },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "quickshell_bar",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1779430452,
-        "narHash": "sha256-zTslhsxLqUlRTML506iougTGzyR38Fzhzn7t4KDEuuE=",
-        "ref": "refs/heads/master",
-        "rev": "4b4fca3224ab977dc515ac0bb78d00b3dfa71e00",
-        "revCount": 819,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      }
-    },
-    "quickshell_bar": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2",
-        "quickshell": "quickshell"
-      },
-      "locked": {
-        "lastModified": 1780212524,
-        "narHash": "sha256-r+zAR7SijYiQlanbuOKLEItYXfIOnkyQBPl3QoMWLIg=",
-        "ref": "refs/heads/master",
-        "rev": "f8a4536a02e9ce2d78eabf8df0b7ccc59b8ebb15",
-        "revCount": 1,
-        "type": "git",
-        "url": "https://git.project-cloud.net/asmir/quickshell_bar"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.project-cloud.net/asmir/quickshell_bar"
-      }
-    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
@@ -276,7 +220,6 @@
         "nixpkgs": "nixpkgs",
         "nvim": "nvim",
         "project-cloud": "project-cloud",
-        "quickshell_bar": "quickshell_bar",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "sops-nix": "sops-nix",
         "swaysw": "swaysw",
@@ -293,14 +236,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1779651513,
+        "lastModified": 1772763116,
-        "narHash": "sha256-lUmq8sXQzihreq9UMqAkSBy9z9ueZbRnFyltzYVfQ2I=",
+        "narHash": "sha256-5NUtdVWnEflm829QI0BIj2rDhI+pfagt+cxIARJEhi8=",
-        "type": "tarball",
+        "owner": "simple-nixos-mailserver",
-        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-26.05/nixos-mailserver-nixos-26.05.tar.gz"
+        "repo": "nixos-mailserver",
+        "rev": "c04152fa90ba5079f4517aa24383245937e43ab8",
+        "type": "gitlab"
       },
       "original": {
-        "type": "tarball",
+        "owner": "simple-nixos-mailserver",
-        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-26.05/nixos-mailserver-nixos-26.05.tar.gz"
+        "repo": "nixos-mailserver",
+        "type": "gitlab"
       }
     },
     "sops-nix": {
@@ -310,11 +256,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777944972,
+        "lastModified": 1772495394,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
         "type": "github"
       },
       "original": {
@@ -382,11 +328,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780166195,
+        "lastModified": 1764579633,
-        "narHash": "sha256-kqViUrWwIJP7xVCpcZbRk7IygAw/Tll/UmbcAW9zRPk=",
+        "narHash": "sha256-gOD5RMHOB9Fw4T3nk2a95YdU0J24QU3uWUiZVIQza64=",
         "ref": "refs/heads/master",
-        "rev": "e1aecedf30f3b3cedd89d84364bd7e548a011bcd",
+        "rev": "b0707744e2b4a077e759145cdbfa8d8d1017e732",
-        "revCount": 26,
+        "revCount": 25,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/zremap"
       },

flake.nix

@@ -2,8 +2,9 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-    nixos.url = "github:nixos/nixpkgs/nixos-26.05";
+    nixos.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs_unstable.url = "nixpkgs/nixos-unstable";
 
     nix-xilinx = {
       url = "gitlab:asmir.abdulahovic/nix-xilinx";
@@ -20,10 +21,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    quickshell_bar = {
-      url = "git+https://git.project-cloud.net/asmir/quickshell_bar";
-    };
-
     nvim = {
       url = "git+https://git.project-cloud.net/asmir/nvim_flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -35,12 +32,12 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-26.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     simple-nixos-mailserver = {
-      url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-26.05/nixos-mailserver-nixos-26.05.tar.gz";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -48,6 +45,11 @@
       url = "git+https://git.project-cloud.net/asmir/project-cloud";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nixos-inventree = {
+      url = "github:Gigahawk/nixos-inventree";
+      inputs.nixpkgs.follows = "nixpkgs_unstable";
+    };
   };
 
   outputs =
@@ -61,6 +63,7 @@
     , swaysw
     , zremap
     , nixos
+    , nixos-inventree
     , ...
     }:
     let
@@ -182,6 +185,7 @@
             { _module.args = inputs; }
             { _module.args.system = system; }
             { nix.registry.nixpkgs.flake = nixpkgs; }
+            nixos-inventree.nixosModules.default
             ./magpie/configuration.nix
             ./magpie/hardware-configuration.nix
             simple-nixos-mailserver.nixosModule

fuji/configuration.nix

@@ -93,24 +93,11 @@ in
       "xe.force_probe=a7a0"
       "i915.force_probe=!a7a0"
     ];
-    #kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages_latest;
     kernel.sysctl = {
       "net.core.default_qdisc" = "fq";
       "net.ipv4.tcp_congestion_control" = "bbr";
       "kernel.unprivileged_userns_clone" = "1"; /* Needed with harderned kernel */
-      "kernel.kptr_restrict" = 2;
-      "kernel.dmesg_restrict" = 1;
-      "kernel.kexec_load_disabled" = 1;
-      "kernel.yama.ptrace_scope" = 1;
-      "net.ipv4.conf.all.rp_filter" = 1;
-      "net.ipv4.conf.default.rp_filter" = 1;
-      "net.ipv4.conf.all.log_martians" = 1;
-      "net.ipv4.conf.all.accept_redirects" = 0;
-      "net.ipv4.conf.default.accept_redirects" = 0;
-      "net.ipv4.conf.all.send_redirects" = 0;
-      "net.ipv4.conf.default.send_redirects" = 0;
-      "net.ipv6.conf.all.accept_redirects" = 0;
-      "net.ipv6.conf.default.accept_redirects" = 0;
     };
     loader.efi.canTouchEfiVariables = true;
     loader.systemd-boot = {
@@ -129,7 +116,6 @@ in
     rtkit.enable = true;
     allowSimultaneousMultithreading = true;
     sudo.enable = true;
-    sudo.execWheelOnly = true;
     doas.enable = true;
     doas.extraRules = [
       {
@@ -138,10 +124,6 @@ in
         persist = true;
       }
     ];
-    apparmor = {
-      enable = true;
-      killUnconfinedConfinables = true;
-    };
   };
 
   powerManagement = {
@@ -152,7 +134,6 @@ in
     nftables.enable = true;
     firewall = {
       enable = true;
-      logRefusedConnections = true;
       allowedTCPPorts = [
         80
         443
@@ -218,8 +199,8 @@ in
     nvim.overlays.${system}.overlay
   ];
   environment = {
-    #memoryAllocator.provider = "mimalloc";
+    systemPackages = with pkgs; [ alsa-ucm-conf maliit-keyboard ];
-    systemPackages = with pkgs; [ maliit-keyboard android-tools ];
+    variables.ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf}/share/alsa/ucm2";
 
     sessionVariables = {
       LIBVA_DRIVER_NAME = "iHD";
@@ -257,7 +238,7 @@ in
     };
     appimage = {
       enable = true;
-      binfmt = false;
+      binfmt = true;
     };
     nix-ld = {
       enable = false;
@@ -266,13 +247,9 @@ in
         zlib
       ];
     };
-    zsh = {
+    zsh.enable = true;
-      enable = true;
-      promptInit = "";
-      enableCompletion = false;
-      setOptions = [ ];
-    };
     firejail.enable = true;
+    adb.enable = true;
     wireshark.enable = true;
     sway.enable = true;
   };
@@ -440,12 +417,8 @@ in
       };
     };
 
-    logind.settings.Login = {
+    logind = {
-      HandlePowerKey = "suspend";
+      powerKey = "suspend";
-      HandleLidSwitch = "suspend";
-      HandleLidSwitchExternalPower = "suspend";
-      HandleLidSwitchDocked = "ignore";
-      KillUserProcesses = true;
     };
 
     desktopManager = {
@@ -555,13 +528,13 @@ in
         {
           keys = [ 224 ];
           events = [ "key" ];
-          command = "${pkgs.brightnessctl}/bin/brightnessctl set 5%-";
+          command = "${pkgs.light}/bin/light -U 5";
         }
 
         {
           keys = [ 225 ];
           events = [ "key" ];
-          command = "${pkgs.brightnessctl}/bin/brightnessctl set 5%+";
+          command = "${pkgs.light}/bin/light -A 5";
         }
       ];
     };
@@ -625,6 +598,10 @@ in
       SystemMaxUse=50M
     '';
 
+    logind.settings.Login = {
+      KillUserProcesses = true;
+    };
+
   };
 
   fonts = {
@@ -714,6 +691,7 @@ in
     initialHashedPassword = "$y$j9T$FZnEcCEMIC0Fjj4dZi5t8.$D8ygvO19dR5nyTZxWwDgjEimHutD.sKnD1DLAyhU8.B";
     shell = pkgs.zsh;
     extraGroups = [
+      "adbusers"
       "audio"
       "dialout"
       "input"

fuji/hardware-configuration.nix

@@ -21,14 +21,12 @@
     {
       device = "/dev/mapper/fuji_lvm_root-root";
       fsType = "xfs";
-      options = [ "noatime" "logbsize=256k" ];
     };
 
   fileSystems."/home" =
     {
       device = "/dev/mapper/fuji_lvm_root-home";
       fsType = "xfs";
-      options = [ "noatime" "logbsize=256k" ];
     };
 
   fileSystems."/boot" =

home/common/sway.nix

@@ -25,7 +25,6 @@ let
     --hooks ''\'systemctl --user restart lisgd.service''\'
   '';
   swaysw = inputs.swaysw.packages.${system}.swaysw;
-  quickshell_bar = inputs.quickshell_bar.packages.${system}.default;
   term = "${pkgs.foot}/bin/footclient";
 in
 {
@@ -93,9 +92,19 @@ in
         };
       };
 
-      bars = [ ];
+      bars = [
-      startup = [
+        {
-        { command = "exec ${quickshell_bar}/bin/quickshell-bar"; }
+          position = "top";
+          fonts = {
+            names = [
+              "Iosevka"
+              "FontAwesome"
+            ];
+            style = "Bold Semi-Condensed";
+            size = 12.0;
+          };
+          statusCommand = "${lib.getExe pkgs.i3status-rust} ~/.config/i3status-rust/config-top.toml";
+        }
       ];
 
       keybindings = {

home/common/zsh.nix

@@ -10,14 +10,9 @@
     enableZshIntegration = true;
   };
 
-  programs.fzf = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-
   programs.zsh = {
     autocd = true;
-    enableCompletion = true;
+    enableCompletion = false;
     defaultKeymap = "viins";
     /* dotDir = "\"$XDG_CONFIG_HOME\"/zsh"; */
 
@@ -68,6 +63,11 @@
         };
         file = "pure.plugin.zsh";
       }
+      {
+        name = "fzf";
+        src = pkgs.fzf-zsh;
+        file = "share/zsh/plugins/fzf-zsh/fzf-zsh.plugin.zsh";
+      }
       {
         name = "zsh-sudo";
         src = pkgs.oh-my-zsh;
@@ -89,7 +89,7 @@
       RPS1=""
 
       function chpwd() {
-        ls --color=tty;
+        ls;
       }
 
       function osc7-pwd() {
@@ -104,7 +104,7 @@
       }
       add-zsh-hook -Uz chpwd chpwd-osc7-pwd
 
-      #eval "$(direnv hook zsh)"
+      eval "$(direnv hook zsh)"
       zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
 
       if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then

home/fuji/home.nix

@@ -36,16 +36,6 @@ in
     };
   };
 
-  gtk = {
-    enable = true;
-    theme = { name = "Adwaita-dark"; package = pkgs.gnome-themes-extra; };
-  };
-  qt = {
-    enable = true;
-    style.name = "adwaita-dark";
-    platformTheme.name = "gtk";
-  };
-
   fonts.fontconfig.enable = true;
 
   home.sessionVariables = rec {
@@ -101,9 +91,6 @@ in
         pkgs.mpvScripts.uosc
         pkgs.mpvScripts.webtorrent-mpv-hook
       ];
-      scriptOpts.webtorrent = {
-        path = "/tmp";
-      };
       config = {
         osc = "no";
         osd-bar = "no";
@@ -114,16 +101,6 @@ in
         vo = "dmabuf-wayland";
         ao = "pipewire";
         ytdl-format = "bestvideo[height<=1080]+bestaudio/best[height<=1080]";
-        video-osd = "yes";
-        osd-back-color = "0.0/0.0/0.0/0.0";
-      };
-
-      scriptOpts = {
-        uosc = {
-          disable_elements = "buffering_indicator";
-          timeline_style = "bar";
-          top_bar = "no-border";
-        };
       };
 
       bindings = {
@@ -181,12 +158,6 @@ in
       };
 
       settings = {
-        # Workaround for QtWebEngine screen flicker/flash on Wayland+Intel
-        qt.args = [
-          "disable-gpu-compositing"
-          "enable-features=VaapiVideoDecoder,VaapiVideoEncoder"
-        ];
-        colors.webpage.preferred_color_scheme = "dark";
         content.notifications.enabled = false;
         content.pdfjs = true;
         content.webgl = false;
@@ -291,13 +262,22 @@ in
         */
       {
         enable = true;
-        events = {
+        events = [
-          before-sleep = "${locker}/bin/swaylock_fancy";
+          {
-          lock = "${locker}/bin/swaylock_fancy";
+            event = "before-sleep";
+            command = "${locker}/bin/swaylock_fancy";
+          }
+          {
+            event = "lock";
+            command = "${locker}/bin/swaylock_fancy";
+          }
           /*
-            after-resume = "${refresh_i3status}/bin/refresh_i3status";
+            {
+              event = "after-resume";
+              command = "${refresh_i3status}/bin/refresh_i3status";
+            }
           */
-        };
+        ];
         timeouts = [
           {
             timeout = 15 * 60;

home/fuji/home_packages.nix

@@ -160,7 +160,7 @@ in
       ungoogled-chromium
       upx
       viber
-      karere
+      wasistlos
       waybar
       wdisplays
       weechat

magpie/configuration.nix

@@ -27,19 +27,6 @@
   boot.kernel.sysctl = {
     "net.core.default_qdisc" = "fq";
     "net.ipv4.tcp_congestion_control" = "bbr";
-    "kernel.kptr_restrict" = 2;
-    "kernel.dmesg_restrict" = 1;
-    "kernel.kexec_load_disabled" = 1;
-    "kernel.yama.ptrace_scope" = 1;
-    "net.ipv4.conf.all.rp_filter" = 1;
-    "net.ipv4.conf.default.rp_filter" = 1;
-    "net.ipv4.conf.all.log_martians" = 1;
-    "net.ipv4.conf.all.accept_redirects" = 0;
-    "net.ipv4.conf.default.accept_redirects" = 0;
-    "net.ipv4.conf.all.send_redirects" = 0;
-    "net.ipv4.conf.default.send_redirects" = 0;
-    "net.ipv6.conf.all.accept_redirects" = 0;
-    "net.ipv6.conf.default.accept_redirects" = 0;
   };
 
   boot.initrd = {
@@ -62,7 +49,7 @@
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
-  users.users.root.hashedPassword = "!";
+  users.users.root.initialHashedPassword = "";
   users.users.root.openssh.authorizedKeys.keys = [
     (builtins.readFile ../nixy/ssh_pubkey)
   ];
@@ -121,14 +108,10 @@
     certificateScheme = "acme-nginx";
   };
 
-  services.journald.extraConfig = ''SystemMaxUse=500M '';
+  services.journald.extraConfig = ''SystemMaxUse=50M '';
   services.logind.settings.Login = { KillUserProcesses = true; };
+  services.openssh.settings.PermitRootLogin = "prohibit-password";
   services.openssh.enable = true;
-  services.openssh.settings = {
-    PermitRootLogin = "prohibit-password";
-    PasswordAuthentication = false;
-    KbdInteractiveAuthentication = false;
-  };
   services.openssh.listenAddresses = [
     {
       addr = "10.100.0.1"; # wireguard
@@ -136,13 +119,6 @@
     }
   ];
 
-  services.fail2ban = {
-    enable = true;
-    maxretry = 5;
-    bantime = "1h";
-    ignoreIP = [ "10.100.0.0/24" ];
-  };
-
   services.opendkim = {
     enable = true;
     selector = "mail";
@@ -248,6 +224,23 @@
         proxyPass = "http://localhost:8002/";
       };
     };
+
+    virtualHosts."inventree.project-cloud.net" = {
+      quic = true;
+      http3 = true;
+      forceSSL = true;
+      enableACME = true;
+      locations."/" = {
+        proxyPass = "http://localhost:8004";
+        proxyWebsockets = true;
+      };
+      locations."/static/" = {
+        alias = "/var/lib/inventree/static/";
+      };
+      locations."/media/" = {
+        alias = "/var/lib/inventree/media/";
+      };
+    };
   };
 
   services.gitea = {
@@ -320,6 +313,68 @@
     startAt = "daily";
   };
 
+  services.inventree = {
+    enable = true;
+
+    # IP and port for gunicorn to bind to
+    bindIp = "127.0.0.1";
+    bindPort = 8004;
+    # Or override the full bind string for e.g. unix sockets:
+    # serverBind = "unix:/run/inventree/inventree.sock";
+
+    # Where InvenTree stores its data (default: /var/lib/inventree)
+    dataDir = "/var/lib/inventree";
+
+    # Systemd timeout for migrations (can be slow on upgrades)
+    serverStartTimeout = "10min";
+    serverStopTimeout = "5min";
+
+    # config.yaml options — freeform, so any key from
+    # https://docs.inventree.org/en/stable/start/config/ works here
+    config = {
+      site_url = "https://inventree.project-cloud.net";
+      allowed_hosts = [ "*" ];
+
+      # Database — defaults to SQLite if not specified
+      database = {
+        ENGINE = "django.db.backends.postgresql";
+        NAME = "inventree";
+        USER = "inventree";
+        HOST = "/run/postgresql";  # peer auth via unix socket
+        PORT = "";
+      };
+
+      # Static/media/backup paths
+      static_root = "/var/lib/inventree/static";
+      media_root = "/var/lib/inventree/media";
+      backup_dir = "/var/lib/inventree/backup";
+
+    };
+
+    plugins = {
+      inventree-kicad-plugin = [];
+    };
+
+    # Declarative user management
+    users = {
+      admin = {
+        email = "asmir@project-cloud.net";
+        is_superuser = true;
+        password_file = "/tmp/inventree-admin-password";
+      };
+    };
+  };
+
+  # If using PostgreSQL:
+  services.postgresql = {
+    enable = true;
+    ensureDatabases = [ "inventree" ];
+    ensureUsers = [{
+      name = "inventree";
+      ensureDBOwnership = true;
+    }];
+  };
+
   # needed for sendmail mail functionality
   users.users.gitea.extraGroups = [ "postdrop" ];
   systemd.services.gitea.serviceConfig = {
@@ -332,12 +387,6 @@
     defaults.email = "asmir.abdulahovic@gmail.com";
   };
 
-  security.sudo.execWheelOnly = true;
-
-  environment.memoryAllocator.provider = "jemalloc";
-
-  systemd.coredump.enable = false;
-
   sops = {
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
     secrets = {
@@ -371,13 +420,14 @@
       80
       443
       587
-    ]; # http, https, submission
+      2049
+    ]; # http, mail, mail, nfs
     allowedUDPPorts = [
       443
       51820
-    ]; # http3, wireguard
+    ]; # mail, wireguard
     allowPing = true;
-    logRefusedConnections = lib.mkDefault true;
+    logRefusedConnections = lib.mkDefault false;
   };
 
   networking.nat = {

packages/bubblewrap/default.nix

@@ -27,10 +27,6 @@ stdenv.mkDerivation rec {
       --replace "/var/tmp" "$TMPDIR"
   '';
 
-  # GCC 15 (nixpkgs 26.05) defaults to -std=gnu23, where `bool`/`true`/`false`
-  # are keywords; this old bubblewrap fork still does `typedef int bool;`.
-  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
-
   nativeBuildInputs = [
     docbook_xsl
     libxslt