Merge branch 'host_cleanup'

fuji: format, cleanup syntax
clean old hosts
2026-05-31 12:03:07 +02:00 · 2026-05-31 12:03:01 +02:00 · 2026-05-31 12:02:20 +02:00 · 2026-05-31 11:56:52 +02:00 · 2026-05-31 11:55:40 +02:00 · 2026-05-31 11:55:16 +02:00
31 changed files with 307 additions and 2016 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1,80 @@
+# 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.
--- a/blue/configuration.nix
+++ b/blue/configuration.nix
@@ -1,333 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-{
-  imports = [
-  ];
-
-  system.stateVersion = "23.05";
-  system.autoUpgrade.enable = true;
-
-  nix = {
-    optimise.automatic = true;
-    gc.automatic = true;
-    gc.options = "--delete-older-than 7d";
-    package = pkgs.nixVersions.latest;
-    settings.experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-  };
-
-  boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = [ "msr.allow_writes=on" ];
-    supportedFilesystems = [ "btrfs" ];
-    tmpOnTmpfs = true;
-    initrd.compressor = "zstd";
-    loader.systemd-boot = {
-      enable = true;
-      editor = false;
-      memtest86.enable = true;
-    };
-    loader.efi.canTouchEfiVariables = true;
-    readOnlyNixStore = true;
-  };
-
-  security = {
-    rtkit.enable = true;
-    allowSimultaneousMultithreading = true;
-    sudo.enable = false;
-    doas.enable = true;
-    doas.extraRules = [
-      {
-        users = [ "akill" ];
-        keepEnv = true;
-        persist = true;
-      }
-    ];
-  };
-
-  powerManagement = {
-    enable = true;
-  };
-
-  networking = {
-    firewall.enable = true;
-    hostName = "blue";
-    nameservers = [
-      "127.0.0.1"
-      "::1"
-    ];
-    dhcpcd.extraConfig = "nohook resolv.conf";
-
-    networkmanager = {
-      enable = true;
-      dns = "none";
-      # wifi.backend = "iwd";
-    };
-  };
-
-  time.timeZone = "Europe/Sarajevo";
-
-  nixpkgs.config.allowUnfree = true;
-  environment = {
-    homeBinInPath = true;
-    variables = {
-      PATH = "$HOME/.cargo/bin";
-    };
-  };
-
-  programs = {
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-    zsh.enable = true;
-    firejail.enable = true;
-    adb.enable = true;
-    wireshark.enable = true;
-    sway.enable = true;
-  };
-
-  # List services that you want to enable:
-  systemd = {
-    services = {
-      "caps2esc" = {
-        description = "Intercepts keyboard udev events";
-        wants = [ "systemd-udevd.service" ];
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig.Nice = -20;
-        script = ''
-          ${pkgs.interception-tools}/bin/intercept \
-          -g /dev/input/by-path/*-kbd | \
-          /opt/caps2esc  | ${pkgs.interception-tools}/bin/uinput   \
-          -d /dev/input/by-path/*-kbd   \
-        '';
-      };
-    };
-
-    extraConfig = ''
-      DefaultTimeoutStartSec=30s
-      DefaultTimeoutStopSec=30s
-    '';
-  };
-
-  services = {
-    acpid.enable = true;
-    btrfs.autoScrub.enable = true;
-    dbus.enable = true;
-    fstrim.enable = true;
-    fwupd.enable = true;
-    ntp.enable = true;
-    openssh.enable = false;
-    printing.enable = true;
-
-    nextcloud = {
-      enable = true;
-      hostName = "localhost";
-      config.adminpassFile = "${pkgs.writeText "adminpass" "test123"}";
-    };
-
-    jellyfin = {
-      enable = false;
-      user = "akill";
-      openFirewall = false;
-    };
-
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-
-    xserver = {
-      enable = true;
-      dpi = 144;
-      libinput.enable = true;
-      desktopManager.xterm.enable = false;
-      displayManager = {
-        lightdm.enable = false;
-        startx.enable = true;
-        defaultSession = "none+i3";
-      };
-      windowManager.i3.enable = true;
-    };
-
-    udev.packages = [
-      pkgs.rtl-sdr
-      pkgs.openhantek6022
-    ];
-
-    tlp = {
-      enable = true;
-    };
-
-    actkbd = {
-      enable = true;
-      bindings = [
-        {
-          keys = [ 113 ];
-          events = [ "key" ];
-          command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
-        }
-
-        {
-          keys = [ 114 ];
-          events = [
-            "key"
-            "rep"
-          ];
-          command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
-        }
-
-        {
-          keys = [ 115 ];
-          events = [
-            "key"
-            "rep"
-          ];
-          command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
-        }
-
-        {
-          keys = [ 224 ];
-          events = [ "key" ];
-          command = "${pkgs.light}/bin/light -U 5";
-        }
-
-        {
-          keys = [ 225 ];
-          events = [ "key" ];
-          command = "${pkgs.light}/bin/light -A 5";
-        }
-      ];
-    };
-
-    mpd = {
-      musicDirectory = "/home/mpd/music";
-      enable = false;
-      extraConfig = ''
-        audio_output {
-          type "pulse"
-          name "pulsee srv"
-          server "127.0.0.1"
-        }
-      '';
-    };
-
-    dnscrypt-proxy2 = {
-      enable = true;
-      settings = {
-        ipv6_servers = true;
-        require_dnssec = true;
-
-        sources.public-resolvers = {
-          urls = [
-            "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
-            "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
-          ];
-          cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
-          minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
-        };
-      };
-    };
-
-    journald.extraConfig = ''
-      SystemMaxUse=50M
-    '';
-
-    logind.extraConfig = ''
-      KillUserProcesses=yes
-    '';
-  };
-
-  fonts = {
-    fontconfig = {
-      cache32Bit = true;
-      allowBitmaps = true;
-      useEmbeddedBitmaps = true;
-      defaultFonts = {
-        monospace = [ "JetBrainsMono" ];
-      };
-    };
-
-    fonts = with pkgs; [
-      dejavu_fonts
-      dina-font
-      fira-code
-      fira-code-symbols
-      font-awesome
-      font-awesome_4
-      inconsolata
-      iosevka
-      jetbrains-mono
-      liberation_ttf
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      proggyfonts
-      siji
-      terminus_font
-      terminus_font_ttf
-      ubuntu_font_family
-    ];
-  };
-
-  virtualisation = {
-    containers.storage.settings = {
-      storage = {
-        driver = "btrfs";
-        graphroot = "/var/lib/containers/storage";
-        runroot = "/run/containers/storage";
-      };
-    };
-    podman = {
-      enable = true;
-      dockerCompat = true;
-    };
-  };
-
-  sound.enable = true;
-
-  hardware = {
-    bluetooth = {
-      enable = true;
-      settings = {
-        General = {
-          Enable = "Source,Sink,Media,Socket";
-        };
-      };
-    };
-
-    opengl = {
-      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
-      extraPackages = with pkgs; [
-      ];
-    };
-  };
-
-  zramSwap = {
-    enable = false;
-    algorithm = "zstd";
-  };
-
-  users.users.akill = {
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    extraGroups = [
-      "wireshark"
-      "kvm"
-      "tty"
-      "audio"
-      "sound"
-      "adbusers"
-      "dialout"
-    ];
-  };
-}
--- a/blue/hardware-configuration.nix
+++ b/blue/hardware-configuration.nix
@@ -1,100 +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,
-  modulesPath,
-  ...
-}:
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
-    fsType = "btrfs";
-    options = [
-      "subvol=root"
-      "compress=zstd"
-      "noatime"
-    ];
-  };
-
-  boot.initrd.luks.devices."enc_root".device =
-    "/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
-    fsType = "btrfs";
-    options = [
-      "subvol=home"
-      "compress=zstd"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
-    fsType = "btrfs";
-    options = [
-      "subvol=nix"
-      "compress=zstd"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/var/log" = {
-    device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
-    fsType = "btrfs";
-    options = [
-      "subvol=log"
-      "compress=zstd"
-      "noatime"
-    ];
-    neededForBoot = true;
-  };
-
-  fileSystems."/persist" = {
-    device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
-    fsType = "btrfs";
-    options = [
-      "subvol=persist"
-      "compress=zstd"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/6C85-D29B";
-    fsType = "vfat";
-  };
-
-  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.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/flake.lock
+++ b/flake.lock
@@ -61,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772665116,
-        "narHash": "sha256-XmjUDG/J8Z8lY5DVNVUf5aoZGc400FxcjsNCqHKiKtc=",
+        "lastModified": 1778507602,
+        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "39f53203a8458c330f61cc0759fe243f0ac0d198",
+        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
        "type": "github"
      },
      "original": {
@@ -103,16 +103,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1772633058,
-        "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
+        "lastModified": 1779726825,
+        "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
+        "rev": "b179bde238977f7d4454fc770b1a727eaf55111c",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -140,32 +140,48 @@
    },
    "nixos": {
      "locked": {
-        "lastModified": 1772598333,
-        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
+        "lastModified": 1779971959,
+        "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
+        "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1772598333,
-        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
+        "lastModified": 1779971959,
+        "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
+        "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
+        "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"
      }
@@ -177,11 +193,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769036658,
-        "narHash": "sha256-bia1yOQtC8A7XZRCTdLvY0Bdv4i/V6hMqb0NM/9h/jc=",
+        "lastModified": 1780213167,
+        "narHash": "sha256-50MzkuYn590Tk89/YivGZ8Z8ZtKRXcP+iHqpLv6TYXA=",
        "ref": "refs/heads/master",
-        "rev": "9c1eb1b999522b965ce129043c7112fc9e38c75a",
-        "revCount": 52,
+        "rev": "a5224c23744b0a89e32992442bba4cfaa8464d59",
+        "revCount": 54,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/nvim_flake"
      },
@@ -212,6 +228,46 @@
        "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",
@@ -220,6 +276,7 @@
        "nixpkgs": "nixpkgs",
        "nvim": "nvim",
        "project-cloud": "project-cloud",
+        "quickshell_bar": "quickshell_bar",
        "simple-nixos-mailserver": "simple-nixos-mailserver",
        "sops-nix": "sops-nix",
        "swaysw": "swaysw",
@@ -236,17 +293,14 @@
        ]
      },
      "locked": {
-        "lastModified": 1772763116,
-        "narHash": "sha256-5NUtdVWnEflm829QI0BIj2rDhI+pfagt+cxIARJEhi8=",
-        "owner": "simple-nixos-mailserver",
-        "repo": "nixos-mailserver",
-        "rev": "c04152fa90ba5079f4517aa24383245937e43ab8",
-        "type": "gitlab"
+        "lastModified": 1779651513,
+        "narHash": "sha256-lUmq8sXQzihreq9UMqAkSBy9z9ueZbRnFyltzYVfQ2I=",
+        "type": "tarball",
+        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-26.05/nixos-mailserver-nixos-26.05.tar.gz"
      },
      "original": {
-        "owner": "simple-nixos-mailserver",
-        "repo": "nixos-mailserver",
-        "type": "gitlab"
+        "type": "tarball",
+        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-26.05/nixos-mailserver-nixos-26.05.tar.gz"
      }
    },
    "sops-nix": {
@@ -256,11 +310,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772495394,
-        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
+        "lastModified": 1777944972,
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
        "type": "github"
      },
      "original": {
@@ -328,11 +382,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764579633,
-        "narHash": "sha256-gOD5RMHOB9Fw4T3nk2a95YdU0J24QU3uWUiZVIQza64=",
+        "lastModified": 1780166195,
+        "narHash": "sha256-kqViUrWwIJP7xVCpcZbRk7IygAw/Tll/UmbcAW9zRPk=",
        "ref": "refs/heads/master",
-        "rev": "b0707744e2b4a077e759145cdbfa8d8d1017e732",
-        "revCount": 25,
+        "rev": "e1aecedf30f3b3cedd89d84364bd7e548a011bcd",
+        "revCount": 26,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/zremap"
      },
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,8 @@
  description = "NixOS configuration";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-    nixos.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+    nixos.url = "github:nixos/nixpkgs/nixos-26.05";

    nix-xilinx = {
      url = "gitlab:asmir.abdulahovic/nix-xilinx";
@@ -20,6 +20,10 @@
      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";
@@ -31,12 +35,12 @@
    };

    home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

    simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
+      url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-26.05/nixos-mailserver-nixos-26.05.tar.gz";
      inputs.nixpkgs.follows = "nixpkgs";
    };

--- a/fuji/configuration.nix
+++ b/fuji/configuration.nix
@@ -81,7 +81,6 @@ in
    '';
    blacklistedKernelModules = [ ];

-
    initrd.compressor = "zstd";
    initrd.kernelModules = [ ];
    initrd.systemd.enable = true;
@@ -93,11 +92,24 @@ 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.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 = {
@@ -116,6 +128,7 @@ in
    rtkit.enable = true;
    allowSimultaneousMultithreading = true;
    sudo.enable = true;
+    sudo.execWheelOnly = true;
    doas.enable = true;
    doas.extraRules = [
      {
@@ -124,6 +137,10 @@ in
        persist = true;
      }
    ];
+    apparmor = {
+      enable = true;
+      killUnconfinedConfinables = true;
+    };
  };

  powerManagement = {
@@ -134,6 +151,7 @@ in
    nftables.enable = true;
    firewall = {
      enable = true;
+      logRefusedConnections = true;
      allowedTCPPorts = [
        80
        443
@@ -199,8 +217,11 @@ in
    nvim.overlays.${system}.overlay
  ];
  environment = {
-    systemPackages = with pkgs; [ alsa-ucm-conf maliit-keyboard ];
-    variables.ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf}/share/alsa/ucm2";
+    #memoryAllocator.provider = "mimalloc";
+    systemPackages = with pkgs; [
+      maliit-keyboard
+      android-tools
+    ];

    sessionVariables = {
      LIBVA_DRIVER_NAME = "iHD";
@@ -238,7 +259,7 @@ in
    };
    appimage = {
      enable = true;
-      binfmt = true;
+      binfmt = false;
    };
    nix-ld = {
      enable = false;
@@ -247,9 +268,13 @@ in
        zlib
      ];
    };
-    zsh.enable = true;
+    zsh = {
+      enable = true;
+      promptInit = "";
+      enableCompletion = false;
+      setOptions = [ ];
+    };
    firejail.enable = true;
-    adb.enable = true;
    wireshark.enable = true;
    sway.enable = true;
  };
@@ -417,8 +442,12 @@ in
      };
    };

-    logind = {
-      powerKey = "suspend";
+    logind.settings.Login = {
+      HandlePowerKey = "suspend";
+      HandleLidSwitch = "suspend";
+      HandleLidSwitchExternalPower = "suspend";
+      HandleLidSwitchDocked = "ignore";
+      KillUserProcesses = true;
    };

    desktopManager = {
@@ -528,13 +557,13 @@ in
        {
          keys = [ 224 ];
          events = [ "key" ];
-          command = "${pkgs.light}/bin/light -U 5";
+          command = "${pkgs.brightnessctl}/bin/brightnessctl set 5%-";
        }

        {
          keys = [ 225 ];
          events = [ "key" ];
-          command = "${pkgs.light}/bin/light -A 5";
+          command = "${pkgs.brightnessctl}/bin/brightnessctl set 5%+";
        }
      ];
    };
@@ -598,10 +627,6 @@ in
      SystemMaxUse=50M
    '';

-    logind.settings.Login = {
-      KillUserProcesses = true;
-    };
-
  };

  fonts = {
@@ -691,7 +716,6 @@ in
    initialHashedPassword = "$y$j9T$FZnEcCEMIC0Fjj4dZi5t8.$D8ygvO19dR5nyTZxWwDgjEimHutD.sKnD1DLAyhU8.B";
    shell = pkgs.zsh;
    extraGroups = [
-      "adbusers"
      "audio"
      "dialout"
      "input"
--- a/fuji/hardware-configuration.nix
+++ b/fuji/hardware-configuration.nix
@@ -21,12 +21,14 @@
    {
      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" =
--- a/home/common/sway.nix
+++ b/home/common/sway.nix
@@ -25,6 +25,7 @@ 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
 {
@@ -92,19 +93,9 @@ in
        };
      };

-      bars = [
-        {
-          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";
-        }
+      bars = [ ];
+      startup = [
+        { command = "exec ${quickshell_bar}/bin/quickshell-bar"; }
      ];

      keybindings = {
--- a/home/common/zsh.nix
+++ b/home/common/zsh.nix
@@ -10,9 +10,14 @@
    enableZshIntegration = true;
  };

+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
  programs.zsh = {
    autocd = true;
-    enableCompletion = false;
+    enableCompletion = true;
    defaultKeymap = "viins";
    /* dotDir = "\"$XDG_CONFIG_HOME\"/zsh"; */

@@ -63,11 +68,6 @@
        };
        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;
+        ls --color=tty;
      }

      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
--- a/home/fuji/home.nix
+++ b/home/fuji/home.nix
@@ -1,6 +1,5 @@
 { lib
 , pkgs
-, config
 , ...
 }:
 let
@@ -36,6 +35,16 @@ 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 {
@@ -91,6 +100,9 @@ in
        pkgs.mpvScripts.uosc
        pkgs.mpvScripts.webtorrent-mpv-hook
      ];
+      scriptOpts.webtorrent = {
+        path = "/tmp";
+      };
      config = {
        osc = "no";
        osd-bar = "no";
@@ -101,6 +113,16 @@ 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 = {
@@ -158,6 +180,12 @@ 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;
@@ -262,22 +290,13 @@ in
        */
      {
        enable = true;
-        events = [
-          {
-            event = "before-sleep";
-            command = "${locker}/bin/swaylock_fancy";
-          }
-          {
-            event = "lock";
-            command = "${locker}/bin/swaylock_fancy";
-          }
+        events = {
+          before-sleep = "${locker}/bin/swaylock_fancy";
+          lock = "${locker}/bin/swaylock_fancy";
          /*
-            {
-              event = "after-resume";
-              command = "${refresh_i3status}/bin/refresh_i3status";
-            }
+            after-resume = "${refresh_i3status}/bin/refresh_i3status";
          */
-        ];
+        };
        timeouts = [
          {
            timeout = 15 * 60;
--- a/home/fuji/home_packages.nix
+++ b/home/fuji/home_packages.nix
@@ -160,7 +160,7 @@ in
      ungoogled-chromium
      upx
      viber
-      wasistlos
+      karere
      waybar
      wdisplays
      weechat
--- a/magpie/configuration.nix
+++ b/magpie/configuration.nix
@@ -27,6 +27,19 @@
  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 = {
@@ -49,7 +62,7 @@
  # Set your time zone.
  time.timeZone = "Europe/Berlin";

-  users.users.root.initialHashedPassword = "";
+  users.users.root.hashedPassword = "!";
  users.users.root.openssh.authorizedKeys.keys = [
    (builtins.readFile ../nixy/ssh_pubkey)
  ];
@@ -108,10 +121,14 @@
    certificateScheme = "acme-nginx";
  };

-  services.journald.extraConfig = ''SystemMaxUse=50M '';
+  services.journald.extraConfig = ''SystemMaxUse=500M '';
  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
@@ -119,6 +136,13 @@
    }
  ];

+  services.fail2ban = {
+    enable = true;
+    maxretry = 5;
+    bantime = "1h";
+    ignoreIP = [ "10.100.0.0/24" ];
+  };
+
  services.opendkim = {
    enable = true;
    selector = "mail";
@@ -308,6 +332,12 @@
    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 = {
@@ -341,14 +371,13 @@
      80
      443
      587
-      2049
-    ]; # http, mail, mail, nfs
+    ]; # http, https, submission
    allowedUDPPorts = [
      443
      51820
-    ]; # mail, wireguard
+    ]; # http3, wireguard
    allowPing = true;
-    logRefusedConnections = lib.mkDefault false;
+    logRefusedConnections = lib.mkDefault true;
  };

  networking.nat = {
--- a/mediabox/configuration.nix
+++ b/mediabox/configuration.nix
@@ -1,474 +0,0 @@
-{ config
-, nvim
-, pkgs
-, system
-, zremap
-, ...
-}:
-let
-  USER = "akill";
-in
-{
-  imports = [ ];
-
-  system.stateVersion = "23.05";
-  system.autoUpgrade.enable = false;
-  system.switch = {
-    enable = true;
-    enableNg = true;
-  };
-
-  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-  sops.secrets."peerix/private" = {
-    sopsFile = ./secrets/peerix.yaml;
-    mode = "0400";
-    owner = config.users.users.nobody.name;
-    group = config.users.users.nobody.group;
-  };
-
-  sops.secrets."wg_privkey" = {
-    sopsFile = ./secrets/wg_privkey.yaml;
-  };
-
-  sops.secrets."wg_preshared/mediabox" = {
-    sopsFile = ../common/secrets/wg_preshared.yaml;
-  };
-
-  nix = {
-    optimise.automatic = true;
-    gc.automatic = true;
-    gc.options = "--delete-older-than 7d";
-    package = pkgs.nixVersions.latest;
-    settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      trusted-users = [ "akill" "root" ];
-    };
-  };
-
-  boot = {
-    initrd = {
-      compressor = "zstd";
-      availableKernelModules = [ "e1000e" ];
-      network = {
-        enable = true;
-        udhcpc.enable = true;
-        ssh = {
-          enable = true;
-          hostKeys = [ /etc/ssh_dummy_ed25519_key ];
-          authorizedKeys = [ (builtins.readFile ../nixy/ssh_pubkey) ];
-        };
-      };
-    };
-
-    kernelModules = [ "acpi_call" ];
-    kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = [ "msr.allow_writes=on" ];
-    kernel.sysctl = {
-      "net.core.default_qdisc" = "fq";
-      "net.ipv4.tcp_congestion_control" = "bbr";
-    };
-    loader.systemd-boot = {
-      editor = false;
-      enable = true;
-      memtest86.enable = true;
-    };
-    readOnlyNixStore = true;
-    supportedFilesystems = [ "btrfs" ];
-    tmp.useTmpfs = true;
-  };
-
-  security = {
-    rtkit.enable = true;
-    allowSimultaneousMultithreading = true;
-    sudo.enable = true;
-    doas.enable = true;
-    doas.extraRules = [
-      {
-        users = [ USER ];
-        keepEnv = true;
-        persist = true;
-      }
-    ];
-  };
-
-  powerManagement = {
-    enable = true;
-  };
-
-  networking = {
-    nftables.enable = true;
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [
-        80
-        443
-        51820
-        8020
-      ];
-    };
-
-    hostName = "mediabox";
-    interfaces.enp0s25.useDHCP = true;
-    interfaces.wlp3s0.useDHCP = false;
-    useDHCP = false;
-    wireless.enable = false;
-    wireless.interfaces = [ "wlp3s0" ];
-    nameservers = [
-      "127.0.0.1"
-      "::1"
-    ];
-    dhcpcd.extraConfig = "nohook resolv.conf";
-
-    extraHosts = ''
-      192.168.1.173 nixy.lan
-      192.168.88.171 jellyfin.mediabox.lan
-      192.168.88.171 jellyseerr.mediabox.lan
-      192.168.88.171 mediabox.lan
-      192.168.88.171 qbittorrent.mediabox.lan
-      192.168.88.1   router.lan
-      192.168.88.231 workstation.lan
-      192.168.88.121 ender.lan
-    '';
-
-    wireguard.interfaces = {
-      wg0 = {
-        ips = [ "10.100.0.5/24" ];
-        privateKeyFile = config.sops.secrets."wg_privkey".path;
-        peers = [
-          {
-            publicKey = builtins.readFile ../magpie/wg_pubkey;
-            presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path;
-            allowedIPs = [ "10.100.0.0/24" ];
-            endpoint = "5.75.229.224:51820";
-            persistentKeepalive = 25;
-          }
-        ];
-      };
-    };
-  };
-
-  time.timeZone = "Europe/Sarajevo";
-
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [ nvim.overlays.${system}.overlay ];
-  environment = {
-    homeBinInPath = true;
-    variables = {
-      PATH = "$HOME/.cargo/bin";
-    };
-  };
-
-  programs = {
-    steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = false;
-      localNetworkGameTransfers.openFirewall = true;
-    };
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-    appimage = {
-      enable = true;
-      binfmt = true;
-    };
-    nix-ld = {
-      enable = false;
-      libraries = with pkgs; [
-        stdenv.cc.cc.lib
-        zlib
-      ];
-    };
-    zsh.enable = true;
-    firejail.enable = true;
-  };
-
-  # List services that you want to enable:
-  systemd = {
-    services = {
-      "zremap@" = {
-        enable = true;
-        restartIfChanged = true;
-        serviceConfig.Nice = -20;
-        unitConfig = {
-          Description = "zremap on %I";
-          ConditionPathExists = "%I";
-        };
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${zremap.defaultPackage.${system}}/bin/zremap %I";
-        };
-      };
-
-      "wakeonlan" = {
-        description = "Reenable wake on lan every boot";
-        after = [ "network.target" ];
-        serviceConfig = {
-          Type = "oneshot";
-          ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp0s25 wol m";
-        };
-        wantedBy = [
-          "default.target"
-          "suspend.target"
-          "shutdown.target"
-        ];
-      };
-    };
-
-    coredump.enable = false;
-    extraConfig = ''
-      DefaultTimeoutStartSec=30s
-      DefaultTimeoutStopSec=30s
-    '';
-  };
-
-  services = {
-    acpid.enable = true;
-    btrfs.autoScrub.enable = true;
-    dbus.enable = true;
-    dbus.implementation = "broker";
-    envfs.enable = true;
-    fstrim.enable = true;
-    fwupd.enable = true;
-    ntp.enable = true;
-    openssh.enable = true;
-    openssh.settings.PermitRootLogin = "yes";
-    thinkfan.enable = false;
-
-    xrdp = {
-      enable = true;
-      defaultWindowManager = "icewm";
-      openFirewall = true;
-    };
-
-    logind = {
-      lidSwitch = "ignore";
-    };
-
-    jellyfin = {
-      enable = false;
-      user = "akill";
-      openFirewall = true;
-    };
-
-    jellyseerr = {
-      enable = false;
-      openFirewall = true;
-    };
-
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-
-    avahi = {
-      enable = false;
-      nssmdns4 = false;
-      openFirewall = true;
-    };
-
-    libinput.enable = true;
-    xserver = {
-      enable = true;
-      dpi = 144;
-      desktopManager.xterm.enable = false;
-      desktopManager.plasma5.bigscreen.enable = true;
-      #desktopManager.plasma6.enable = true;
-      displayManager = {
-        lightdm.enable = false;
-        startx.enable = true;
-        sddm.enable = true;
-        sddm.wayland.enable = true;
-      };
-      windowManager.i3.enable = false;
-    };
-
-    udev = {
-      packages = [ ];
-      extraRules = ''
-        #zremap on new keyboard
-        ACTION=="add", SUBSYSTEM=="input", ATTRS{phys}!="", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEY}=="1", ENV{ID_INPUT_KEYBOARD}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}+="zremap@$env{DEVNAME}.service"
-      '';
-    };
-
-    tlp = {
-      enable = false;
-    };
-
-    batteryNotifier = {
-      enable = false;
-      notifyCapacity = 20;
-      suspendCapacity = 10;
-    };
-
-    actkbd = {
-      enable = true;
-      bindings = [
-        {
-          keys = [ 115 ];
-          events = [ "key" ];
-          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
-        }
-
-        {
-          keys = [ 114 ];
-          events = [
-            "key"
-            "rep"
-          ];
-          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
-        }
-
-        {
-          keys = [ 113 ];
-          events = [
-            "key"
-            "rep"
-          ];
-          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
-        }
-
-        {
-          keys = [ 224 ];
-          events = [ "key" ];
-          command = "${pkgs.light}/bin/light -U 5";
-        }
-
-        {
-          keys = [ 225 ];
-          events = [ "key" ];
-          command = "${pkgs.light}/bin/light -A 5";
-        }
-      ];
-    };
-
-    dnscrypt-proxy2 = {
-      enable = true;
-      settings = {
-        ipv6_servers = true;
-        require_dnssec = true;
-        require_nolog = true;
-        require_nofilter = true;
-        http3 = true;
-
-        sources.public-resolvers = {
-          urls = [
-            "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
-            "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
-          ];
-          cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md";
-          minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
-        };
-      };
-    };
-
-    journald.extraConfig = ''
-      SystemMaxUse=50M
-    '';
-
-    logind.extraConfig = ''
-      KillUserProcesses=yes
-    '';
-
-  };
-
-  fonts = {
-    fontconfig = {
-      cache32Bit = true;
-      allowBitmaps = true;
-      useEmbeddedBitmaps = true;
-      defaultFonts = {
-        monospace = [ "JetBrainsMono" ];
-      };
-    };
-
-    packages = with pkgs; [
-      dejavu_fonts
-      dina-font
-      fira-code
-      fira-code-symbols
-      font-awesome_6
-      inconsolata
-      iosevka
-      jetbrains-mono
-      liberation_ttf
-      libertine
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-color-emoji
-      noto-fonts-emoji
-      proggyfonts
-      siji
-      terminus_font
-      terminus_font_ttf
-      ubuntu_font_family
-      vistafonts
-    ];
-  };
-
-  virtualisation = {
-    podman = {
-      enable = false;
-      autoPrune.enable = true;
-      dockerCompat = true;
-    };
-  };
-
-  hardware = {
-    bluetooth = {
-      enable = true;
-      settings = {
-        General = {
-          Enable = "Source,Sink,Media,Socket";
-        };
-      };
-    };
-
-    graphics = {
-      enable = true;
-      extraPackages = [ ];
-    };
-  };
-
-  zramSwap = {
-    enable = false;
-    algorithm = "zstd";
-  };
-
-  users.users.${USER} = {
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    extraGroups = [
-      "wheel"
-      "tty"
-      "audio"
-      "sound"
-    ];
-    openssh.authorizedKeys.keys = [
-      (builtins.readFile ../nixy/ssh_pubkey)
-    ];
-  };
-
-  users.users.ado = {
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    extraGroups = [
-      "wheel"
-      "tty"
-      "audio"
-      "sound"
-    ];
-  };
-
-  users.users.mediauser = {
-    isNormalUser = true;
-    shell = pkgs.bash;
-    extraGroups = [ ];
-  };
-}
--- a/mediabox/hardware-configuration.nix
+++ b/mediabox/hardware-configuration.nix
@@ -1,90 +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.
-{
-  lib,
-  modulesPath,
-  ...
-}:
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ehci_pci"
-    "ahci"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
-    fsType = "btrfs";
-    options = [
-      "subvol=root"
-      "compress=lzo"
-      "noatime"
-    ];
-  };
-
-  boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/60aa7671-bfee-451b-b871-ac7c5a4a9f3a";
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
-    fsType = "btrfs";
-    options = [
-      "subvol=home"
-      "compress=lzo"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
-    fsType = "btrfs";
-    options = [
-      "subvol=nix"
-      "compress=lzo"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/persist" = {
-    device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
-    fsType = "btrfs";
-    options = [
-      "subvol=persist"
-      "compress=lzo"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/var/log" = {
-    device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
-    fsType = "btrfs";
-    options = [
-      "subvol=log"
-      "compress=lzo"
-      "noatime"
-    ];
-    neededForBoot = true;
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/4B94-6E7B";
-    fsType = "vfat";
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/7b44ab02-84ff-4ffd-be26-58247cf5a982"; }
-  ];
-
-  hardware.cpu.intel.updateMicrocode = true;
-  nix.settings.max-jobs = lib.mkDefault 8;
-}
--- a/mediabox/peerix-public
+++ b/mediabox/peerix-public
@@ -1 +0,0 @@
-peerix-mediabox:UDgG3xdQYv7bmx2l4ZPNRPJtp2zMmY++H/fnGeJ9BQw=
--- a/mediabox/secrets/peerix.yaml
+++ b/mediabox/secrets/peerix.yaml
@@ -1,31 +0,0 @@
-peerix:
-    private: ENC[AES256_GCM,data:m76hyDWzcIlczegZyPyTtOYOgOGeyX++SeGsqEWS5b3ZbR2M9RqUGYEscLRX3/Dlff2vgs+hI4cOjiMnhq9pnLzP25Xh4XAiJNMkD43fFCCb7zj2RUWEyLAzzmWpR8fSB1mXTpciUGM=,iv:s9EXpkGYR0kI5xQZ8wAmkobK1q4XlVdFH4irEVwy1bs=,tag:L7AF6mFsxss6NDantbqXMw==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Zmc0c1AxMVEzdi94L0Nh
-            dHJFSHVSbG1vay9NUDBEVkM4ZWNoT3h4Q1c0CkhWdWVzTEJxZENZYXVFT2RhV3pT
-            aDZIUUdWVUVRUDc4ZEFDTkdnaDJxdVkKLS0tIDd6TE56REdjRVdtSXB1dkJrVVNj
-            dUxhRnB4dVFRam9xNlFiY2VOSXpNamcKNzRghHeyPtltKH4GkJQ0ef4apr5gziq9
-            dhXy6Qil48QJd4hnyr7GW1n7eRIq24OWO3WglLbVAUSQr/gzM2TWiA==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMjVQZkVVQmZFbCt3Z2ZI
-            Q3NVZUJ0VkZjK0E5SFpqWE50c2dOeFNsUm1jCmdDZGxZYk13emhhanRzWjhvZFM1
-            UWNpNm5malkrU1Rkak9PNWk2bW5nRDQKLS0tIE9UdXg4L0hMRzJuUERIMytvc2pr
-            Y1BBZFJseUNIeTVtTjBGazk5WE1ZcUUKs9pEtDbCYRfSP0Rh9ENo9A6nUFkYHr4D
-            3DvOKSyLL33FBoEddDBd7Si1mpjY2bunueBAe+diDgOrol6tWIMoUw==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-09-30T14:18:57Z"
-    mac: ENC[AES256_GCM,data:R0TJ/7uihpsCHwPLXFYKi+ZaEUtbZVz02utDF7vO7gYDN1MFa0c5nZ/mAnJJtTJI41GdAu9ezTUiU6H1HTHLxYMeUoNAAvNlSCkvGc/oMQofXidL34hq1X2vG05N3UQlkbAXTlCBkYc20oVVOVmT/lq7USEx29oB/ytxZzKYFvM=,iv:qpz0g+O4kwChct1ddiT3D8rZBg08YUr4Ba5pJ4WQyzo=,tag:pWLFiQWl1QSzveBxnq4uXw==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.0
--- a/mediabox/secrets/wg_privkey.yaml
+++ b/mediabox/secrets/wg_privkey.yaml
@@ -1,30 +0,0 @@
-wg_privkey: ENC[AES256_GCM,data:ovAxwZEcmRzt/zb42ortPwPyREC16E5YNfDBguZK7uByR4BgJi8kNeoG+GY=,iv:Cv50+JB5S+44U3L9od4zwrEKHi/LM38LnA94DkvCer4=,tag:ehKQrqWwA6daxc2yASDWNQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKSGxudng1enhDa281S0pm
-            Q0kwQmc1T2hUK0dHd3B4cUh3RzZPZ1dGaXo4CkdPMzNnQWMyYjJiUWk4WEYyODFp
-            b2FTbnZwMHh6SHhIcjVNbnBKSVk3TWMKLS0tIFBZOW56K2Y5Q3I4dmh5dXBieEF2
-            SWQwcmkzQU5aeEliS29QN3Y0V04zNU0KF0WmF8BDvZ2DyJFztKJv8YmDuqVsAoO4
-            QEVLwrJDurRxcNIVGLs5W+60Osa5XMpNc74e23rU7mucB5wPA/84dg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWMUtUYyswV3czWDdXWG1x
-            cnh5QTZpdlBZYlZ2b2oweXJ5SkZSQldhQmpZCmFrQVlyYnNqZ01kVTVNQTlBRFNR
-            WDlITEJOUFZGa0U2NG8xMGpkSnNOQTAKLS0tIDNlK0dxWnB3a3dkTnRmTm5oTlFD
-            eGV1VE1tL1c0a3hUdXM2bExmV1l3RnMK8aOugY3XHTCfeBDJVOyGljuuu6hQGJ7W
-            ZGoxOz+hhYIHj/04J9DIIOUyt81m8LNCbxcacFKyW7Sqosfj+7N7Gg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-14T19:25:26Z"
-    mac: ENC[AES256_GCM,data:vcyglyYG93K3KBISpIESGlNCs5ojWZAL0gyDUzBNCxG5H8RKEz1Y7yOtr5EXnnP66qcBHlKhb81Iyrc071pmJL9dIttiqmvjSWf0zZ9RuV0uYcO/42cqk3J4tBJ6iYCi64y58jifDObbRni6jiGVEGEkSk8cXFqR8UXoSTeXWtU=,iv:avpWr8SeHK1VHz9XhkO7Nd7VOfMP7JXcQaXJA8Xiuhs=,tag:ixJsw/snZEWXGhdPLU1cGg==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/mediabox/wg_pubkey
+++ b/mediabox/wg_pubkey
@@ -1 +0,0 @@
-S+tL/pTm4D7bsWj/dhpPXHYxcye/DuNMguLD5l1ACEU=
--- a/nixy/configuration.nix
+++ b/nixy/configuration.nix
@@ -1,659 +0,0 @@
-{ config
-, nvim
-, pkgs
-, system
-, zremap
-, ...
-}:
-let
-    USER = "akill";
-in
-{
-  imports = [ ];
-
-  system = {
-    stateVersion = "23.05";
-    autoUpgrade.enable = false;
-    etc.overlay.enable = true;
-    nixos-init.enable = true;
-  };
-
-  sops = {
-    age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-    secrets = {
-      "peerix/private" = {
-        sopsFile = ./secrets/peerix.yaml;
-        mode = "0400";
-        owner = config.users.users.nobody.name;
-        group = config.users.users.nobody.group;
-      };
-
-      "wg_privkey" = {
-        sopsFile = ./secrets/wg_privkey.yaml;
-      };
-
-      "wg_preshared/nixy" = {
-        sopsFile = ../common/secrets/wg_preshared.yaml;
-      };
-
-      "wg_privkey_proton" = {
-        sopsFile = ./secrets/wg_privkey_proton.yaml;
-      };
-
-      "wg_endpoint_proton" = {
-        sopsFile = ./secrets/wg_privkey_proton.yaml;
-      };
-
-      "borgbase_enc_key" = {
-        sopsFile = ./secrets/borgbase_enc_key.yaml;
-        owner = config.users.users.${USER}.name;
-      };
-
-      "borgbase_ssh_key" = {
-        sopsFile = ./secrets/borgbase_ssh_key.yaml;
-        owner = config.users.users.${USER}.name;
-      };
-    };
-  };
-
-  nix = {
-    optimise.automatic = true;
-    gc.automatic = true;
-    gc.options = "--delete-older-than 7d";
-    package = pkgs.nixVersions.latest;
-    settings = {
-      sandbox = true;
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-    };
-  };
-
-  boot = {
-    extraModulePackages = with config.boot.kernelPackages; [
-      usbip
-      v4l2loopback
-    ];
-    initrd.compressor = "zstd";
-    initrd.kernelModules = [ ];
-    initrd.systemd.enable = true;
-    binfmt.emulatedSystems = [
-      "wasm32-wasi"
-      "x86_64-windows"
-    ];
-    kernelParams = [
-      "psmouse.synaptics_intertouch=0"
-      "mem_sleep_default=deep"
-      "amdgpu.sg_display=0"
-      "amdgpu.gttsize=2048"
-    ];
-    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 */
-    };
-    loader.efi.canTouchEfiVariables = true;
-    loader.systemd-boot = {
-      editor = false;
-      enable = true;
-      memtest86.enable = true;
-    };
-    nixStoreMountOpts = [ "ro" ];
-    supportedFilesystems = [
-      "xfs"
-    ];
-    tmp.useTmpfs = true;
-  };
-
-  security = {
-    rtkit.enable = true;
-    allowSimultaneousMultithreading = true;
-    sudo.enable = true;
-    doas.enable = true;
-    doas.extraRules = [
-      {
-        users = [ USER ];
-        keepEnv = true;
-        persist = true;
-      }
-    ];
-  };
-
-  powerManagement = {
-    enable = true;
-  };
-
-  networking = {
-    nftables.enable = true;
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [
-        80
-        443
-        51820
-        8020
-      ];
-    };
-
-    hostName = "nixy";
-    nameservers = [
-      "127.0.0.1"
-      "::1"
-    ];
-    dhcpcd.extraConfig = "nohook resolv.conf";
-
-    extraHosts = ''
-      192.168.88.171 jellyfin.mediabox.lan
-      192.168.88.171 jellyseerr.mediabox.lan
-      192.168.88.171 mediabox.lan
-      192.168.88.171 qbittorrent.mediabox.lan
-      192.168.88.1   router.lan
-      192.168.88.231 workstation.lan
-      192.168.88.121 ender.lan
-    '';
-
-    networkmanager = {
-      enable = true;
-      dns = "none";
-      wifi.backend = "iwd";
-    };
-
-    wireless.iwd = {
-      enable = true;
-      settings = {
-        General = {
-          AddressRandomization = "network";
-          #EnableNetworkConfiguration = true;
-        };
-      };
-    };
-
-    wireguard.interfaces = {
-      wg0 = {
-        ips = [ "10.100.0.6/24" ];
-        privateKeyFile = config.sops.secrets."wg_privkey".path;
-        peers = [
-          {
-            publicKey = builtins.readFile ../magpie/wg_pubkey;
-            presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path;
-            allowedIPs = [ "10.100.0.0/24" ];
-            endpoint = "5.75.229.224:51820";
-            persistentKeepalive = 25;
-          }
-        ];
-      };
-
-      neox_wg = {
-        ips = [ "192.168.51.2/32" ];
-        privateKeyFile = config.sops.secrets."wg_privkey".path;
-        peers = [
-          {
-            publicKey = builtins.readFile ../nixy/wg_pubkey_nx;
-            allowedIPs = [ "192.168.2.0/24" ];
-            endpoint = "185.194.64.26:51820";
-            persistentKeepalive = 25;
-          }
-        ];
-      };
-    };
-  };
-
-  time.timeZone = "Europe/Sarajevo";
-
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [
-    nvim.overlays.${system}.overlay
-  ];
-  environment = {
-    etc = {
-      "firejail/qutebrowser.local".text = ''
-        whitelist ''${RUNUSER}/qutebrowser
-      '';
-    };
-    extraInit = ''
-      unset -v SSH_ASKPASS
-    '';
-    homeBinInPath = true;
-    variables = {
-      PATH = "$HOME/.cargo/bin";
-    };
-  };
-
-  programs = {
-    steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = false;
-      localNetworkGameTransfers.openFirewall = true;
-    };
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-    appimage = {
-      enable = true;
-      binfmt = true;
-    };
-    nix-ld = {
-      enable = false;
-      libraries = with pkgs; [
-        stdenv.cc.cc.lib
-        zlib
-      ];
-    };
-    zsh.enable = true;
-    firejail.enable = true;
-    adb.enable = true;
-    wireshark.enable = true;
-    sway.enable = true;
-  };
-
-  documentation.dev.enable = true;
-
-  # List services that you want to enable:
-  systemd = {
-    #sysusers.enable = true;
-    services = {
-      # Fix issue where systemd-vconsole-setup failes to find keymap
-      systemd-vconsole-setup = {
-        unitConfig = {
-          After = "local-fs.target";
-        };
-      };
-
-      "zremap@" = {
-        enable = true;
-        restartIfChanged = true;
-        serviceConfig.Nice = -20;
-        unitConfig = {
-          Description = "zremap on %I";
-          ConditionPathExists = "%I";
-        };
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${zremap.defaultPackage.${system}}/bin/zremap %I";
-        };
-      };
-
-      "netns@" = {
-        description = "%I network namespace";
-        before = [ "network.target" ];
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${pkgs.iproute2}/bin/ip netns add %I";
-          ExecStop = "${pkgs.iproute2}/bin/ip netns del %I";
-        };
-      };
-
-      "wg_proton" = {
-        description = "wg network interface";
-        bindsTo = [ "netns@wg.service" ];
-        requires = [ "network-online.target" ];
-        wants = [ "dnscrypt-proxy_proton.service" ];
-        after = [ "netns@wg.service" ];
-        before = [ "dnscrypt-proxy_proton.service" ];
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = pkgs.writers.writeBash "wg-up" ''
-            set -e
-            ENDPOINT_IP=$(${pkgs.coreutils-full}/bin/cat "${config.sops.secrets."wg_endpoint_proton".path}")
-            ${pkgs.iproute2}/bin/ip link add proton_wg type wireguard
-            ${pkgs.iproute2}/bin/ip link set proton_wg netns wg
-            ${pkgs.iproute2}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg
-            ${pkgs.iproute2}/bin/ip netns exec wg \
-              ${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${
-                config.sops.secrets."wg_privkey_proton".path
-              }"
-            ${pkgs.iproute2}/bin/ip netns exec wg \
-              ${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \
-                endpoint "$ENDPOINT_IP:51820" \
-                persistent-keepalive "25" \
-                allowed-ips "0.0.0.0/0"
-            ${pkgs.iproute2}/bin/ip -n wg link set lo up
-            ${pkgs.iproute2}/bin/ip -n wg link set proton_wg up
-            ${pkgs.iproute2}/bin/ip -n wg route add default dev proton_wg
-          '';
-          ExecStop = pkgs.writers.writeBash "wg-down" ''
-            ${pkgs.iproute2}/bin/ip -n wg route del default dev proton_wg
-            ${pkgs.iproute2}/bin/ip -n wg link del proton_wg
-          '';
-        };
-      };
-
-      "dnscrypt-proxy_proton" = {
-        description = "DNSCrypt-proxy client proton";
-        wants = [
-          "network-online.target"
-          "nss-lookup.target"
-        ];
-        before = [ "nss-lookup.target" ];
-        after = [ "wg_proton.service" ];
-        partOf = [ "wg_proton.service" ];
-        serviceConfig = {
-          AmbientCapabilities = "CAP_NET_BIND_SERVICE";
-          CacheDirectory = "dnscrypt-proxy";
-          DynamicUser = true;
-          ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${config.services.dnscrypt-proxy.configFile}";
-          LockPersonality = true;
-          LogsDirectory = "dnscrypt-proxy";
-          MemoryDenyWriteExecute = true;
-          NetworkNamespacePath = "/var/run/netns/wg";
-          NonBlocking = true;
-          NoNewPrivileges = true;
-          PrivateDevices = true;
-          ProtectClock = true;
-          ProtectControlGroups = true;
-          ProtectHome = true;
-          ProtectHostname = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectSystem = "strict";
-          Restart = "always";
-          RestrictAddressFamilies = [
-            "AF_INET"
-            "AF_INET6"
-          ];
-          RestrictNamespaces = true;
-          RestrictRealtime = true;
-          RuntimeDirectory = "dnscrypt-proxy";
-          StateDirectory = "dnscrypt-proxy";
-          SystemCallArchitectures = "native";
-          SystemCallFilter = [
-            "@system-service"
-            "@chown"
-            "~@aio"
-            "~@keyring"
-            "~@memlock"
-            "~@setuid"
-            "~@timer"
-          ];
-        };
-      };
-    };
-
-    coredump.enable = false;
-    settings.Manager = {
-      DefaultTimeoutStartSec = "30s";
-      DefaultTimeoutStopSec = "30s";
-    };
-  };
-
-  services = {
-    acpid.enable = true;
-    dbus.enable = true;
-    dbus.implementation = "broker";
-    envfs.enable = true;
-    fstrim.enable = true;
-    fwupd.enable = true;
-    ntp.enable = true;
-    openssh.enable = true;
-    printing.enable = true;
-    userborn.enable = true;
-
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-
-    libinput.enable = true;
-    xserver = {
-      enable = true;
-      dpi = 144;
-      desktopManager.xterm.enable = false;
-      displayManager = {
-        lightdm.enable = false;
-        startx.enable = true;
-      };
-      windowManager.i3.enable = false;
-    };
-
-    udev = {
-      packages = [
-        pkgs.openhantek6022
-        pkgs.openocd
-      ];
-      extraRules = ''
-        #Xilinx FTDI
-        ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
-
-        #Xilinx Digilent
-        ATTR{idVendor}=="1443", MODE:="666"
-        ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Digilent", MODE:="666"
-
-        #Arduino UNO r4
-        SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", MODE:="0666"
-
-        #zremap on new keyboard
-        ACTION=="add", SUBSYSTEM=="input", ATTRS{phys}!="", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEY}=="1", ENV{ID_INPUT_KEYBOARD}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}+="zremap@$env{DEVNAME}.service"
-      '';
-    };
-
-    tlp = {
-      enable = true;
-      settings = {
-        START_CHARGE_THRESH_BAT0 = 70;
-        STOP_CHARGE_THRESH_BAT0 = 86;
-      };
-    };
-
-    batteryNotifier = {
-      enable = true;
-      notifyCapacity = 12;
-      suspendCapacity = 5;
-    };
-
-    actkbd = {
-      enable = true;
-      bindings = [
-        {
-          keys = [ 115 ];
-          events = [ "key" ];
-          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
-        }
-
-        {
-          keys = [ 114 ];
-          events = [
-            "key"
-            "rep"
-          ];
-          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
-        }
-
-        {
-          keys = [ 113 ];
-          events = [
-            "key"
-            "rep"
-          ];
-          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
-        }
-
-        {
-          keys = [ 224 ];
-          events = [ "key" ];
-          command = "${pkgs.light}/bin/light -U 5";
-        }
-
-        {
-          keys = [ 225 ];
-          events = [ "key" ];
-          command = "${pkgs.light}/bin/light -A 5";
-        }
-      ];
-    };
-
-    dnscrypt-proxy = {
-      enable = true;
-      settings = {
-        ipv6_servers = true;
-        require_dnssec = true;
-        require_nolog = true;
-        require_nofilter = true;
-        http3 = true;
-
-        sources.public-resolvers = {
-          urls = [
-            "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
-            "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
-          ];
-          cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md";
-          minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
-        };
-      };
-    };
-
-    borgbackup.jobs."borgbase" =
-      let
-        user = config.users.users.${USER};
-        home = user.home;
-      in
-      {
-        user = user.name;
-        paths = [
-          (home + "/pic/priv")
-          (home + "/pproj")
-          (home + "/videos/priv")
-        ];
-        exclude = [
-          "**/.ccls_cache"
-          "**/*.d"
-          "**/*.map"
-          "**/*.o"
-          "**/zig-cache"
-          "**/zig-out"
-        ];
-        repo = "ssh://oda929rv@oda929rv.repo.borgbase.com/./repo";
-        encryption = {
-          mode = "repokey-blake2";
-          passCommand = "${pkgs.coreutils-full}/bin/cat ${config.sops.secrets."borgbase_enc_key".path}";
-        };
-        environment.BORG_RSH = "${pkgs.openssh}/bin/ssh -i ${config.sops.secrets."borgbase_ssh_key".path}";
-        compression = "auto,zstd";
-        startAt = "daily";
-      };
-
-    nix-serve = {
-      enable = false;
-      secretKeyFile = "/var/cache-priv-key.pem";
-    };
-
-    journald.extraConfig = ''
-      SystemMaxUse=50M
-    '';
-
-    logind.settings.Login = {
-      KillUserProcesses = true;
-    };
-
-  };
-
-  fonts = {
-    fontconfig = {
-      cache32Bit = true;
-      allowBitmaps = true;
-      useEmbeddedBitmaps = true;
-      defaultFonts = {
-        monospace = [ "JetBrainsMono" ];
-      };
-    };
-
-    packages = with pkgs; [
-      dejavu_fonts
-      dina-font
-      fira-code
-      fira-code-symbols
-      font-awesome_6
-      inconsolata
-      iosevka
-      jetbrains-mono
-      liberation_ttf
-      libertine
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-color-emoji
-      proggyfonts
-      siji
-      terminus_font
-      terminus_font_ttf
-      ubuntu-classic
-      vista-fonts
-    ];
-  };
-
-  virtualisation = {
-    waydroid.enable = false;
-    libvirtd = {
-      enable = true;
-      allowedBridges = [
-        "virbr0"
-        "br0"
-      ];
-    };
-    spiceUSBRedirection.enable = true;
-    containers.storage.settings = {
-      storage = {
-        graphroot = "/var/lib/containers/storage";
-        runroot = "/run/containers/storage";
-      };
-    };
-    podman = {
-      enable = true;
-      autoPrune.enable = true;
-      dockerCompat = true;
-    };
-  };
-
-  hardware = {
-    bluetooth = {
-      enable = true;
-      settings = {
-        General = {
-          Experimental = true;
-          Enable = "Source,Sink,Media,Socket";
-        };
-      };
-    };
-
-    graphics = {
-      enable = true;
-      extraPackages = [ ];
-    };
-    rtl-sdr.enable = true;
-  };
-
-  zramSwap = {
-    enable = true;
-    algorithm = "zstd";
-  };
-
-  users.users.${USER} = {
-    isNormalUser = true;
-    initialHashedPassword = "$y$j9T$XGffGsmN/u.wO5wZ.cBml/$9iCw3eWY0GSUH/aA8ESCAxKeTCAMqY21XQF7b5ujxD6";
-    shell = pkgs.zsh;
-    extraGroups = [
-      "adbusers"
-      "audio"
-      "dialout"
-      "kvm"
-      "plugdev"
-      "sound"
-      "tty"
-      "wheel"
-      "wireshark"
-    ];
-  };
-}
--- a/nixy/hardware-configuration.nix
+++ b/nixy/hardware-configuration.nix
@@ -1,65 +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.luks.devices."crypt_dev".device =
-    "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
-  boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "ehci_pci"
-    "xhci_pci"
-    "uas"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [
-    "kvm-amd"
-    "amd-gpu"
-  ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
-    fsType = "xfs";
-  };
-
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
-    fsType = "xfs";
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
-    fsType = "xfs";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/828E-F3C3";
-    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = true;
-  hardware.enableRedistributableFirmware = true;
-}
--- a/nixy/peerix-public
+++ b/nixy/peerix-public
@@ -1 +0,0 @@
-peerix-nixy:8THqS0R2zWF/47ai0RFmqJnieYTZ1jaWOD9tnzpvA6s=
--- a/nixy/secrets/borgbase_enc_key.yaml
+++ b/nixy/secrets/borgbase_enc_key.yaml
@@ -1,21 +0,0 @@
-borgbase_enc_key: ENC[AES256_GCM,data:AD+JghEOX25tBGYhoU1ge1fqrA+5AK8N4yg=,iv:u05GVeWbL3xdZQgGkXSPkxlATd2M9MX4uSZiLOHMMRE=,tag:pmTQIJWmz+ePmSNzO/EO4Q==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEaDhSZVVibVl1NU84NG9U
-            aEVQbThIcC9CajNHS25SVW1SMFFwMUsvMmxJCkpTVThpZ0JZdEpLTnJlQWFqM244
-            LzFaUFVvWWxIcU4wRlhXalF5TkNpVHMKLS0tIExXMUx5cDBBbDloQ0sxbEY0eGdj
-            bE5vNHVHekI2RzY5M3JNcTdCa3pNeUUK8C04wF1te6epA97sNrhoz0VUn+MC7SML
-            6N1CZK3MuRARBqcj4c/W1aXuTysvuV1o/Fl5xOk/gbumcfwnDYj28A==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-21T08:14:25Z"
-    mac: ENC[AES256_GCM,data:7M+akGH09E2JYyKLmwpjx0VCEBmXqO6bNHFNRCO+9LdSIqsEw8MD4WGO0zwHOD9ls7+1OPFeoU+MVbtfMhmvN4g6rg+tFkXbxPSXCPkTA4tL90ZLXoBIpUBxKKhFMxtdOnjXxES3rTzjXGAvxocFOiNv/7pKbzeqMJUnH9FgAcM=,iv:h0+OpLmutMyPN3YFhyuHFgWSqxVK5WmBAE0k5ezEo9A=,tag:UKOXnTOjWaLDEOYk5YK4Aw==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/nixy/secrets/borgbase_ssh_key.yaml
+++ b/nixy/secrets/borgbase_ssh_key.yaml
@@ -1,21 +0,0 @@
-borgbase_ssh_key: ENC[AES256_GCM,data:lLHIBmw/03An3SRJUjYS2pn0g7XEW0kTXtSObhIGwjBwlRypU7uQDz4JseOA2GbSm+GqsGK8U3Ifgirb7t8AsGy6DPxO+2sm+ByJ1S46G6cwkO2GateJw4Zg0mmhUBBuB/eXQMLuBLKZM2WGta5+6O0SWxDtsrTsBhlo5qbwwYILu0gg2zsBWFSn1OBGgvjYYRTd7N85WX8+S7oNYVAL2HjCmhHHtYrLnua4ajBY9dQEzrKdZaQW4v39HV9MyoilEz17fFLU8S2KbJ1iw8HgoAc9W81hpQNNd8fWKY+e0iWxD9X5H7UTs8YP/bsKeWyG4OAwr99zIZ1Lqzi0EuZI+PYkIz4Q4WBmv1wD6Py274iug3kr1OqvaIOmIT/9j2C3mOZTqxuFaF5T4NMkcIeViCBmRwUMTl/8a36X+n/MYxRoznHCQmg8zKubDuykVJfBmFwxbUc9tx8PeodnWeiASOV7FvBie47yq+NyBGItJXAK14SxLE9T2sxRchJWcrQBcekZdZ5Mej20lfUlcAGkwfUc0e54xsv1K3oY,iv:5157BQmbfuF5EYbDHCy/TmnTYErIwmgXO8RaX6f18xs=,tag:T2eZN46Qd6RgLWk4kbYgPQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5b2YzSDdaU3R5TUdqS3Nv
-            eUYraFBiZlZ1TXBqYzlWNUNYOFlyMzJvWEE4ClJ6R25CRXRUZ2FDTFY2ZmJIRkRX
-            WVJCSy83N2JUNzRuT3VuSUF1OTV2TUkKLS0tIEZ5cVg1V2o0MkdmWEx1emJVdjZ0
-            RkZFL2tRNW9RdnAwalE2ZzVQcnljRFUKRyN8ahv9ZI63m8ycl74GZ59lyAXUsKmi
-            tfPqQvL1oTtJr3hzwy2bkctXQLYjGvsMyZt2tiWpy5vLc1MrxlqVDQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-21T08:16:40Z"
-    mac: ENC[AES256_GCM,data:VkXpCPQB4RypDrK31pYWXeOcl8ulis6fMF1q/SLCg2wXnL0jFrmAFp78C+ers9xFhbnUnMbVc/ZJIVKfa0g94WV3jJbn4+HB0GPWQCz7LwhmG5XEY5O5sFLuDCcHb/epZvDbCsEQeiq+TGDHp6TtdL8qDF+hE2k8qfsy570wocU=,iv:HQleJtHWQ5uk4+Witn2aaqh0SvXqomfiSO/ExgPzVag=,tag:hlBmboddR8GDAmBpETi0Ow==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/nixy/secrets/peerix.yaml
+++ b/nixy/secrets/peerix.yaml
@@ -1,22 +0,0 @@
-peerix:
-    private: ENC[AES256_GCM,data:Oi8H5nqJ0Bf45wQepCjdZNHBOv4AlPxNN7L5Th3gcRQlW1FS77nusIWGSUvlmL2a5LTN0FV36o2GFPrrhiwmvnkQwuSZKc9VeDTf7SX0RRL1NLmRR/zy4WsRNJFxlqtjahieqg==,iv:6hJwqcdPayZaYZhJ0OfYLAtmeVndLEfeYZjUq5/3qJE=,tag:MiAfg8aZAHNYbB0JwcdStg==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMEIyck1xbVJ4Zm56Z3dM
-            OGsxa1p0TGIvRE5DYXZzTDM3YUZFVTAxbUUwCllPd0FOUlRiZW5wT2QvLzZXYjRr
-            S1A5WjZxLzNYQ1ZWVFFQTzRwMFQweFEKLS0tIHNoZUpHS2dDNmFKc3ZVNFZuUFU4
-            L0M0MitMeDg1ZWYxcDNCQlVGUjRKeFkKvD2SKnuh517o2knPr2SOWq3kubMyI7UV
-            j6HgXVbHUDjmKl2dY+YVTnmxrK54E+Q6iiu7mQnvLdzxYBK/EiNt9w==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-21T08:17:51Z"
-    mac: ENC[AES256_GCM,data:v4KQq3Y5ZxsyMxR+FS1BZkH/bPTIIHfQu800U44odaNycIbWnuwCnLWGyJK6Por76bWALycGppDbHPKKW/N1I1XLy/EAXo02+nhHNvKVi2cXSXciuEPc/Cl+6TbP39lx4+EOM8CZoNZ8HAiS3QPy2bwZdMjEw/OHl8TqlN07q9s=,iv:PIcv/b6t+54/yCTZj+12Yep15ors/wXNUnaXjLjpVbM=,tag:JxO5M3OYaWzqgf4gUhCzzg==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/nixy/secrets/wg_preshared.yaml
+++ b/nixy/secrets/wg_preshared.yaml
@@ -1,21 +0,0 @@
-wg_preshared: ENC[AES256_GCM,data:k+aFYDNMojf5kktn6KJ4F5mH5oGdqxdF0MO88NcYpai9USnH394XRL9ASvs=,iv:L5LIXbADhrivKjK/V0E5QpRT7BDsktwIuKHgY+2qr84=,tag:pCW1naU/ygxAIDYWV2hHPQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZSHZvYy9TTmVEb2ZSTncy
-            ckJ1bXZGWVdJSkVHMGx2Vk5ZNlZ3Q2wzVFQ0Cmg1M3hKNFhnZk5nTE54RTdyR0Vs
-            NVRiTEltSnkxdmhhdGlycHNPWjFLbncKLS0tIE02NVJRZTd0VmowT1c4cjhKNlZk
-            Q01BQWNSVWtIMnFXRWpxR3JDMU8zYTAKIbfpM8uUb09cUlA8YWtgEOL5zvWf5omv
-            baZINiAu0/f1avYmW6Qb+aLa2ALrSZaotj46Uwd9Lb5mtjJ/8v9IOg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-20T18:12:20Z"
-    mac: ENC[AES256_GCM,data:4PWjwxOO0UuNsevCbzCLaiW7C+So4mEGivd9GzyLKx2JlkNFVB8wqPrY1Rl1ANMrT+7LKc8tVOA4zbweNc9idFG4y5DcvnDSieqKu9v1MeEMHqNpz5TTLbCP81g7qegjI/WKul2kaWIdPaioI/f5x2E6rEYnzFv+Di2mc3W+Qcc=,iv:iE9sali0O3sQIhOw30RGR/4ZQsAPcSxq1qxosfasojU=,tag:+9AOwph5A4oDXsK6Z3YeZA==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/nixy/secrets/wg_privkey.yaml
+++ b/nixy/secrets/wg_privkey.yaml
@@ -1,21 +0,0 @@
-wg_privkey: ENC[AES256_GCM,data:XL9FU1kZXvBJfwyt3HpQe8k8zg9HT6Xm0BdjNMduSu9uAgcHbglpLc/qTB0=,iv:QgX1VsmLUsDozFXmzDVPukjPNTa4Lnh806AQ4qdgpa8=,tag:RNVlDbtx8vAAbG0rinLVOw==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBSnkyM1ZrcnEvM3VHL0Nk
-            THhUUDdGU2s5UFgrVGZ3WXhkYTRIVTlaeGs4CjR4eVpmRy9qUkZSWkpFZDZHRDZI
-            ZWRXSmMzL2RWZkVrSlFPcC9ueGpDVFkKLS0tIDZWbENyS2hrSCtlNlBHaE56QTha
-            eFJmWXk1SVJEbDJOc1Q1VFlzVS8yODgKFXRAtR+67x0dkQTqZPtMT0Hd+aW+5K17
-            S/lhuHRhITt3woQnecVPMYklgJJlsyQ6blKhJw8dvhbVWWThZ853rQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-21T08:18:59Z"
-    mac: ENC[AES256_GCM,data:xPKsGZD5RKT/WMRupe4YTgoiUQRFq77KQyGaazeY1GEPI117gWxRHEpiyCLnfhZWcaekPWoXosm32wRLwDAXM/Femk567i5uKKG2wAqApWbc+FXTQ71w/CFr9uEWFApBjpEHpuBBaFV23qJfylsqeMp9r52d9Sp5eDQC4RJead0=,iv:oiNoZ/bqQUe+luqeuldw1M0KB2d4C5T7kXy+mLFZNZQ=,tag:5pK22TYGwbBNyWlfd/Ufxw==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/nixy/secrets/wg_privkey_proton.yaml
+++ b/nixy/secrets/wg_privkey_proton.yaml
@@ -1,22 +0,0 @@
-wg_privkey_proton: ENC[AES256_GCM,data:qVVd+1s2T3sKDi03V+eMvgqW8LAVl/yEKwtG2EMn8NhBCN7RvlttC5SeIDM=,iv:/QcrtmMjCzZRulumIz5u9oxyaRt+HUq96ZiP8ecpvAo=,tag:1DCaJqVGfg3sfvKTQnmzZA==,type:str]
-wg_endpoint_proton: ENC[AES256_GCM,data:ggoWnB6nGjGc/kSOaCo=,iv:1r5J6SO5JYH7+bMhE2lGwfFETVFeS61eCXtej0Pl07M=,tag:p+0hhQ/vqZzZML24YReA0g==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdXZpL1lrOEYyYVdFTzNJ
-            SHhXRVc5Y0o4ZzN2THRjM215UWczVjZOTXg4CjBJZ2VxN0t0ZFgzTmJMeXo5SWZk
-            UjRlNmdRTVVPbHVEeXM3TWhoS0pSUTQKLS0tIEtkTURBc1A3d2lTalhmeEoxUkZj
-            K3BHZnUzN3ZrL1dFQk8rWFpZR05pbFUKObrnIpY3NR1o3/lKhTfVpQU+eQRTi7wF
-            SAjGZ5BRdCi5x1VWRxiT1Fvjqkm7kBEQFvdSvbqW2UK6lVHtWgt2Vg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-12T13:30:18Z"
-    mac: ENC[AES256_GCM,data:3UqJGcNGPZDlLA3a0uNHUI0ykDC0ByxAR2ZsrsbWQMv3BS6zyBuc+zpTHQZoIPGsAMUetuB3OuA0IQNll3abg6u2AadEQBUf1PYMWlo58txLYlAs/q0g+575F+LhDSgmDMKOFXz4HqbFP0RYTHkPnmjWPMWWY3G9o6B3Iaw5+Kc=,iv:massJRpGcH4pDZxJrpQYy80XVViyw+qFsZ8Sk9Xze08=,tag:eDvuNadKGKBS/3jauvnuFQ==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/nixy/ssh_pubkey
+++ b/nixy/ssh_pubkey
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMPNCxE/8z02lVOC1unJbPMH+Ma+KRJfmz33oUfz3hKc root@nixy
--- a/nixy/wg_pubkey
+++ b/nixy/wg_pubkey
@@ -1 +0,0 @@
-oHVmhw80daHjDjo7nwt/Y9eKBaH5FoTiVeukwDObijM=
--- a/nixy/wg_pubkey_nx
+++ b/nixy/wg_pubkey_nx
@@ -1 +0,0 @@
-eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=
--- a/packages/bubblewrap/default.nix
+++ b/packages/bubblewrap/default.nix
@@ -27,6 +27,10 @@ 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
Author	SHA1	Message	Date
Asmir A	c20ffb018d	Merge branch 'host_cleanup'	2026-05-31 12:03:07 +02:00
Asmir A	c640229909	fuji: format, cleanup syntax	2026-05-31 12:03:01 +02:00
Asmir A	344b31db65	clean old hosts	2026-05-31 12:02:20 +02:00
Asmir A	06eea6c576	meta: add CLAUDE.md	2026-05-31 11:56:52 +02:00
Asmir A	44c8cf333a	magpie: add hardening	2026-05-31 11:55:40 +02:00
Asmir A	3ad90e1d73	fuji/home/qutebrowser: temp disable gpu-compositing	2026-05-31 11:55:16 +02:00
Asmir A	8a6eac625d	home/zsh: temp disable direnv	2026-05-31 11:54:25 +02:00
Asmir A	bdae9d7696	fuji: sway bar -> quickshell_bar	2026-05-31 11:53:55 +02:00
Asmir A	2f7f408466	bubblewrap: fix compile on gcc 15	2026-05-31 11:49:47 +02:00
Asmir A	874ea27f89	fuji/home_packages: wasistlos -> karere	2026-05-31 11:48:29 +02:00
Asmir A	b160263549	home/zsh: remove fzf zsh plugin as the prog provides it now	2026-05-31 11:45:42 +02:00
Asmir A	dfd2573cb2	fuji/home-manager: update swayidle syntax	2026-05-31 11:44:14 +02:00
Asmir A	7dec24203b	light -> brightnessctl, remove adb (not available on 26.05)	2026-05-31 11:42:41 +02:00
Asmir A	af1b425732	flake input: switch to 26.05	2026-05-31 11:38:31 +02:00
Asmir A	1b7c445e4a	fuji: remove unused alsa config/env;	2026-05-23 08:40:10 +02:00
Asmir A	9ffe730f1b	fuji: temporary switch to lts kernel for hinge detect issue	2026-05-23 08:39:11 +02:00
Asmir A	f8283e61df	fuji: update configuratio syntax, format	2026-05-23 08:30:07 +02:00
Asmir A	f1b03824b2	fuji: harden the system	2026-05-23 08:29:27 +02:00
Asmir A	bf12adcdf3	flake/simple-nixos-mailserver: change input from master to fixed version	2026-05-23 08:24:56 +02:00
Asmir A	cbc56857c2	home/fuji: set dark gtk theme and qutebrowser colorscheme, change mpv webtorrent hook download dir	2026-05-10 09:18:50 +02:00
Asmir A	a855afd3ad	home/fuji/mpv: disable uosc spinner, configure osd	2026-04-12 18:49:10 +02:00
Asmir A	19ef289cf3	home/zsh: enable completion, use exact ls command on chpwd()	2026-04-12 18:47:44 +02:00
Asmir A	d9d9e8f802	fuji/appimage: unset binfmt	2026-04-12 18:46:27 +02:00
Asmir A	f693b7230a	fuji/zsh: remove default prompt and some options	2026-04-12 18:46:02 +02:00
Asmir A	963afc2c3e	fuji/fs: add change xfs mount options	2026-04-12 18:44:48 +02:00
				`@@ -1 +0,0 @@`
				`peerix-mediabox:UDgG3xdQYv7bmx2l4ZPNRPJtp2zMmY++H/fnGeJ9BQw=`
				`@@ -1 +0,0 @@`
				`S+tL/pTm4D7bsWj/dhpPXHYxcye/DuNMguLD5l1ACEU=`
				`@@ -1 +0,0 @@`
				`peerix-nixy:8THqS0R2zWF/47ai0RFmqJnieYTZ1jaWOD9tnzpvA6s=`
				`@@ -1 +0,0 @@`
				`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMPNCxE/8z02lVOC1unJbPMH+Ma+KRJfmz33oUfz3hKc root@nixy`
				`@@ -1 +0,0 @@`
				`oHVmhw80daHjDjo7nwt/Y9eKBaH5FoTiVeukwDObijM=`
				`@@ -1 +0,0 @@`
				`eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=`