magpie/gitea: add typst syntax higlight

flake: update nvim
home/git: set defaultbranch to master
2024-12-05 11:06:43 +01:00 · 2024-12-04 16:36:26 +01:00 · 2024-12-04 15:22:01 +01:00 · 2024-12-03 23:13:07 +01:00 · 2024-12-03 16:02:53 +01:00 · 2024-12-03 16:01:21 +01:00
46 changed files with 1352 additions and 463 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -0,0 +1,30 @@
+keys:
+  - &magpie       age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+  - &mediabox     age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
+  - &nixy         age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+
+creation_rules:
+
+  - path_regex: common/secrets/[^/]+\.yaml$
+    key_groups:
+    - age:
+      - *magpie
+      - *mediabox
+      - *nixy
+
+  - path_regex: magpie/secrets/[^/]+\.yaml$
+    key_groups:
+    - age:
+      - *magpie
+      - *nixy
+
+  - path_regex: mediabox/secrets/[^/]+\.yaml$
+    key_groups:
+    - age:
+      - *mediabox
+      - *nixy
+
+  - path_regex: nixy/secrets/[^/]+\.yaml$
+    key_groups:
+    - age:
+      - *nixy
--- a/blue/configuration.nix
+++ b/blue/configuration.nix
@@ -1,7 +1,6 @@
 {
  config,
  pkgs,
-  lib,
  ...
 }: {
  imports = [
@@ -14,7 +13,7 @@
    optimise.automatic = true;
    gc.automatic = true;
    gc.options = "--delete-older-than 7d";
-    package = pkgs.nixUnstable;
+    package = pkgs.nixVersions.latest;
    settings.experimental-features = ["nix-command" "flakes"];
  };

--- a/blue/hardware-configuration.nix
+++ b/blue/hardware-configuration.nix
@@ -4,7 +4,6 @@
 {
  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }: {
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -1,35 +1,46 @@
 {
-  config,
  pkgs,
  nix-xilinx,
+  system,
  ...
 }: {
  environment.systemPackages = with pkgs;
    [
      acpi
      binutils
+      binwalk
      bluez
      bluez-tools
      btop
+      busybox
      curlHTTP3
      dfu-util
      dhcpcd
      direnv
      dmidecode
      dnsmasq
+      dnsutils
      dtach
+      f2fs-tools
      fd
      file
+      fio
      fzf
      fzy
      git
+      adwaita-icon-theme
+      gnomeExtensions.appindicator
      gnupg
      gptfdisk
+      hcxdumptool
      hdparm
-      htop
+      htop-vim
      interception-tools
+      iw
      jq
      lm_sensors
+      man-pages
+      man-pages-posix
      meson
      mosh
      msmtp
@@ -41,10 +52,13 @@
      nmap
      ntfs3g
      ntfsprogs
+      nvim
+      nvme-cli
      openhantek6022
      optipng
      pax-utils
      pciutils
+      proxychains-ng
      pstree
      psutils
      qemu_kvm
@@ -52,6 +66,7 @@
      rsync
      silver-searcher
      socat
+      sops
      sshfs
      strace
      swaylock
@@ -69,9 +84,12 @@
      vulkan-tools-lunarg
      vulkan-validation-layers
      wget
+      wirelesstools
+      wol
      xdg-utils
+      xfsprogs
      zip
      z-lua
    ]
-    ++ (with nix-xilinx.packages.x86_64-linux; [vivado vitis vitis_hls model_composer xilinx-shell]);
+    ++ (with nix-xilinx.packages.${system}; [vivado vitis vitis_hls model_composer xilinx-shell]);
 }
--- a/common/secrets/wg_preshared.yaml
+++ b/common/secrets/wg_preshared.yaml
@@ -0,0 +1,42 @@
+wg_preshared:
+    nixy: ENC[AES256_GCM,data:kP+Vt48NMpdBSGjpWzzxt+nqxPNXrofV4kLwgU4o62riB9rxU1CZ4Ddr17k=,iv:xCqR/rbGrJYBkxOpsAg1qxxEGXRD+577JGTNDqshcOQ=,tag:9rAdg6Zw6kVzLxwF1U+pNg==,type:str]
+    mediabox: ENC[AES256_GCM,data:BL9vCUE6wWtmTNPMCvJNZjiAMUWRmLLHOk73v1Z8EOJWcsZ5G3U+08TxBBg=,iv:XTZnF2kMVurTD+TPL0T7uDDu1gGjOdO7AWHXsZS5yO8=,tag:6RIAsbe0Ue4MX28VxzbPCg==,type:str]
+    workstation: ENC[AES256_GCM,data:x60PMdgihMjtvQagphdO0uft7LLU2grdgeTrO5oSRiqOtb23P5S5SxDQ3Js=,iv:CB8QldIZ8/FjbcAkLxekygUo5luHig7FnH7wyrgZEuk=,tag:E3XWxPH5/fHyFmGimQ4tLg==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzQ3JGNWRMeGhwM1dIOU5T
+            ZEt4WVhFa2lSaklpM3hmR04wY213TGd6K1FvCnltWFpqNHdrQ2V1V2ZDdTVOYlhP
+            M0x2TVRJbUtZK2xaOGE5Ri93YmV6R1UKLS0tIDQ3VkNrYjFNTjNrRTNFRmhYaENt
+            ZkRpMnZ3ZldOdWJ3VGw1T1RnRG15WDQKeZ9VBkcu2j83Hjofy1AAtBBqM9Tk3uFi
+            F/wgzV7mBXiBB/4w17iJsU5mB6s/JXXnGq11pu9QXC5tu072huCNYQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBheWtsbnArT3BwSVJ4QTJB
+            ZENTK2ZpS0lLUmJ1d1VaUVVGNnNXMEZ4RFJvCmFueFNiQjk5MkdnTVkvVVk1TkVV
+            M2Izamo0M1lGaVRPaGFOQUhkNGpmSmsKLS0tIGxtSXVackdsTTN1cTIvSEo4bGg3
+            a0dVL2FmL05TRllrZjBuOStPNTBHcU0KOaJFNhr0emSiAJFOFsaJ4sdUwjzg5TOW
+            Mh3JvRJINefiBUsFnFx8d3gn0+jHn+kXw22WMGRcbGgZTxJbFylmeA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5UVJiMENSeFdGWHRVVkt0
+            UEI4ek9jRFdYYkN5Nlc5Qi85MDhPRTA2bGt3CnZJcThNU1huczJGaEF6WWpzcHdV
+            dWhIczMzWSt0ZEVXeXdVQlBOZTZsN3cKLS0tIHRBQlhPT1FDcEZWU3JyNEZ0UWxC
+            eDhXVWo2UHVCaFUrak9aVEU5N0FxRVEKDKBpbHWwTkW3BFAXQ213/glZyTz88OjZ
+            JHh0phDzFZG0+nzBz3TAi0ZyYnlbOYAuEvQh1uUg9MI1XUCr8GC9Qw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-04-22T16:06:34Z"
+    mac: ENC[AES256_GCM,data:BRgF+L22FuN/v+Vi57JLaTxtAe4Gr8UtY4QIYRUeigpHCkxza+pUd5qyGTIsHeaRFWNy726u9+PlX3uy0MlOt9lzQ1Zlmc+hDthUIHRWX9mqO+j5+klmDvVug5yqr2f7HMtBD+tnEwDr65FuPNKqJjmg1Tbk0RD12yt/gkEAy7w=,iv:aTWVlHEQGNgnIIoJ2IpnppU6lo7g0kI7gxtPM1ZqXvM=,tag:PhZypRZAlmxnKz1Kxtppzg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
--- a/common/wg_pubkey_proton
+++ b/common/wg_pubkey_proton
@@ -0,0 +1 @@
+g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=
--- a/common/wg_pubkey_workstation
+++ b/common/wg_pubkey_workstation
@@ -0,0 +1 @@
+kbmzzQc3bBpkjE7K/ohycZtx+ml+dzVYOQ2xM0/bzzQ=
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1732722421,
+        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
        "type": "github"
      },
      "original": {
@@ -51,11 +51,11 @@
    "flake-compat_3": {
      "flake": false,
      "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@@ -89,11 +89,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1698250431,
-        "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=",
+        "lastModified": 1730016908,
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
        "type": "github"
      },
      "original": {
@@ -110,11 +110,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696069591,
-        "narHash": "sha256-YFPEWMV6XRi7CgDB1qJ67dIYPnrOETuxQO4mnPmxbQs=",
+        "lastModified": 1732892167,
+        "narHash": "sha256-AZ0rgM9xj+Bf2C8RfGMUvuVdcqkvQU5/Wm8u6A5xYJg=",
        "owner": "asmir.abdulahovic",
        "repo": "nix-xilinx",
-        "rev": "a20ac5924afa24d45227df7d7d54574a9409a4a6",
+        "rev": "3071f40914fe2db3837a40a72a97af6f0a442f16",
        "type": "gitlab"
      },
      "original": {
@@ -125,62 +125,47 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1697723726,
-        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
+        "lastModified": 1732981179,
+        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
+        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs-22_11": {
+    "nixpkgs-24_05": {
      "locked": {
-        "lastModified": 1669558522,
-        "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-22.11",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-23_05": {
-      "locked": {
-        "lastModified": 1684782344,
-        "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-24.05",
        "type": "indirect"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1697929210,
-        "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=",
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-23.05",
+        "ref": "release-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -192,11 +177,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1698783626,
-        "narHash": "sha256-esHANPDZbeIiBlXdFjBXpalHzSgtn+2TOmUa76dE6us=",
+        "lastModified": 1733261583,
+        "narHash": "sha256-HOVUtrhtJ16umPuEODuVE9fx+JmDCRp7wIxnEART0Eg=",
        "ref": "refs/heads/master",
-        "rev": "b660608fb3ff05e1ba88222d2e8d16a8ca5e580e",
-        "revCount": 20,
+        "rev": "a09a34997ce692c7a2e8e434b44433156a73088c",
+        "revCount": 38,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/nvim_flake"
      },
@@ -227,6 +212,28 @@
        "type": "gitlab"
      }
    },
+    "project-cloud": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "theme_anemone": "theme_anemone",
+        "theme_deepthought": "theme_deepthought"
+      },
+      "locked": {
+        "lastModified": 1729077289,
+        "narHash": "sha256-z5LEPxOJq2LjhPhY4QE1IOt0lBD39cipR6Lw8vRTNlI=",
+        "ref": "refs/heads/master",
+        "rev": "eab712e42139d33911ba767c2ff1bfbdf05c254d",
+        "revCount": 27,
+        "type": "git",
+        "url": "https://git.project-cloud.net/asmir/project-cloud"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.project-cloud.net/asmir/project-cloud"
+      }
+    },
    "root": {
      "inputs": {
        "home-manager": "home-manager",
@@ -234,6 +241,7 @@
        "nixpkgs": "nixpkgs",
        "nvim": "nvim",
        "peerix": "peerix",
+        "project-cloud": "project-cloud",
        "simple-nixos-mailserver": "simple-nixos-mailserver",
        "sops-nix": "sops-nix",
        "swaysw": "swaysw",
@@ -247,16 +255,14 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-22_11": "nixpkgs-22_11",
-        "nixpkgs-23_05": "nixpkgs-23_05",
-        "utils": "utils"
+        "nixpkgs-24_05": "nixpkgs-24_05"
      },
      "locked": {
-        "lastModified": 1695910380,
-        "narHash": "sha256-CyzeiXQGm8ceEOSK1dffBCfO7JNp8XhQeNkUiJ5HxgY=",
+        "lastModified": 1722877200,
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "84783b661ecf33927c534b6476beb74ea3308968",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
        "type": "gitlab"
      },
      "original": {
@@ -273,11 +279,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1697943852,
-        "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=",
+        "lastModified": 1729999681,
+        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c",
+        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
        "type": "github"
      },
      "original": {
@@ -293,11 +299,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1698401726,
-        "narHash": "sha256-kGMqxaNaNSbKJS/55KqqMvLj1xOBc8zCizs6I3xiCo0=",
+        "lastModified": 1711800706,
+        "narHash": "sha256-VuClUfWEmuv6Ysf6g42rfIm4cRZ/DWYZJxlNd9f1IL4=",
        "ref": "refs/heads/master",
-        "rev": "1e49032fbfec10b51c9f627aab286290ac15977c",
-        "revCount": 3,
+        "rev": "7422c005ffdd282c389d21c5f8a4ea835bc1a0f0",
+        "revCount": 4,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/swaysw"
      },
@@ -321,18 +327,35 @@
        "type": "github"
      }
    },
-    "utils": {
+    "theme_anemone": {
+      "flake": false,
      "locked": {
-        "lastModified": 1605370193,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "lastModified": 1699399376,
+        "narHash": "sha256-u2baLVhc/tWd9h9+g9vKBN1m4qG23uL1HUizFigOJXw=",
+        "owner": "Speyll",
+        "repo": "anemone",
+        "rev": "565a6e84e3054a45ec31729125801ab1f403c936",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "owner": "Speyll",
+        "repo": "anemone",
+        "type": "github"
+      }
+    },
+    "theme_deepthought": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1681035730,
+        "narHash": "sha256-dzhfGmhuNCbloqknM7lVnFbNYmf2/ue7az6DQok44yM=",
+        "owner": "RatanShreshtha",
+        "repo": "DeepThought",
+        "rev": "430c1d5085dd6bea4cd6bd2d55003db67ba6bea0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RatanShreshtha",
+        "repo": "DeepThought",
        "type": "github"
      }
    },
@@ -343,17 +366,17 @@
        ]
      },
      "locked": {
-        "lastModified": 1696448728,
-        "narHash": "sha256-kUc6983IX9n0eQxTFZRK7LYCLHoxoGZ5rOV7nu8hGRI=",
-        "owner": "asmir.abdulahovic",
-        "repo": "zremap",
-        "rev": "9043844893cfc333ed04d04c1d3b67d9904c0afc",
-        "type": "gitlab"
+        "lastModified": 1721120316,
+        "narHash": "sha256-CaAMnU6LKqJrsZmR9k0/2brpULnAekpgG5S0BjtFhaQ=",
+        "ref": "refs/heads/master",
+        "rev": "8a7923bd4e5d36b186408d5432568a91ac67b695",
+        "revCount": 21,
+        "type": "git",
+        "url": "https://git.project-cloud.net/asmir/zremap"
      },
      "original": {
-        "owner": "asmir.abdulahovic",
-        "repo": "zremap",
-        "type": "gitlab"
+        "type": "git",
+        "url": "https://git.project-cloud.net/asmir/zremap"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
  description = "NixOS configuration";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";

    nix-xilinx = {
      url = "gitlab:asmir.abdulahovic/nix-xilinx";
@@ -15,7 +15,7 @@
    };

    zremap = {
-      url = "gitlab:asmir.abdulahovic/zremap";
+      url = "git+https://git.project-cloud.net/asmir/zremap";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@@ -43,6 +43,11 @@
      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+
+    project-cloud = {
+      url = "git+https://git.project-cloud.net/asmir/project-cloud";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs = inputs @ {
@@ -51,6 +56,7 @@
    nix-xilinx,
    nvim,
    peerix,
+    project-cloud,
    simple-nixos-mailserver,
    sops-nix,
    swaysw,
@@ -60,20 +66,24 @@
    pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
  in {
    nixosConfigurations = rec {
-      nixy = nixpkgs.lib.nixosSystem {
+      nixy = nixpkgs.lib.nixosSystem rec {
        system = "x86_64-linux";
        modules = [
          {_module.args = inputs;}
+          {_module.args.system = system;}
+          {nix.registry.nixpkgs.flake = nixpkgs;}
+          ./common/packages.nix
+          ./common/suspend.nix
          ./nixy/configuration.nix
          ./nixy/hardware-configuration.nix
-          ./common/packages.nix
          sops-nix.nixosModules.sops
          home-manager.nixosModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.akill = import ./home/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs;};
+            home-manager.extraSpecialArgs = {inherit inputs system;};
+            home-manager.backupFileExtension = "home_backup";
          }
          peerix.nixosModules.peerix
          {
@@ -90,10 +100,12 @@
        ];
      };

-      mediabox = nixpkgs.lib.nixosSystem {
+      mediabox = nixpkgs.lib.nixosSystem rec {
        system = "x86_64-linux";
        modules = [
          {_module.args = inputs;}
+          {_module.args.system = system;}
+          {nix.registry.nixpkgs.flake = nixpkgs;}
          ./common/packages.nix
          ./common/suspend.nix
          ./mediabox/configuration.nix
@@ -105,7 +117,7 @@
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.akill = import ./home/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs;};
+            home-manager.extraSpecialArgs = {inherit inputs system;};
          }
          peerix.nixosModules.peerix
          {
@@ -122,10 +134,12 @@
        ];
      };

-      blue = nixpkgs.lib.nixosSystem {
+      blue = nixpkgs.lib.nixosSystem rec {
        system = "x86_64-linux";
        modules = [
          {_module.args = inputs;}
+          {_module.args.system = system;}
+          {nix.registry.nixpkgs.flake = nixpkgs;}
          ./blue/configuration.nix
          ./blue/hardware-configuration.nix
          ./common/packages.nix
@@ -134,17 +148,20 @@
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.akill = import ./home/home.nix;
+            home-manager.extraSpecialArgs = {inherit inputs system;};
          }
        ];
      };
-      magpie = nixpkgs.lib.nixosSystem {
-        system = "arm64-linux";
+      magpie = nixpkgs.lib.nixosSystem rec {
+        system = "aarch64-linux";
        modules = [
          {_module.args = inputs;}
+          {_module.args.system = system;}
+          {nix.registry.nixpkgs.flake = nixpkgs;}
          ./magpie/configuration.nix
          ./magpie/hardware-configuration.nix
-          sops-nix.nixosModules.sops
          simple-nixos-mailserver.nixosModule
+          sops-nix.nixosModules.sops
          (builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")
        ];
      };
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,11 +1,12 @@
 {
-  pkgs,
-  config,
  lib,
-  inputs,
+  pkgs,
  ...
-}:
-with lib; {
+}: let
+  qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
+    firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
+  '';
+in {
  imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];

  home.stateVersion = "22.11";
@@ -16,20 +17,28 @@ with lib; {
  xdg.mimeApps = {
    enable = true;
    defaultApplications = {
-      "application/pdf" = ["sioyek.desktop"];
+      "application/pdf" = "sioyek.desktop";
+      "default-web-browser" = "org.qutebrowser.qutebrowser.desktop";
+      "text/html" = "org.qutebrowser.qutebrowser.desktop";
+      "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
+      "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
+      "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
+      "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
    };
  };

  fonts.fontconfig.enable = true;

-  home.sessionVariables = {
-    BROWSER = "qutebrowser";
+  home.sessionVariables = rec {
+    BROWSER = lib.getExe qutebrowser_firejail;
+    DEFAULT_BROWSER = "${BROWSER}";
    EDITOR = "nvim";
    _JAVA_AWT_WM_NONREPARENTING = "1";
    MOZ_ENABLE_WAYLAND = "1";
+    NIXOS_OZONE_WL = "1";
    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
    SUDO_EDITOR = "nvim";
-    #WLR_RENDERER = "vulkan";
+    WLR_RENDERER = "vulkan";
  };

  wayland.windowManager.sway = {enable = true;};
@@ -46,6 +55,14 @@ with lib; {
      };
    };

+    tmux = {
+      enable = true;
+      clock24 = true;
+      keyMode = "vi";
+      terminal = "screen-256color";
+      plugins = with pkgs.tmuxPlugins; [sysstat net-speed gruvbox];
+    };
+
    mpv = {
      enable = true;
      config = {
@@ -126,7 +143,7 @@ with lib; {

    qutebrowser = {
      enable = true;
-      package = pkgs.qutebrowser;
+      package = qutebrowser_firejail;
      keyBindings = {
        normal = {
          "j" = "scroll-px 0 25";
@@ -165,6 +182,7 @@ with lib; {
      userName = "Asmir A";
      userEmail = "asmir.abdulahovic@gmail.com";
      extraConfig = {
+        init.defaultBranch = "master";
        pull = {rebase = true;};
        credential = {helper = "store";};
      };
@@ -185,6 +203,7 @@ with lib; {
  services = {
    lorri.enable = false;
    mako.enable = true;
+    cliphist.enable = true;
    gammastep = {
      enable = true;
      latitude = "44.53";
@@ -199,29 +218,66 @@ with lib; {
      enable = true;
      defaultCacheTtl = 1800;
      enableSshSupport = true;
-      pinentryFlavor = "curses";
    };

-    swayidle = {
+    swayidle = let
+      locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
+        TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
+        ${lib.getExe pkgs.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
+        ${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
+        ${pkgs.coreutils}/bin/rm "$TMP_FILE"
+      '';
+    in {
      enable = true;
      events = [
        {
          event = "before-sleep";
-          command = "swaylock_bg_blur.sh";
+          command = "${locker}/bin/swaylock_fancy";
        }
        {
          event = "lock";
-          command = "swaylock_bg_blur.sh";
+          command = "${locker}/bin/swaylock_fancy";
        }
        {
          event = "after-resume";
-          command = "pkill -USR1 i3status-rs";
+          command = "${pkgs.procps}/bin/pkill -USR1 i3status-rs";
        }
      ];
      timeouts = [
        {
          timeout = 15 * 60;
-          command = "swaylock_bg_blur.sh";
+          command = "${locker}/bin/swaylock_fancy";
+        }
+      ];
+    };
+
+    kanshi = {
+      enable = true;
+      settings = [
+        {
+          profile.name = "undocked";
+          profile.outputs = [
+            {
+              criteria = "eDP-1";
+            }
+          ];
+        }
+
+        {
+          profile.name = "docked";
+          profile.outputs = [
+            {
+              criteria = "eDP-1";
+            }
+            {
+              criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026536";
+              mode = "1920x1080@74.973Hz";
+            }
+            {
+              criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026535";
+              mode = "1920x1080@74.973Hz";
+            }
+          ];
        }
      ];
    };
--- a/home/home_packages.nix
+++ b/home/home_packages.nix
@@ -1,37 +1,83 @@
 {
-  config,
+  lib,
  pkgs,
  inputs,
+  system,
  ...
-}: {
+}: let
+  chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
+  '';
+  chromium_discord = pkgs.writeShellScriptBin "chromium_discord" ''
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
+  '';
+  chromium_stackfield = pkgs.writeShellScriptBin "chromium_stackfield" ''
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
+  '';
+  qcad = pkgs.writeShellScriptBin "qcad" ''
+    QT_QPA_PLATFORM=xcb ${lib.getExe pkgs.qcad} $@
+  '';
+  ssh_proxy = pkgs.writeShellScriptBin "ssh_proxy" ''
+    if ${pkgs.coreutils}/bin/test $# -ne 1; then
+      echo "Usage: $0 <user>@<ssh_host>"
+      exit
+    fi
+    PROXY_PORT="1337"
+    ${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
+  '';
+  wrap_sh = let
+    bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
+  in
+    pkgs.writeShellScriptBin "wrap.sh" ''
+      if ${pkgs.coreutils-full}/bin/test $# -ne 1; then
+        echo "Usage: $0 <directory>"
+        exit
+      fi
+      FULL_PATH=$(${pkgs.coreutils-full}/bin/realpath "$1")
+      BUBBLEWRAP_DIR="$1" ${bubblewrap}/bin/bwrap \
+        --bind / / \
+        --dev /dev \
+        --overlay-src "$FULL_PATH" \
+        --tmp-overlay "$FULL_PATH" \
+        "$SHELL"
+    '';
+in {
  home.packages = with pkgs;
    [
-      alejandra
+      anydesk
      appimage-run
      arp-scan
      birdtray
      blackmagic
+      blender
      btop
      cached-nix-shell
      caddy
      cargo
-      ccls
-      cemu
+      ungoogled-chromium
      cmake
      compsize
-      cura
+      /*cura*/
      deluge
+      dfu-util
+      discord
+      dmenu-wayland
+      drawio
+      dualsensectl
      ffmpeg-full
      firefox
+      freecad
      gcc
      gdb
      ghostscript
      glab
-      /*glaxnimate*/
+      glaxnimate
      gnumake
      go
      grim
+      heimdall
      hyperfine
+      icestorm
      imagemagick
      imv
      inkscape
@@ -39,75 +85,87 @@
      kdenlive
      kicad
      kodi-wayland
+      krita
      libnotify
-      libreoffice
+      libreoffice-qt6-fresh
      libva-utils
+      linuxPackages_latest.perf
+      lsix
+      lsix
      mediainfo
      ncdu
      neovide
+      nextpnr
      ngspice
      nix-init
+      nixpkgs-fmt
+      nix-prefetch-git
      nodePackages.peerflix
+      nom
+      openems
      openocd
+      openscad
      pandoc
-      pass
+      paraview
+      pass-wayland
      patchelf
      pavucontrol
+      pay-respects
      pirate-get
      poppler_utils
      powertop
      pulsemixer
+      pwvucontrol
      python3
      python3Packages.west
      remmina
      river
      rtorrent
-      rustc
+      sbcl
      screen
      seer
      sioyek
      skypeforlinux
      slurp
+      steam-run
+      stm32cubemx
+      swayimg
      tea
+      teams-for-linux
+      tectonic
+      tessen
      texlive.combined.scheme-full
      thunderbird
+      typst
      upx
      waybar
      wdisplays
+      weechat
      whatsapp-for-linux
+      wine
      wireshark
      wl-clipboard
      wlr-randr
      wofi
      x2goclient
      yewtube
+      yosys
      yt-dlp
+      zapzap
      zathura
-      zeal-qt6
+      /*zeal-qt6*/
      zig
-      zls
-
-      /*
-      install here until nvim flake is fixed
-      */
-      alejandra
-      ccls
-      gopls
-      luaformatter
-      nixd
-      pyright
-      rust-analyzer
-      sumneko-lua-language-server
-      svls
-      texlab
-      tree-sitter
-      verible
-      zls
    ]
    ++ [
-      inputs.swaysw.packages.x86_64-linux.swaysw
-      inputs.nvim.packages.x86_64-linux.nvim
-      (import ../packages/zapzap/default.nix {inherit pkgs;})
+      chromium_discord
+      chromium_stackfield
+      chromium_teams
+      ssh_proxy
+      wrap_sh
+      qcad
+    ]
+    ++ [
+      inputs.swaysw.packages.${system}.swaysw
      (pkgs.callPackage ../packages/viber/default.nix {})
      (pkgs.callPackage ../packages/bubblewrap/default.nix {})
    ];
--- a/home/i3.nix
+++ b/home/i3.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  pkgs,
  ...
--- a/home/i3status-rust.nix
+++ b/home/i3status-rust.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
+{...}: {
  programs.i3status-rust = {
    bars.top = {
      icons = "awesome5";
@@ -23,7 +18,15 @@
        }
        {
          block = "disk_space";
-          path = "/";
+          path = "/nix";
+          info_type = "available";
+          interval = 20;
+          warning = 20.0;
+          alert = 10.0;
+        }
+        {
+          block = "disk_space";
+          path = "/home";
          info_type = "available";
          interval = 20;
          warning = 20.0;
@@ -39,6 +42,11 @@
          device = "enp5s0";
          interval = 2;
        }
+        {
+          block = "net";
+          device = "enp7s0f3u1u1";
+          interval = 2;
+        }
        {
          block = "net";
          device = "eno1";
--- a/home/sway.nix
+++ b/home/sway.nix
@@ -1,12 +1,29 @@
 {
  config,
-  lib,
  pkgs,
+  inputs,
+  system,
+  lib,
  ...
-}: {
+}: let
+  cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
+    ${lib.getExe pkgs.cliphist} list | \
+    ${lib.getExe pkgs.wofi} --dmenu --insensitive | \
+    ${lib.getExe pkgs.cliphist} decode | \
+    ${pkgs.wl-clipboard}/bin/wl-copy
+  '';
+  screenshot_clip = pkgs.writeShellScriptBin "screenshot_clip" ''
+    GEOM="$(${lib.getExe pkgs.slurp} -d)"
+    ${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
+  '';
+  swaysw = inputs.swaysw.packages.${system}.swaysw;
+  viber = pkgs.callPackage ../packages/viber/default.nix {};
+  term = "${pkgs.foot}/bin/footclient";
+in {
  wayland.windowManager.sway = {
    enable = true;
    extraSessionCommands = "";
+    extraConfigEarly = '''';

    config = {
      fonts = {
@@ -33,8 +50,8 @@
      modifier = "Mod4";
      output = {
        eDP-1 = {
-          bg = "~/pic/wallpaper stretch";
          /*
+          bg = "~/pic/wallpaper stretch";
          scale = "1.4";
          */
        };
@@ -58,14 +75,16 @@
            style = "Bold Semi-Condensed";
            size = 12.0;
          };
-          statusCommand = "i3status-rs ~/.config/i3status-rust/config-top.toml";
+          statusCommand = "${lib.getExe pkgs.i3status-rust} ~/.config/i3status-rust/config-top.toml";
        }
      ];

      keybindings = {
        "Alt+Shift+q" = "kill";
-        "Alt+Shift+Return" = "exec ${pkgs.foot}/bin/footclient";
-        "Alt+p" = "exec ${pkgs.dmenu-wayland}/bin/dmenu-wl_run -fn \"mono 14\"";
+        "Alt+Shift+Return" = "exec ${term}";
+        "Alt+p" = "exec ${pkgs.bemenu}/bin/bemenu-run";
+        "Alt+c" = "exec ${pkgs.moreutils}/bin/lckdo cliphist_sway ${cliphist_sway}/bin/cliphist_sway";
+        "Print" = "exec ${pkgs.moreutils}/bin/lckdo screenshot_clip ${screenshot_clip}/bin/screenshot_clip";

        "Alt+Shift+space" = "floating toggle";
        "Alt+space" = "focus mode_toggle";
@@ -100,21 +119,19 @@
        "Alt+j" = "focus down";
        "Alt+k" = "focus up";
        "Alt+l" = "focus right";
-        "Alt+slash" = "exec swaysw";
+        "Alt+slash" = "exec ${pkgs.moreutils}/bin/lckdo swaysw ${swaysw}/bin/swaysw";
        "Alt+Escape" = "workspace back_and_forth";
        "Alt+f" = "fullscreen enable";
+        "Alt+bracketright" = "focus output right";
+        "Alt+bracketleft" = "focus output left";

        "Mod4+l" = ''
-          exec swaymsg [app_id="python3"] scratchpad show || exec foot -a python3 python3'';
-        "Mod4+h" = "exec swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec zapzap";
-        "Mod4+j" = "exec swaymsg [app_id=com.viber] scratchpad show || exec viber";
+          exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}'';
+        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
+        "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
        "Mod4+y" = ''
-          exec swaymsg [app_id="pulsemixer"] scratchpad show || exec foot -a pulsemixer pulsemixer'';
-
-        "XF86AudioRaiseVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') +5%";
-        "XF86AudioLowerVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') -5%";
-        "XF86AudioMute" = "exec pactl set-sink-mute $(pacmd list-sinks |awk '/* index:/{print $3}') toggle";
-        "XF86AudioMicMute" = "exec pactl set-source-mute $(pacmd list-sources |awk '/* index:/{print $3}') toggle";
+          exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}'';
+        "Mod4+p" = "exec ${lib.getExe pkgs.tessen} -a copy";
      };
    };
  };
--- a/home/whatsapp-for-linux.nix
+++ b/home/whatsapp-for-linux.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib; {
  xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" (
    generators.toINI {} {
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
  programs.z-lua = {
    enableAliases = true;
    enableZshIntegration = true;
@@ -22,6 +17,7 @@
      cp = "cp -v";
      rm = "rm -v";
      ip = "ip --color=auto";
+      f = "''$(pay-respects zsh)";
    };

    history = {
@@ -42,18 +38,13 @@
        src = pkgs.nix-zsh-completions;
        file = "share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh";
      }
-      {
-        name = "fast_syntax_highlight";
-        src = pkgs.zsh-fast-syntax-highlighting;
-        file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
-      }
      {
        name = "pure_prompt";
        src = pkgs.fetchFromGitHub {
          owner = "sindresorhus";
          repo = "pure";
-          rev = "87e6f5dd4c793f6d980532205aaefe196780606f";
-          hash = "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w=";
+          rev = "a02209d36c8509c0e62f44324127632999c9c0cf";
+          hash = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
        };
        file = "pure.plugin.zsh";
      }
@@ -77,28 +68,36 @@
    envExtra = '''';

    initExtra = ''
-      # binds
-      bindkey '^K' fzf-file-widget
+           # binds
+           bindkey '^K' fzf-file-widget

-      # options
-      setopt nobeep
-      setopt nopromptcr
-      setopt c_bases
-      setopt completeinword
-      setopt completealiases
-      setopt extendedglob
-      setopt notify
+           # options
+           setopt nobeep
+           setopt nopromptcr
+           setopt c_bases
+           setopt completeinword
+           setopt completealiases
+           setopt notify

-      #
-      RPS1=""
+           #
+           RPS1=""

-      #
-      function chpwd() {
-        ls;
-      }
+           #
+           function chpwd() {
+             ls;
+           }

-      eval "$(direnv hook zsh)"
-      zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+           eval "$(direnv hook zsh)"
+           zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+
+           if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then
+      TMUX_EXE="${pkgs.tmux}/bin/tmux"
+             systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER
+           fi
+
+           if [[ -n "$BUBBLEWRAP_DIR" ]]; then
+      RPS1="{{$BUBBLEWRAP_DIR}}"
+           fi
    '';
  };
 }
--- a/magpie/configuration.nix
+++ b/magpie/configuration.nix
@@ -2,48 +2,73 @@
  config,
  pkgs,
  lib,
+  project-cloud,
+  nvim,
+  system,
  ...
 }: {
  imports = [];

  nix.optimise.automatic = true;
  nix.settings.experimental-features = ["nix-command" "flakes"];
+  system.switch = {
+    enable = false;
+    enableNg = true;
+  };

  # Use the systemd-boot EFI boot loader.
  boot.loader.systemd-boot.enable = true;
-  boot.loader.grub.devices = ["/dev/sda"];
+  boot.loader.systemd-boot.configurationLimit = 2;
  boot.loader.efi.canTouchEfiVariables = true;
  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelParams = ["ip=dhcp"];
+  boot.kernel.sysctl = {
+    "net.core.default_qdisc" = "fq";
+    "net.ipv4.tcp_congestion_control" = "bbr";
+  };
+
+  boot.initrd = {
+    compressor = "zstd";
+    availableKernelModules = ["virtio-pci"];
+    systemd.enable = true;
+    network = {
+      enable = true;
+      ssh = {
+        enable = true;
+        hostKeys = [/etc/ssh_dummy_ed25519_key];
+        authorizedKeyFiles = [../nixy/ssh_pubkey];
+      };
+    };
+  };

  # Set your time zone.
  time.timeZone = "Europe/Berlin";

  users.users.root.initialHashedPassword = "";
  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC0gyN7DzF7+sinneq7++fT93dNWe9ttKnLZJEb0LVs7UxPtz/ovlxnktAgEtSh7NUUGKPILGG6+YG/Jz3pb4cLuQHtavIQ2mIzIbiNl+c80gLNPulfOrC3KyCacYnlcEpoV+4yvMPLDf+5ySilYoF30CSIo8B7B4PSwO3/I20oXXY0zeVmYKs65BY8OrR8PDdtPpuqGcTdPpVSrooZQoykriFeejBb0Jn7qWO7vmsTyUZZIP4nKKUyqE6iFZ2zv+J3mYfuoglQKO1+kqcCYCef0sheLZGD4/QIIL8HJ9yNWb6OQhu7MEv1NowuHkviImwVO3actZ1/x4lrWt4mY+bGglVwA90u1KZUQ10qKQ2xCG2ZHE9DSxWxpI/Yq2P4pLA/XSkYFPpzmoD9c6cpv0WLAvmQrEVkqK0xXo+KszUlyGy5sVJl7/h1fZ8YhWsWUnU1XJFmKLaomUZflL3h7X6xJNVPzZmso8l1INdCvIBDu+G84kAp1/aFalSJMyjTgvCc1hxhAVYhmrc3msGH0Jk8CcPBwYa0BH4EryacdupOS/c5VxAbdyuizEgitP1ylRmydVVDEItPNXFvpWdyEehf/VmsUXqL48mBzfvi6feD5AzKjPaQNaATpxLs9Sl9CMxSy27ahHwEK6dek1wm7nkoSIDSRWfGhYKr3lUg0emAYQ=="
+    (builtins.readFile ../nixy/ssh_pubkey)
  ];

  environment.systemPackages = with pkgs; [
-    alejandra
    curl
    fd
    file
    fzf
    fzy
    git
-    htop
+    nvim.packages.${system}.nvim
+    htop-vim
+    nvim
+    pciutils
    tig
+    tmux
    unzip
+    usbutils
    wget
    zip
  ];

  programs.mosh.enable = true;
-  programs.neovim = {
-    enable = true;
-    vimAlias = true;
-    viAlias = true;
-  };

  mailserver = {
    enable = true;
@@ -73,10 +98,16 @@
  services.logind.extraConfig = ''KillUserProcesses=yes '';
  services.openssh.settings.PermitRootLogin = "prohibit-password";
  services.openssh.enable = true;
+  services.openssh.listenAddresses = [
+    {
+      addr = "10.100.0.1"; # wireguard
+      port = 22;
+    }
+  ];
  services.opendkim.enable = true;

  services.miniflux = {
-    enable = true;
+    enable = false;
    adminCredentialsFile = config.sops.secrets."miniflux_env".path;
    config = {
      LISTEN_ADDR = "localhost:5001";
@@ -84,23 +115,21 @@
    };
  };

-  services.restya-board = {
+  services.goatcounter = {
    enable = true;
-    /*
-    virtualHost.serverName = "board.project-cloud.net";
-    */
-    virtualHost.listenHost = "localhost";
-    virtualHost.listenPort = 4001;
+    port = 8002;
+    proxy = true;
+    address = "127.0.0.1";
  };

-  services.nextcloud = rec {
-    enable = true;
-    package = pkgs.nextcloud27;
+  services.nextcloud = {
+    enable = false;
+    package = pkgs.nextcloud28;
    config.adminpassFile = config.sops.secrets."nextcloud_admin".path;
    configureRedis = true;
-    hostName = "project-cloud.net";
+    hostName = "cloud.project-cloud.net";
    https = true;
-    extraOptions = {
+    settings = {
      mail_smtpmode = "sendmail";
      mail_sendmailmode = "pipe";
      enabledPreviewProviders = [
@@ -117,14 +146,11 @@
        "OC\\Preview\\XBitmap"
      ];
    };
-    phpOptions =
-      phpOptions.default
-      // {
-        "opcache.jit" = "tracing";
-        "opcache.jit_buffer_size" = "100M";
-        # recommended by nextcloud admin overview
-        "opcache.interned_strings_buffer" = "16";
-      };
+    phpOptions = {
+      "opcache.jit" = "tracing";
+      "opcache.jit_buffer_size" = "100M";
+      "opcache.interned_strings_buffer" = "16";
+    };
  };

  services.nginx = {
@@ -135,14 +161,26 @@
    recommendedProxySettings = true;
    recommendedTlsSettings = true;

+    virtualHosts."project-cloud.net" = {
+      quic = true;
+      http3 = true;
+      forceSSL = true;
+      enableACME = true;
+      root = "${project-cloud.packages.${system}.default}/public";
+    };
+
+    /*
    virtualHosts.${config.services.nextcloud.hostName} = {
      quic = true;
+      http3 = true;
      forceSSL = true;
      enableACME = true;
    };
+    */

    virtualHosts."miniflux.project-cloud.net" = {
      quic = true;
+      http3 = true;
      forceSSL = true;
      enableACME = true;
      locations."/" = {
@@ -152,19 +190,21 @@

    virtualHosts.${config.services.gitea.settings.server.DOMAIN} = {
      quic = true;
+      http3 = true;
      forceSSL = true;
      enableACME = true;
      locations."/" = {
-        proxyPass = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
+        proxyPass = "http://unix:${toString config.services.gitea.settings.server.HTTP_ADDR}";
      };
    };

-    virtualHosts."board.project-cloud.net" = {
+    virtualHosts."stats.project-cloud.net" = {
      quic = true;
+      http3 = true;
      forceSSL = true;
      enableACME = true;
      locations."/" = {
-        proxyPass = "http://localhost:${toString config.services.restya-board.virtualHost.listenPort}";
+        proxyPass = "http://localhost:8002/";
      };
    };
  };
@@ -181,6 +221,8 @@
      ROOT_URL = "https://git.project-cloud.net";
      DISABLE_SSH = true;
      HTTP_PORT = 3001;
+      LANDING_PAGE = "explore";
+      PROTOCOL = "http+unix";
    };
    settings.mailer = {
      ENABLED = true;
@@ -190,8 +232,8 @@
    };

    settings.service = {
-      REGISTER_EMAIL_CONFIRM = true;
      DISABLE_REGISTRATION = true;
+      REGISTER_EMAIL_CONFIRM = true;
    };

    settings."markup.restructuredtext" = let
@@ -203,6 +245,45 @@
      RENDER_COMMAND = "${docutils}/bin/rst2html.py";
      IS_INPUT_FILE = false;
    };
+
+    settings."markup.typst" = {
+      ENABLED = true;
+      FILE_EXTENSIONS = ".typ";
+      RENDER_COMMAND = "timeout 30s ${lib.getExe pkgs.python3Packages.pygments} -f html -O full";
+      IS_INPUT_FILE = false;
+    };
+  };
+
+  services.nfs.server.enable = false;
+  services.nfs.server.extraNfsdConfig = ''
+    rdma = true
+    vers3 = false
+    vers4.0 = false
+    vers4.1 = false
+  '';
+  services.nfs.server.exports = ''
+    /export/nixy    10.100.0.1/24(rw,nohide,insecure,no_subtree_check,all_squash,anonuid=1000,anongid=100)
+  '';
+
+  services.borgbackup.jobs."borgbase" = {
+    paths = [
+      "/var/lib/gitea"
+    ];
+    exclude = [];
+    repo = "ssh://na9fqv67@na9fqv67.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";
+  };
+
+  services.seafile = {
+    enable = false;
+    initialAdminPassword = "admin";
+    adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
  };

  /*
@@ -219,38 +300,95 @@
    defaults.email = "asmir.abdulahovic@gmail.com";
  };

-  sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
-
-  sops.secrets."miniflux_env" = {
-    sopsFile = ./secrets/miniflux.yaml;
+  sops = {
+    age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+    secrets = {
+      "asmir_mail_pw_hash".sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
+      "borgbase_enc_key".sopsFile = ./secrets/borgbase_enc_key.yaml;
+      "borgbase_ssh_key".sopsFile = ./secrets/borgbase_ssh_key.yaml;
+      "gitea_mail_pw_hash".sopsFile = ./secrets/gitea_mail_pw_hash.yaml;
+      "miniflux_env".sopsFile = ./secrets/miniflux.yaml;
+      "wg_preshared/mediabox".sopsFile = ../common/secrets/wg_preshared.yaml;
+      "wg_preshared/nixy".sopsFile = ../common/secrets/wg_preshared.yaml;
+      "wg_preshared/workstation".sopsFile = ../common/secrets/wg_preshared.yaml;
+      "wg_privkey".sopsFile = ./secrets/wg_privkey.yaml;
+      "gitea_db" = {
+        sopsFile = ./secrets/gitea_db.yaml;
+        owner = config.users.users.gitea.name;
+      };
+      /*
+      "nextcloud_admin" = {
+        sopsFile = ./secrets/nextcloud_admin.yaml;
+        owner = config.users.users.nextcloud.name;
+      };
+      */
+    };
  };

-  sops.secrets."gitea_mail_pw_hash" = {
-    sopsFile = ./secrets/gitea_mail_pw_hash.yaml;
-  };
-
-  sops.secrets."asmir_mail_pw_hash" = {
-    sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
-  };
-
-  sops.secrets."gitea_db" = {
-    sopsFile = ./secrets/gitea_db.yaml;
-    owner = config.users.users.gitea.name;
-  };
-
-  sops.secrets."nextcloud_admin" = {
-    sopsFile = ./secrets/nextcloud_admin.yaml;
-    owner = config.users.users.nextcloud.name;
-  };
+  networking.hostName = "magpie";

  networking.firewall.enable = true;
-  networking.firewall.allowedTCPPorts = [80 443 587];
-  networking.firewall.allowedUDPPorts = [];
+  networking.firewall.allowedTCPPorts = [80 443 587 2049]; # http, mail, mail, nfs
+  networking.firewall.allowedUDPPorts = [443 51820]; #mail, wireguard
  networking.firewall.allowPing = true;
  networking.firewall.logRefusedConnections = lib.mkDefault false;
-  networking.hostName = "magpie";
+
+  networking.nat.enable = true;
+  networking.nat.externalInterface = "enp1s0";
+  networking.nat.internalInterfaces = ["wg0"];
+
  networking.networkmanager.enable = true;
  networking.wireless.enable = false;

+  networking.wireguard.interfaces = {
+    wg0 = {
+      ips = ["10.100.0.1/24"];
+      listenPort = 51820;
+
+      # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
+      # For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients
+      postSetup = ''
+        ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE
+      '';
+      # This undoes the above command
+      postShutdown = ''
+        ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE
+      '';
+      privateKeyFile = config.sops.secrets."wg_privkey".path;
+
+      peers = [
+        {
+          publicKey = builtins.readFile ../nixy/wg_pubkey;
+          presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path;
+          allowedIPs = ["10.100.0.6/32"];
+        }
+        {
+          publicKey = builtins.readFile ../mediabox/wg_pubkey;
+          presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path;
+          allowedIPs = ["10.100.0.5/32"];
+        }
+        {
+          publicKey = builtins.readFile ../common/wg_pubkey_workstation;
+          presharedKeyFile = config.sops.secrets."wg_preshared/workstation".path;
+          allowedIPs = ["10.100.0.4/32"];
+        }
+      ];
+    };
+  };
+
+  systemd = {
+    enableEmergencyMode = false;
+
+    watchdog = {
+      runtimeTime = "20s";
+      rebootTime = "30s";
+    };
+
+    sleep.extraConfig = ''
+      AllowSuspend=no
+      AllowHibernation=no
+    '';
+  };
+
  system.stateVersion = "22.11";
 }
--- a/magpie/hardware-configuration.nix
+++ b/magpie/hardware-configuration.nix
@@ -2,9 +2,7 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
-  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }: {
--- a/magpie/secrets/asmir_mail_pw_hash.yaml
+++ b/magpie/secrets/asmir_mail_pw_hash.yaml
@@ -8,11 +8,20 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKbTM0ZzVHZ1hlNzJ6d25a
-            eFpZMHdBZjBFSjU4L0dkK1Noby9HK29CMldNCkJWb2NmcC9jNVFBMWJOZjVBalRw
-            VVZsN3B1WGJseDFiRTA1R3cvU3c2NEEKLS0tIFI4WHFDRHBCN29IQ0tPVC9zbHZS
-            OFdsQUpvRzNKc2x1WW13b2d4R3lxdXMKJeMJ1IdxS+WUTzUlFdc4WfnUozWU4/80
-            9GBPz3VCppunrXrh1zFkfIL+Lz48HFyf7HNI4na6TkyqipR6wsW4gw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOS3RoalBRQTB5Mkp4THpa
+            aG9jS0UraEJlWHlVRFBWNWNJNGVOd0hxdUZBCm10OWwramN3UGdLUFpwbkduaU16
+            S1FWcHIrK0dKRTAvSlN4SlI3eHJJL3cKLS0tIFljS3oxWXZyRlFEVUdUYXRsc2x4
+            N1h6SFYrcTZQK1JSRWZsV2MvTGFwb0kKxRohlU6vR3CR2SGqDT9P8AxQXMSbpQuO
+            g1t6gj3c+YBugUsCMuNpYEE+8OvfSQmsZV0VHojS8dMHSD9x75237w==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2bnFpZzB2b21YVEZtenBj
+            TlkxdVlSWmM3dDNnQmxqQm5FWlQ0ZHhySGg0Cll1andBcE0yZ04zaFZlajBDSDUx
+            VHRWbFVOeE1CZmlveTB0UEpjZUpzMEEKLS0tIE5tcVFuaWt6K2RKR3FodGYra25n
+            bHNWWmh1dFdJVGtETWYvZDY1TGpvUVkKu4sO+/OXdV4xsLmOMlbV5nIidX+iREgF
+            q0IavI9nzOZ0tkWSV/9mFua8Mp1vPW8wCBOqnW3nhPvYDoTbGQEovQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-10-20T19:31:29Z"
    mac: ENC[AES256_GCM,data:xXiCems/1em6JdK3V5GcD811yc8t6iHHFmz0OOrWM3muR807Ux80TrD3uoMN8GxIMyr0AloH41k8+vxaSlMmHsGGl6o1P13aR03E+A9ZLp1W2Nb3nCy5rH4pF8WSeNMxZ1SoT2iEAtTsh29xusocQTMUvr7Ou8TDLyVvrKhBPZw=,iv:SSPpVTbVQTvhPg1qm9akrg2ji1fRcukkwX5P2FzWMb4=,tag:a6GiGWfwnKLtteVoi9DJtQ==,type:str]
--- a/magpie/secrets/borgbase_enc_key.yaml
+++ b/magpie/secrets/borgbase_enc_key.yaml
@@ -0,0 +1,30 @@
+borgbase_enc_key: ENC[AES256_GCM,data:bnSjKRY6HlmOyhjyuJLH8Xqzzpm7NgZI5g==,iv:RYlg83PqV2DIQHa5FoD6ls/utVjuSwmrv56N6Lrtn8s=,tag:hC6e9d5/EH9V7kG23XblEQ==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCdm1lejdSTm1PN1dsWHNJ
+            Nzc5aERNUlk5U0VoNWRzcVlMSXpqSEFmYkVNCkhqeHZrMng4WjEzcnBxdmtVUWlz
+            NXhiNFB6Ukc2eGRiNW96YVloQyt0ZW8KLS0tIFhjUVlITVVTcktCTzEzdUJzTmsy
+            UVhGc2VKeFJmS3RUY2YrR2FVVlVOcDAKsl+Fo16/3PpQ35aF4EBq5kjpyNxnZfip
+            1sfq1ppUfg6QRRICWtxUyXLS898BVusW8cMft6k9JbgZfQnc9YUSBg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhMTZhdm1mVXhWdlNJVytR
+            Z3ROLzNnZHUvMXRUcCtPeFFBRWJxY3lyRWljCkErdXAxc3ZETFMxd3ZCRHJPY2JU
+            N1YxL0VJZ1M0eUdEblhrTDd2VWNNRVUKLS0tIFRBTGNKUDUxaDdGK2x4aWIxMm9i
+            Zit1QTdRTjVNdjhFYklEUVlsQjZCM2cKtutM+au5vNF0x9ZP9Cg4pMUGsScIMRFU
+            KYrBHGW+VfEDpr534X8FXe1Uox70U+HPoT/mEm4RF575ssbTSoW0Hg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-04-05T19:01:07Z"
+    mac: ENC[AES256_GCM,data:Fz1ZwYR7cg+bcgNe/JZ2oEqhYihQWnCoy3J76VIPb089PNCXXp0xJ/eYjOoKlGK42z1wEO8hJ8FoaLvzuqhO0aatKpHDx0bBos8YqZYuGAuW115AdK5m6ecby7yi5lBIBpXOv1sU8uOtdBR32UPFAQ9oQf0KleWju47phF43v9o=,iv:Lbu5eLKfEnrehSY1+r0z75pZnNDNEVSmrEaJRDpDTU4=,tag:TLdtQTNbo0dxlpV9ZPm+uQ==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
--- a/magpie/secrets/borgbase_ssh_key.yaml
+++ b/magpie/secrets/borgbase_ssh_key.yaml
@@ -0,0 +1,30 @@
+borgbase_ssh_key: ENC[AES256_GCM,data:W/aAQPSaPxGPeY50arJr50OWZjN+RJt9Y4MlpPNtw3KT2y+fUuMpNAjMuGd+3mzA2bs9YpE2WlgJ7KO5XPH7M36tSI+K2pcnjX1NMl8giJ952iCsqW4siij64JguK/gUi3GAe3LXHTjr3VgubSdqVd25k0bys+GiMfsHXXGD6tinKmEheis6XgfcChrvyYgQ4DKPW4HOHC4/V6roXaK+GTe+qY0BdzM27cDHc3a85cuHAAeDnYdNfdRAItI3KmDCx8edeBwt4vonR/v9AaDRH2PjZWq583Rlqoa8TQvQi0+yWf6O6MikHQlP1GoYCe5iI+rOF6KTseDjS2aoLZ+mXNxVmmOVdZrq1vx0UpsbJWRZE+1UluQwdrEm1mLMrI4Z2wFNfzjg9rOiJ36AL1YdcXtI0RHLYp8r92Qt3IFVwcC1NT/AWJkFOGr5z0PX0w+mi4J+f1wDvVguXp2KaguB2XAJbnpgQQ2ZqYv0gTkBLZ/RAOyQgaMaESCfJBWXE3DESMOspj4AYUsjQiaxmF13,iv:ph++5hCX3DzqwCoObz73/Xn0qy/+Za5+DI/EVsc67yY=,tag:0VkALd0j3D6yA7jCE7vogg==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAydXE0RXhGU0tsbnRTU0pw
+            THZBNngvUEwwMGVTQ3dscCtKMnVCb1pSSzN3CkVzNS9UY3dqYWRDOENTaFhadFcz
+            MGlibCt5Q3ppelVQU1AyM0wvTm1zMXMKLS0tIHNGM291dE5lb2pwTDFWbWtiUFNp
+            Y1ZoSG43TFd0WktKY3lUM3Y0RHJHZVkK0/sD5M54XiQzkSMlDHPkSVMypoxdhU/f
+            0nUWA20s6IU63Oqn0j7rGwV6S5j+fZCBzF4kSi8JLJb0619G2++M5g==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiem5ZRE1oRU1hWENzc2sv
+            dkg4czhVeVNJQllnWG9vYnptL1FhZy9zc0hBClhLRzQxNlhQUEVUcnZDYlZqTWYx
+            eDQzV2ozbkd6ZWVZNWkxOXhBV0JNR00KLS0tIFQ4d29OQzhoWTl0Z3BrOURTSktU
+            SHZNdFhmS3ZQMnhzMDJWMTl4cXNudFEKhgbRW+6xqGhkTtr4h4JzPxZnGKqr4jcX
+            BABLTgzqvM+JvBzmUcYjuagVcLpWsQcNWBaYFBJBMhP8oOgF2dVBcQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-04-05T20:03:21Z"
+    mac: ENC[AES256_GCM,data:YpXUK6UNKpdudVZ+YManWreHufFzw9XbF1cBYutdAaTdqhlzPErpuOmEKLuMA7nr7SQkLK4pu1Eg0P5CA3QXsh0VUHMTiFWxNz7KZeoYAkacK9WzutEldsMG4iVlKmGHhQApSNW4kfPBKs1TgYyZdndBHEdILcoLDxke8kfkoVU=,iv:rpNeNTfXoMpScSfyrY7uK9ZkKasJGVAhgiMoe0XyJFo=,tag:Rl4Ya+iq0BvMSM/J0wySnQ==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
--- a/magpie/secrets/gitea_db.yaml
+++ b/magpie/secrets/gitea_db.yaml
@@ -8,11 +8,20 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKZ3l1UTRDMFVlM01TR1dW
-            VzNnRXpuc0R0d3BpVzZveHRrdHRTTVRXNWpnCjVqNittd3BiZ0d3YXVQUXBpWExU
-            cGdkSmVtOHJBN3FEdDVCeTVjUllHc0EKLS0tIG5TQlpIQXhNNmJiR0Y3L1p3SVpG
-            ZnlvRDRUam5MaFdZcGgyZlJSZzMvVWcKxiwENpP7qlF0Uy7DJM0WwLFQ0h+ost5T
-            BCsZtGP61Z2WcQq0EWYLqJItR2Tk3AXox014CJAm+G/G8PMTAKv0xw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUUXAraFhvN0NLeHhKWGJt
+            c2ttRGljUzZiN2ZJeWpTdVRzNCtzL0pqdHhnCmJvek9YNkF4UTd1ZEFSaDBJR1Jz
+            ZkUwTFNEYkhmbS9DVUJ0cTNrTVR5TlkKLS0tIFdscFJCaTJjYXFPcVZXUXBPS2ph
+            bERTT1dsaStRQnRvb1VnV2lTdGNQd0UK3dXTtGkfxq7oLzDrxFomE0oAjgZo+7H7
+            SVVxKy/caewOXbI3R/CHxuaYb0fDDlyIX/zqxqkSaXUIh4rsIT46xw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCOFFtQUptR2xIcW5FS3JR
+            aUdLbGRJeU4rbFFVcU9HVVdYL293WXY0L3hvCmpPN1BnRDlZNDhOT25zVFRjaGE1
+            TThWQUVDOG5YOGtlRmU1T1pZZ1dxTHcKLS0tIHZSUTBDbFN5eXZPMHZvZ2UwMFJu
+            cjhmWGJIUEhZQjNXN3J6ZTk1aE1jZHMKjiwLd6gHiLJx63AIzM17C3RaEBbCFIyI
+            ppLWEw8cm53hvjCuxsY8jJ/5kHD+25Pw2NMAD5PKt8SjrJzrJcOtMA==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-10-17T21:16:10Z"
    mac: ENC[AES256_GCM,data:EPiLv8IzVXqRan9UlBuA3TmxtB3f4Qj4owed+1Pat9Tih1yOe4Z9RT28JIYJQ70R/IK+Yi0NQem9Ec6HU+8kaxLE3fff/4PM+B9QQbB6fjgLFod/nFk+OuWgR7FTcJ2j16OnlxE5ikCP+qdfvAM0eEv+BoDrWv98gSyCXtMCe48=,iv:th0E7zioz7gtgMlns8kvnf5hmlRH0KX65wPxBi3YP6Y=,tag:JhoGvF8LJmrAQpUOEopohA==,type:str]
--- a/magpie/secrets/gitea_mail_pw_hash.yaml
+++ b/magpie/secrets/gitea_mail_pw_hash.yaml
@@ -8,11 +8,20 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCT2VyNWxUeUZ5aDdHcXJR
-            WGJVOGgyeC83MEV4REpGZkRUcVJKZDBqYmtjCllQdFhyRWNiTURYQmpucndFWDlr
-            WUFybGtmckNBdXYzMVZxT3lQM1k3aTgKLS0tIEpNZjU1RkpSOVo3Y1ovR0lmbHJu
-            bENVWmpCcTVqMDh2Wjhob2I2VzRRblkKPGCV1gRyihDCStM4tmvp89d996v1UzdJ
-            /NyK49//+uJJqwCEWuvHWWCB+EbkkOE6gPPKXZyXZSTbb/TDDcVF/Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrL2YxU2VhNTArQ0QwYzlU
+            Z0NSRm5KRU8xRmZCT1E1N09KY2Vob0lsQ2k0CktqTlZnaUVNaEhpT3BkOGNmN2cv
+            Z0JoaFFTTzBwNzVmcHNOeXdwVzdQOTQKLS0tIDluazF6RXA0MVYvY2dRRGkxMGRk
+            UEltOVNQdElpRGJVVlpoTVV2bU5rSncKoSGq75dVH7j/hSnqdjgWJyDgg0doEr6K
+            anD9sghKSX0afZmVJFOCXZ+lRYi7kmRbqFNBkkuuFndERtbN/5foXw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByNW9UcERVditoUE1DVUsw
+            WmxtbVNHeVpQS0g2WENJWTVJeHNUMU4yZEVNCnNrSnFnU2hUckxlYjJMYk5CTW9j
+            eU9mU1F4WlY1NWdLU0VxaDVtZWduaXcKLS0tIExtRHJkbFBKTWRjSGZOWGc1U0FF
+            ZjJkY0FpQnhCazVVVG1DOUZsQ2lXYzgK3UWDBu/Aq7n6CQiRF4NOQdSD4nfU2Gm2
+            Tlzyou5rj/rSAv5J7ENsDAzKtK6e5+Xe7acUDY+4Rye82vDxyoblaQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-10-14T21:21:12Z"
    mac: ENC[AES256_GCM,data:NE9btXZKE3KJmxtWc0Ytb0atfBJKRs5T+Xk9RDFX6veSGBoB+M2+YMCONQdr8T2w6lLJqlrMBHqlfuvD3YnDj041xZmfSsi9NACliWj6GWVWcFWWc6W9OVH8/5CfwjYBdgTJ2o7wdnF9fYHvwMRcaHThDmoUkaExVtVsyu912og=,iv:kyekfEq32GSKVNKy8MJYfT5ZMKNSRQUk1viB2W6k29U=,tag:7ie/2P/F3bPQXpkWGKqTfA==,type:str]
--- a/magpie/secrets/miniflux.yaml
+++ b/magpie/secrets/miniflux.yaml
@@ -8,11 +8,20 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpZ1d3aGhud0UyOVV6Vzcw
-            Q3Q2OVRQOEpXUk1TK2dOOEZtKzNlUkJGZHh3CmJwYnRpWFhJWHZXQ2I1TnhKWDRx
-            MGlrbXJoQTVPcUFBa0gvME95OVlxWkEKLS0tIHNZWWRwWUJPV3o3REpENzdMYkVk
-            Y1V5SXhCUllDWGhjK3JzWDRKQU9hMmMKuVmn6OAy2q/mpBKqUhl1qfpnPvFOd72c
-            /jMqnxClGSVXjJ5qdvcXCfLeYwT8vnhViNZmjE1ebRosE5YupvrjUg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0K0ZNSWEweUNTbm5KZE5y
+            M3ZlbTdBc1RheHFNbGpxZllRdi9tMXVJaEFJCmdQdWh6cks5L3JFclJYWmlkYmVv
+            WDA2YXhiN3ovL1V0ZlJjbmluSm5tbGMKLS0tIG1QRnoxMHBQeGtLekRSRVVMNWdP
+            R1BuNDZVNzNaTmVvZm9EMy9ld0V4U1UKFjPcFiuhjwCChJKGQbIPFsHwl9oE7S+g
+            Utne4LrODAa3wj8TX3vgfRTBrljJmt+OwQJxRfTtq2ocyzR9rNUI+w==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVNFAvaUlyeHA3Mnluam1G
+            dmtIWHU2R2pRV2E3NTVKV1NOTHRSYjVhQVRVCnR4OENHZGYzVE9UdlJBTjdxblIz
+            Q0MxN3gyeTJhNTdORFk0SDdycVFrWjAKLS0tIEc5c0RMNjdLSTNKWExsVmlQUGx5
+            RFp0dWJXOVVvSGlhZ1pPbGRBWmt2S0UKTwkFwYaTr5jNuQTlqR/1ud8ITKGIbNiM
+            myAf39EHCP6cQQ0fjtx2ihy56m9xoK35Aj7h3w0fadONWtCNnhuH2A==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-10-13T11:17:33Z"
    mac: ENC[AES256_GCM,data:CpzC0H2Rfvl7F9tXCJ0WwkhE4Ba7eOIl1QMh1DHP8YQ9rChzAE8S5SXXuJA0jcmVY6NPfZ7zl8VEBepE+LHCq2UdSkAefawLeM6HwNfedP8N+zheqlyCZ8Os48628aHYN0PVI+/dMvpWWcfl+CFaH1mm4c+KYedCIsS9ZEYi9N8=,iv:EbF58pxbtHxPTAgs4dbZ31qyRT3QJ1kQoUShbLE11FY=,tag:FNF/OzS2SL3FweFw0RcRLQ==,type:str]
--- a/magpie/secrets/nextcloud_admin.yaml
+++ b/magpie/secrets/nextcloud_admin.yaml
@@ -8,11 +8,20 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrUnQ3SDAyRTUxUDF0dDhY
-            K3JmQWlYRVJtdEFac0J4U0RGKzZGNXJmUEg4CmtBSW9yNGZScXhKdnhZWkxIamFW
-            YXEzbGhwR2F3dDJGdzljZUZBeERhU1kKLS0tIGlXZUhsdnI4ell5R3ZZbjZ0NCtO
-            TUpkZmxBNzZ1UUY1dGRud2hycGUyZW8KFUGikaFQjFfmn068qex2tpGbRHIbmS3l
-            27lqo8+eRFnq0nw8H/1yRMi8IghR0+XK68T49hlt0VLS9LZJG1aPag==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHYVVnM0xOVzJ5OFZsYlZL
+            SThvVkNBdzJoVkZ3ZFBMYVlTNjQwNUxuaVFjCjBhUFRSaGZ6TEh4ellSdS9Uc3FP
+            cGJaanNUci9JMDZISXljM1lSREZaZGcKLS0tIFhJOGVIM3Bub3J0WWVMNDlqY3da
+            RmVCdEpoUjJGTDYzczNnOWRRTTE3WmcKnRV787F3yBJgSDEhHW1+sAFcyvH+OMQf
+            N7er4Wd9Tqi3IJ/lR2Z7Gwn1Dfm5kMHk+hxzPlmdpaGr42ZJNPmNVw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCZmFFRXU5NnlGRit6K1ov
+            TmR0K05uY2hva3liaDdGNmhST3dWTGdZb1EwCkpsQ3o1ZWloaUdFR3NpbS9uKzE5
+            S0ZRRmkxbkJnMFN6SzhzUFo1M3NnTnMKLS0tIE84aFdJS3E4eWw3SG1JeXJwRWd2
+            RWp5ZUtUNzJ4OWswWmhXWjRkZkpzWEUKj23XymHvh+nh3HiPD+erv2GZNNpUZKp6
+            s0KJSkGuIuILf3kfgp23jXNSFLMEtWwlSh5EP02g2EIHzUg2kLKNpQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-10-17T23:08:24Z"
    mac: ENC[AES256_GCM,data:fb9cOL4Q+q5uarmXtXNlpRmWgv/Ao1MqwwH2V2CQxEiP8zFyFBZs2435vdcLzrQrnBXz0JLVu4g10SH2T4dpYFP42teIkrgmneecjjcM+UOsBsGsrxlpHMha1t/ERRhBA7uJze5/kwHqry6eruWehRTu65QF1qBTql3m6ipjCeY=,iv:a7aFuTCcRCIDERlrj/9dFCF7VgCDDakfPteQimHV3lc=,tag:4mwrDHaQWA4EU0AgtgZaMg==,type:str]
--- a/magpie/secrets/wg_privkey.yaml
+++ b/magpie/secrets/wg_privkey.yaml
@@ -0,0 +1,30 @@
+wg_privkey: ENC[AES256_GCM,data:TnUTZheznQqnyK59qdLmAcuVr9JICWlNVtPF1qRMDPbBblD0ALn10qbEC7M=,iv:83fum5iYUrw08XJ0s7RE+/WDGeVjVswPlptzQjWOjeQ=,tag:YhQlmilbnrpRxcUb6rzfHg==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJUFplcGZMWGhrS2NsRUZF
+            WnltcCsvS0VaV29RbTdDK1UveDJwdlBXbTBJCkVaekVUWFVSVkZ5UjUwaWMxU3h0
+            eEtOQUR2VkF6RUtLYVBNalJPV3YzWWsKLS0tIDNGek4veStoa011VUV2Z3ZSUVpq
+            ZWlYQ2x6a3ROdlYzc3E1WjRhN3F1QUUKwaJruHMCoWtgvep0fI00helDZh8WVrsh
+            MV5IaEH5xapid5HHw9bLkjeeVKcT1fo7LCovouv+G5NTjvVzsMyLhw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlRWdQeWxUUlJaRndzcVln
+            ck5USkpzdDJpSWJTNDZJWVBMQnl0QnVvTDF3Clg2SEY3eDdqS0Y5ei8vUlk0dTli
+            bTYycFYyMjcxdmtpc1IybXBxN2RORm8KLS0tIHlHaEJLMnRTQ20yN2RrRnNqMzk0
+            ZVlSb1FHVVJhb0IyaHJiQlpHRjNyMDAKNQ8VzdC3s43YcZk6UQjyA1GX69x/znhE
+            ZaFkMfNX6CgxfjKRW2rhXrJi+txdhmQ0CfpfWDr3zp3XVuMq942M1Q==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-04-04T19:04:00Z"
+    mac: ENC[AES256_GCM,data:qYNlokRd1lQnOwNNVbV4PwdYeybIRNrxDKX4RPfHJxvQGHBmISzd52JCnCe7zJ14FP/bSNhQqfuxyjdxid/DVPUvkHP+HlaKUR0SLv6c91ORDoaMRC93hrPXypRGplFSbSjnd3dME43ll3oH8fLe4lP9z9KhGS2lRMdduptfWvg=,iv:/j6OOT1dK94vrPOk1Lbcca8KeWvoD+ZaHoH6nMMo0y8=,tag:syHuBVkhOCJ8JCONKkqFkg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
--- a/magpie/wg_pubkey
+++ b/magpie/wg_pubkey
@@ -0,0 +1 @@
+xhjJdIXtTBNhtSoehsi6p+znIgOfMRetl5/wtnMxJGk=
--- a/mediabox/configuration.nix
+++ b/mediabox/configuration.nix
@@ -4,9 +4,9 @@
 {
  config,
  pkgs,
-  lib,
-  sops-nix,
  zremap,
+  system,
+  nvim,
  ...
 }: {
  imports = [];
@@ -22,21 +22,46 @@
    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.nixUnstable;
+    package = pkgs.nixVersions.latest;
    settings = {
      experimental-features = ["nix-command" "flakes"];
    };
  };

  boot = {
-    initrd.compressor = "zstd";
+    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;
@@ -45,6 +70,7 @@
    readOnlyNixStore = true;
    supportedFilesystems = ["btrfs"];
    tmp.useTmpfs = true;
+    tmp.tmpfsSize = "80%";
  };

  security = {
@@ -63,7 +89,7 @@
  networking = {
    firewall = {
      enable = true;
-      allowedTCPPorts = [80 443];
+      allowedTCPPorts = [80 443 51820];
    };

    hostName = "mediabox";
@@ -83,11 +109,28 @@
      192.168.88.1   router.lan
      192.168.88.231 workstation.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 = {
@@ -130,7 +173,7 @@
        serviceConfig.Nice = -20;
        script = ''
          sleep 1
-          ${zremap.defaultPackage.x86_64-linux}/bin/zremap \
+          ${zremap.defaultPackage.${system}}/bin/zremap \
          /dev/input/by-path/platform-i8042-serio-0-event-kbd
        '';
      };
@@ -169,7 +212,6 @@
    fwupd.enable = true;
    ntp.enable = true;
    openssh.enable = true;
-    restya-board.enable = false;
    thinkfan.enable = false;

    xrdp = {
@@ -397,6 +439,9 @@
    isNormalUser = true;
    shell = pkgs.zsh;
    extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
+    openssh.authorizedKeys.keys = [
+      (builtins.readFile ../nixy/ssh_pubkey)
+    ];
  };

  users.users.ado = {
--- a/mediabox/hardware-configuration.nix
+++ b/mediabox/hardware-configuration.nix
@@ -2,9 +2,7 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
-  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }: {
--- a/mediabox/secrets/peerix.yaml
+++ b/mediabox/secrets/peerix.yaml
@@ -6,32 +6,23 @@ sops:
    azure_kv: []
    hc_vault: []
    age:
-        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+        - recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwMkdLVEFQMVk1allhK2hL
-            NXFXc254SmhxK0lFWTd1SUorUGQ0VEJPcXo4ClNYSkhJbnVjUjdFOGtoWFV2VWZC
-            NmpaRDVhWnRQUmVDWS9WU2pTVlBEQ1EKLS0tIFAydU9aYXJnd1NnRzU2YXpXM1Vq
-            VWhhbkZTT1kwTEl5VEVWR1A2aW5OUDgKiYcj5Yo42RjQeo1UeUTBV8YBNYL8ccLW
-            bQ1655MU/q3LQh14lqwbsOfmGjPc9H0ECltm+V+kNPTRi76qFhcodg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Zmc0c1AxMVEzdi94L0Nh
+            dHJFSHVSbG1vay9NUDBEVkM4ZWNoT3h4Q1c0CkhWdWVzTEJxZENZYXVFT2RhV3pT
+            aDZIUUdWVUVRUDc4ZEFDTkdnaDJxdVkKLS0tIDd6TE56REdjRVdtSXB1dkJrVVNj
+            dUxhRnB4dVFRam9xNlFiY2VOSXpNamcKNzRghHeyPtltKH4GkJQ0ef4apr5gziq9
+            dhXy6Qil48QJd4hnyr7GW1n7eRIq24OWO3WglLbVAUSQr/gzM2TWiA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1eGJCRlhHbk1JQWl2RllZ
-            R3hkVGtIamJzZlVLazUrVEJnNmU3Z0tLMG5RClp2Z01Fc1p5QzFhUWNzU2NpU0Zo
-            aTRPMFhPYlA4VmZNUWFsWHZRMUxyaTQKLS0tIG51TW9JRW12RzVmdWpZY3FaVnBR
-            UTZ2YWdQVjRTTUxPUWVwbHI4aklITmMKZQnfJs01D4FX+MF6oU0FmWYQ4reB/X/k
-            Lat8FrqerqaCYqYmAKe3HWBR6HEVm0U7I7jkVuoROMqz3uci+5HWbQ==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrNTNhaFVzaWFoTU9GdEZD
-            Z0JWQlFXc3N3SnAwR09YUmIxZlpvNllmU2tnCkFtVlRXMGV2d1V4S0ZxNlRiVzlC
-            N3dHSFM2eG02UVQrdGR0SnhUMitvelkKLS0tIFpvQUlIZ05HK3F0a2FkKy9EOURY
-            YzUwa2s0eTliSmxtajdjYmFsOSs2T1kKg08c1uB0swRSo0R6s6hup5JBfkrCKoxf
-            SjwBAZtjNhr3hrLy1eoo/dpYG6oAkEs3GvaaZ02ldT872dxZvg6r+g==
+            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]
--- a/mediabox/secrets/wg_privkey.yaml
+++ b/mediabox/secrets/wg_privkey.yaml
@@ -0,0 +1,30 @@
+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
@@ -0,0 +1 @@
+S+tL/pTm4D7bsWj/dhpPXHYxcye/DuNMguLD5l1ACEU=
--- a/nixy/configuration.nix
+++ b/nixy/configuration.nix
@@ -1,9 +1,9 @@
 {
  config,
-  pkgs,
-  lib,
  nix-xilinx,
-  sops-nix,
+  nvim,
+  pkgs,
+  system,
  zremap,
  ...
 }: {
@@ -11,20 +11,54 @@

  system.stateVersion = "23.05";
  system.autoUpgrade.enable = false;
+  system.switch = {
+    enable = false;
+    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 = {
+    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.akill.name;
+      };
+
+      "borgbase_ssh_key" = {
+        sopsFile = ./secrets/borgbase_ssh_key.yaml;
+        owner = config.users.users.akill.name;
+      };
+    };
  };

  nix = {
    optimise.automatic = true;
    gc.automatic = true;
    gc.options = "--delete-older-than 7d";
-    package = pkgs.nixUnstable;
+    package = pkgs.nixVersions.latest;
    settings = {
      sandbox = true;
      experimental-features = ["nix-command" "flakes"];
@@ -32,12 +66,17 @@
  };

  boot = {
-    extraModulePackages = with config.boot.kernelPackages; [usbip];
+    extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
    initrd.compressor = "zstd";
-    initrd.kernelModules = ["amdgpu"];
+    initrd.kernelModules = [];
+    initrd.systemd.enable = true;
    binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
    kernelPackages = pkgs.linuxPackages_latest;
    kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
+    kernel.sysctl = {
+      "net.core.default_qdisc" = "fq";
+      "net.ipv4.tcp_congestion_control" = "bbr";
+    };
    loader.efi.canTouchEfiVariables = true;
    loader.systemd-boot = {
      editor = false;
@@ -45,7 +84,7 @@
      memtest86.enable = true;
    };
    readOnlyNixStore = true;
-    supportedFilesystems = ["btrfs"];
+    supportedFilesystems = ["f2fs" "xfs"];
    tmp.useTmpfs = true;
  };

@@ -70,7 +109,7 @@
  networking = {
    firewall = {
      enable = true;
-      allowedTCPPorts = [80 443];
+      allowedTCPPorts = [80 443 51820 8020];
    };

    hostName = "nixy";
@@ -84,6 +123,7 @@
      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 = {
@@ -101,13 +141,47 @@
        };
      };
    };
+
+    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 = [nix-xilinx.overlay];
+  nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
  environment = {
+    etc = {
+      "firejail/qutebrowser.local".text = ''
+        whitelist ''${RUNUSER}/qutebrowser
+      '';
+    };
    extraInit = ''
      unset -v SSH_ASKPASS
    '';
@@ -118,10 +192,20 @@
  };

  programs = {
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = false;
+      localNetworkGameTransfers.openFirewall = true;
+    };
    gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
    };
+    appimage = {
+      enable = true;
+      binfmt = true;
+    };
    zsh.enable = true;
    firejail.enable = true;
    adb.enable = true;
@@ -129,19 +213,119 @@
    sway.enable = true;
  };

+  documentation.dev.enable = true;
+
  # List services that you want to enable:
  systemd = {
    services = {
-      "zremap" = {
-        description = "Intercepts keyboard udev events";
-        wants = ["systemd-udevd.service"];
-        wantedBy = ["multi-user.target"];
+      "zremap@" = {
+        enable = true;
+        restartIfChanged = true;
        serviceConfig.Nice = -20;
-        script = ''
-          sleep 1
-          ${zremap.defaultPackage.x86_64-linux}/bin/zremap \
-          /dev/input/by-path/platform-i8042-serio-0-event-kbd
-        '';
+        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-proxy2_proton.service"];
+        after = ["netns@wg.service"];
+        before = ["dnscrypt-proxy2_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-proxy2_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-proxy2.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"
+          ];
+        };
      };
    };

@@ -153,8 +337,8 @@

  services = {
    acpid.enable = true;
-    btrfs.autoScrub.enable = true;
    dbus.enable = true;
+    dbus.implementation = "broker";
    fstrim.enable = true;
    fwupd.enable = true;
    ntp.enable = true;
@@ -168,21 +352,26 @@
      pulse.enable = true;
    };

+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
+    libinput.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;
+      windowManager.i3.enable = false;
    };

    udev = {
-      packages = [pkgs.rtl-sdr pkgs.openhantek6022];
+      packages = [pkgs.openhantek6022 pkgs.openocd];
      extraRules = ''
        #Xilinx FTDI
        ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
@@ -190,6 +379,12 @@
        #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"
      '';
    };

@@ -197,6 +392,12 @@
      enable = true;
    };

+    batteryNotifier = {
+      enable = true;
+      notifyCapacity = 20;
+      suspendCapacity = 10;
+    };
+
    actkbd = {
      enable = true;
      bindings = [
@@ -237,18 +438,49 @@
      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-proxy2/public-resolvers.md";
+          cache_file = "public-resolvers.md";
          minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
        };
      };
    };

+    borgbackup.jobs."borgbase" = let
+      user = config.users.users.akill;
+      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";
@@ -261,6 +493,23 @@
    logind.extraConfig = ''
      KillUserProcesses=yes
    '';
+
+    seafile = {
+      enable = false;
+      initialAdminPassword = "admin";
+      adminEmail = "asmir.abdulahovic@gmail.com";
+      ccnetSettings = {
+        General = {
+          SERVICE_URL = "http://127.0.0.1:8020";
+        };
+      };
+      seafileSettings = {
+        fileserver = {
+          host = "0.0.0.0";
+          port = 8082;
+        };
+      };
+    };
  };

  fonts = {
@@ -278,27 +527,29 @@
      dina-font
      fira-code
      fira-code-symbols
-      font-awesome
-      font-awesome_4
+      font-awesome_6
      inconsolata
      iosevka
      jetbrains-mono
      liberation_ttf
+      libertine
      noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
+      noto-fonts-color-emoji
      noto-fonts-emoji
      proggyfonts
      siji
      terminus_font
      terminus_font_ttf
      ubuntu_font_family
+      vistafonts
    ];
  };

  virtualisation = {
+  spiceUSBRedirection.enable = true;
    containers.storage.settings = {
      storage = {
-        driver = "btrfs";
        graphroot = "/var/lib/containers/storage";
        runroot = "/run/containers/storage";
      };
@@ -310,8 +561,6 @@
    };
  };

-  sound.enable = true;
-
  hardware = {
    bluetooth = {
      enable = true;
@@ -322,12 +571,11 @@
      };
    };

-    opengl = {
+    graphics = {
      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
-      extraPackages = with pkgs; [];
+      extraPackages = [];
    };
+    rtl-sdr.enable = true;
  };

  zramSwap = {
--- a/nixy/hardware-configuration.nix
+++ b/nixy/hardware-configuration.nix
@@ -1,78 +1,44 @@
 # 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, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];

-  boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd" "amdgpu"];
-  boot.extraModulePackages = [];
+  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/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-    fsType = "btrfs";
-    options = ["subvol=root" "compress=lzo" "noatime"];
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
+      fsType = "xfs";
+    };

-  boot.initrd.luks.devices."sys_enc".device = "/dev/disk/by-uuid/682d030d-189e-4b47-a60a-62cf1f3729d3";
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
+      fsType = "xfs";
+    };

-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-    fsType = "btrfs";
-    options = ["subvol=home" "compress=lzo" "noatime"];
-  };
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
+      fsType = "xfs";
+    };

-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-    fsType = "btrfs";
-    options = ["subvol=nix" "compress=lzo" "noatime"];
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/828E-F3C3";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };

-  fileSystems."/persist" = {
-    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-    fsType = "btrfs";
-    options = ["subvol=persist" "compress=lzo" "noatime"];
-  };
+  swapDevices = [ ];

-  fileSystems."/var/log" = {
-    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-    fsType = "btrfs";
-    options = ["subvol=log" "compress=lzo" "noatime"];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/3F3E-9833";
-    fsType = "vfat";
-  };
-
-  fileSystems."/opt/xilinx" = {
-    device = "/dev/disk/by-uuid/f5c27ef2-8053-4d96-9f8f-c6a50d6193b9";
-    fsType = "erofs";
-  };
-
-  swapDevices = [
-    /*
-    {
-       device = "/dev/disk/by-uuid/ee1792c9-098b-40c1-b760-20def16ba67f";
-       encrypted = {
-         enable = true;
-         keyFile = "/mnt-root/swap.key";
-         label = "swap_encr";
-         blkDev = "/dev/disk/by-uuid/aee12e27-b45a-4291-be78-db0a903071b3";
-       };
-     }
-    */
-  ];
-
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  nix.settings.max-jobs = lib.mkDefault 8;
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixy/secrets/borgbase_enc_key.yaml
+++ b/nixy/secrets/borgbase_enc_key.yaml
@@ -0,0 +1,21 @@
+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
@@ -0,0 +1,21 @@
+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,31 +1,22 @@
 peerix:
-    private: ENC[AES256_GCM,data:767u5KKjk2lMr70vtBvX06t8n/1r5xpCrRNKc9QvypJmbPS+vS8vij8JYJZDKKFBh5xUazSLQC1ga2mpb+hEO2rgD0Aa70p22wwfOP+qCJQNYwlEf0MLWhlblTCE9Cr/eQSX7g==,iv:tPEB4NWbLMvzrUIvosj9PfinMhdWNBu5btjElvbDzxg=,tag:wzxaBzW0R6HKCyP5zlMPRw==,type:str]
+    private: ENC[AES256_GCM,data:Oi8H5nqJ0Bf45wQepCjdZNHBOv4AlPxNN7L5Th3gcRQlW1FS77nusIWGSUvlmL2a5LTN0FV36o2GFPrrhiwmvnkQwuSZKc9VeDTf7SX0RRL1NLmRR/zy4WsRNJFxlqtjahieqg==,iv:6hJwqcdPayZaYZhJ0OfYLAtmeVndLEfeYZjUq5/3qJE=,tag:MiAfg8aZAHNYbB0JwcdStg==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
-        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRbi9uTGVPYlhYYWdFb25u
-            SGhSUm9rNmEzSkNVUEVIOGNLb1Z3VFdjNERFCjVEYXlXTlRCV2dLMW1VMWgzcXBR
-            OWxSOUZjZ2VCTzRycDhZRGRXWS9KRTAKLS0tIG8yMkZNeFRtdHVPTTJOM2tRSk5F
-            OXp3Wmh0b1lYQnJBWlMxeGZaZXdnY2MKftJPaUc9sDM8YmvUo1eVDNXWX4scr1rH
-            SMAod/Oq0BvQfyGIpvVBfL5T7RxlF1DwOedg/p3PSfMPjok7QLyv+A==
-            -----END AGE ENCRYPTED FILE-----
        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdU9WSjZkWUd6NXFpdXNp
-            R2huUXZQOGZzb0Z0ekN2WkdRdEFJYk54RmhnCmo0ampNK01VR3lQM0RGYWlNQ3cx
-            Rk1BK1lIUHJPZ2R5YVd6RTlYbXJDVWcKLS0tIGV0Yy8ySnFMQ25PQUNBL3dPdmc3
-            WjhldWNVL0h6T1lUSEdXeHFQemRBVEEKJzh1HExRoy/iyTtBNaVdNgolWyFHaaLV
-            VTDZYEHq+eEIrVAG5xefG/nPpj2K6FRItA6+4PcKtyARG+gKYwp2tw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMEIyck1xbVJ4Zm56Z3dM
+            OGsxa1p0TGIvRE5DYXZzTDM3YUZFVTAxbUUwCllPd0FOUlRiZW5wT2QvLzZXYjRr
+            S1A5WjZxLzNYQ1ZWVFFQTzRwMFQweFEKLS0tIHNoZUpHS2dDNmFKc3ZVNFZuUFU4
+            L0M0MitMeDg1ZWYxcDNCQlVGUjRKeFkKvD2SKnuh517o2knPr2SOWq3kubMyI7UV
+            j6HgXVbHUDjmKl2dY+YVTnmxrK54E+Q6iiu7mQnvLdzxYBK/EiNt9w==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-07-28T11:55:00Z"
-    mac: ENC[AES256_GCM,data:ieNyjQlo1tQ8qxFMyIN5XGgUiclYIfJe6WUyWiR3qJKKOTnx5MBWNUuHfUMkpm2ToNpaxiDUih2Hhqv5S0Bq1zoExMLjqE36GgaOivha6DeoQn5+WH8bMdMAoc1PlCQkj6Fxw2sdZlrIKcswADk4MfDzdaY/vKoQ5AtK5Bdkgok=,iv:JaOfWEwbLhOTquQVIG6Ll38jkGOCzbtD8h5c7SOAzik=,tag:m4Fmor24Q9GDoe7nu2VnEA==,type:str]
+    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.7.3
+    version: 3.8.1
--- a/nixy/secrets/wg_preshared.yaml
+++ b/nixy/secrets/wg_preshared.yaml
@@ -0,0 +1,21 @@
+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
@@ -0,0 +1,21 @@
+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
@@ -0,0 +1,22 @@
+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
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMPNCxE/8z02lVOC1unJbPMH+Ma+KRJfmz33oUfz3hKc root@nixy
--- a/nixy/wg_pubkey
+++ b/nixy/wg_pubkey
@@ -0,0 +1 @@
+oHVmhw80daHjDjo7nwt/Y9eKBaH5FoTiVeukwDObijM=
--- a/nixy/wg_pubkey_nx
+++ b/nixy/wg_pubkey_nx
@@ -0,0 +1 @@
+eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=
--- a/packages/viber/default.nix
+++ b/packages/viber/default.nix
@@ -44,12 +44,12 @@
 }:
 stdenv.mkDerivation {
  pname = "viber";
-  version = "21.0.0.1";
+  version = "23.2.0.3";

  src = fetchurl {
    # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb
    url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
-    sha256 = "0q34mwbk0i2vj2f16hk7pyshl8fqwym3lyr7iss22qw8cxx3mcg3";
+    hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM=";
  };

  nativeBuildInputs = [makeWrapper];
--- a/packages/zapzap/.nixd.json
+++ b/packages/zapzap/.nixd.json
@@ -1 +0,0 @@
-../../.nixd.json
--- a/packages/zapzap/default.nix
+++ b/packages/zapzap/default.nix
@@ -1,23 +0,0 @@
-{pkgs}:
-pkgs.python3Packages.buildPythonPackage {
-  name = "zapzap";
-  src = pkgs.fetchFromGitHub {
-    owner = "zapzap-linux";
-    repo = "zapzap";
-    rev = "5de4a4015128c164af3c964ecbe5b6358d98b521";
-    hash = "sha256-bd3YcITK4lraOu7D/xZfnibilAZQZWqazVVtUwqJ4wc=";
-  };
-  dontWrapQtApps = true;
-  propagatedBuildInputs = with pkgs.python3Packages; [pyqt6-webengine qt6.qtwayland qt6.qtsvg];
-  nativeBuildInputs = with pkgs; [qt6.wrapQtAppsHook makeWrapper];
-  env = {
-    HOME = "/tmp";
-  };
-  preFixup = ''
-    makeWrapperArgs+=(
-      # Force the app to use QT_PLUGIN_PATH values from wrapper
-      --unset QT_PLUGIN_PATH
-      "''${qtWrapperArgs[@]}"
-    )
-  '';
-}
				`@@ -0,0 +1 @@`
				`g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=`
				`@@ -0,0 +1 @@`
				`kbmzzQc3bBpkjE7K/ohycZtx+ml+dzVYOQ2xM0/bzzQ=`
				`@@ -0,0 +1 @@`
				`xhjJdIXtTBNhtSoehsi6p+znIgOfMRetl5/wtnMxJGk=`
				`@@ -0,0 +1 @@`
				`S+tL/pTm4D7bsWj/dhpPXHYxcye/DuNMguLD5l1ACEU=`
				`@@ -0,0 +1 @@`
				`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMPNCxE/8z02lVOC1unJbPMH+Ma+KRJfmz33oUfz3hKc root@nixy`
				`@@ -0,0 +1 @@`
				`oHVmhw80daHjDjo7nwt/Y9eKBaH5FoTiVeukwDObijM=`
				`@@ -0,0 +1 @@`
				`eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=`