flake: update nvim

magpie/nfs: disable nfs
magpie/ssh: change auth pubkey
2024-04-17 22:28:58 +02:00 · 2024-04-17 22:28:19 +02:00 · 2024-04-17 22:27:10 +02:00
38 changed files with 552 additions and 817 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,30 +0,0 @@
-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
@@ -13,7 +13,7 @@
    optimise.automatic = true;
    gc.automatic = true;
    gc.options = "--delete-older-than 7d";
-    package = pkgs.nixVersions.latest;
+    package = pkgs.nixUnstable;
    settings.experimental-features = ["nix-command" "flakes"];
  };

--- a/common/packages.nix
+++ b/common/packages.nix
@@ -8,39 +8,29 @@
    [
      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-vim
      interception-tools
-      iw
      jq
      lm_sensors
-      man-pages
-      man-pages-posix
      meson
      mosh
      msmtp
@@ -53,7 +43,6 @@
      ntfs3g
      ntfsprogs
      nvim
-      nvme-cli
      openhantek6022
      optipng
      pax-utils
@@ -66,7 +55,6 @@
      rsync
      silver-searcher
      socat
-      sops
      sshfs
      strace
      swaylock
@@ -87,7 +75,6 @@
      wirelesstools
      wol
      xdg-utils
-      xfsprogs
      zip
      z-lua
    ]
--- a/common/secrets/wg_preshared.yaml
+++ b/common/secrets/wg_preshared.yaml
@@ -1,42 +0,0 @@
-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
@@ -1 +0,0 @@
-g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=
--- a/common/wg_pubkey_workstation
+++ b/common/wg_pubkey_workstation
@@ -1 +0,0 @@
-kbmzzQc3bBpkjE7K/ohycZtx+ml+dzVYOQ2xM0/bzzQ=
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1732722421,
-        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@@ -33,6 +33,22 @@
      }
    },
    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
      "flake": false,
      "locked": {
        "lastModified": 1673956053,
@@ -48,7 +64,7 @@
        "type": "github"
      }
    },
-    "flake-compat_3": {
+    "flake-compat_4": {
      "flake": false,
      "locked": {
        "lastModified": 1696426674,
@@ -64,6 +80,39 @@
        "type": "github"
      }
    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1701473968,
+        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-root": {
+      "locked": {
+        "lastModified": 1692742795,
+        "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=",
+        "owner": "srid",
+        "repo": "flake-root",
+        "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "flake-root",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
@@ -82,6 +131,30 @@
        "type": "github"
      }
    },
+    "goatcounter": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
+        "flake-root": "flake-root",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1705880453,
+        "narHash": "sha256-Y1O6tia2Pc1MA5ZoFH3B2y7FwjZuIDiNT4C9+bBawrY=",
+        "owner": "asmir-abdulahovic",
+        "repo": "goatcounter-flake",
+        "rev": "f912ab7024cbc47d5fa80a416b643707a9b50b06",
+        "type": "github"
+      },
+      "original": {
+        "owner": "asmir-abdulahovic",
+        "repo": "goatcounter-flake",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -89,11 +162,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730016908,
-        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
+        "lastModified": 1711868868,
+        "narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e83414058edd339148dc142a8437edb9450574c8",
+        "rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab",
        "type": "github"
      },
      "original": {
@@ -104,17 +177,17 @@
    },
    "nix-xilinx": {
      "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1732892167,
-        "narHash": "sha256-AZ0rgM9xj+Bf2C8RfGMUvuVdcqkvQU5/Wm8u6A5xYJg=",
+        "lastModified": 1699035130,
+        "narHash": "sha256-emK4aJCC2gW94b2P3N2LjkQ6PEMLUcDduVWwYQ7aq+o=",
        "owner": "asmir.abdulahovic",
        "repo": "nix-xilinx",
-        "rev": "3071f40914fe2db3837a40a72a97af6f0a442f16",
+        "rev": "0323990db46c32e361e4fd70600d859eb90862af",
        "type": "gitlab"
      },
      "original": {
@@ -125,47 +198,50 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1732981179,
-        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
+        "lastModified": 1711703276,
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs-24_05": {
+    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1717144377,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "dir": "lib",
+        "lastModified": 1701253981,
+        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
        "type": "github"
      },
      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.05",
-        "type": "indirect"
+        "dir": "lib",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1729973466,
-        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+        "lastModified": 1711819797,
+        "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
+        "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-24.05",
+        "ref": "release-23.11",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -177,11 +253,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733261583,
-        "narHash": "sha256-HOVUtrhtJ16umPuEODuVE9fx+JmDCRp7wIxnEART0Eg=",
+        "lastModified": 1712935714,
+        "narHash": "sha256-zGo9wiDH+qn4Mky70CJEvST1gGgMM/VMajAjsgNdOqk=",
        "ref": "refs/heads/master",
-        "rev": "a09a34997ce692c7a2e8e434b44433156a73088c",
-        "revCount": 38,
+        "rev": "ba6b926cc4f6d65015271ebe7edd22269af77840",
+        "revCount": 31,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/nvim_flake"
      },
@@ -192,7 +268,7 @@
    },
    "peerix": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
@@ -221,11 +297,11 @@
        "theme_deepthought": "theme_deepthought"
      },
      "locked": {
-        "lastModified": 1729077289,
-        "narHash": "sha256-z5LEPxOJq2LjhPhY4QE1IOt0lBD39cipR6Lw8vRTNlI=",
+        "lastModified": 1705870326,
+        "narHash": "sha256-ojdGSeqztnnGMyLKjnSCGq0muGh3U+Zb9iwzaaDsaF4=",
        "ref": "refs/heads/master",
-        "rev": "eab712e42139d33911ba767c2ff1bfbdf05c254d",
-        "revCount": 27,
+        "rev": "ad6af66a6142279789db8967b285eb04c6d18c02",
+        "revCount": 26,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/project-cloud"
      },
@@ -236,6 +312,7 @@
    },
    "root": {
      "inputs": {
+        "goatcounter": "goatcounter",
        "home-manager": "home-manager",
        "nix-xilinx": "nix-xilinx",
        "nixpkgs": "nixpkgs",
@@ -251,18 +328,18 @@
    "simple-nixos-mailserver": {
      "inputs": {
        "blobs": "blobs",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_05": "nixpkgs-24_05"
+        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1722877200,
-        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
+        "lastModified": 1710449465,
+        "narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
+        "rev": "79c8cfcd5873a85559da6201b116fb38b490d030",
        "type": "gitlab"
      },
      "original": {
@@ -279,11 +356,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1729999681,
-        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
+        "lastModified": 1711855048,
+        "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
+        "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
        "type": "github"
      },
      "original": {
@@ -327,6 +404,21 @@
        "type": "github"
      }
    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "theme_anemone": {
      "flake": false,
      "locked": {
@@ -359,6 +451,45 @@
        "type": "github"
      }
    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "goatcounter",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1702461037,
+        "narHash": "sha256-ssyGxfGHRuuLHuMex+vV6RMOt7nAo07nwufg9L5GkLg=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "d06b70e5163a903f19009c3f97770014787a080f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "zremap": {
      "inputs": {
        "nixpkgs": [
@@ -366,17 +497,17 @@
        ]
      },
      "locked": {
-        "lastModified": 1721120316,
-        "narHash": "sha256-CaAMnU6LKqJrsZmR9k0/2brpULnAekpgG5S0BjtFhaQ=",
-        "ref": "refs/heads/master",
-        "rev": "8a7923bd4e5d36b186408d5432568a91ac67b695",
-        "revCount": 21,
-        "type": "git",
-        "url": "https://git.project-cloud.net/asmir/zremap"
+        "lastModified": 1696448728,
+        "narHash": "sha256-kUc6983IX9n0eQxTFZRK7LYCLHoxoGZ5rOV7nu8hGRI=",
+        "owner": "asmir.abdulahovic",
+        "repo": "zremap",
+        "rev": "9043844893cfc333ed04d04c1d3b67d9904c0afc",
+        "type": "gitlab"
      },
      "original": {
-        "type": "git",
-        "url": "https://git.project-cloud.net/asmir/zremap"
+        "owner": "asmir.abdulahovic",
+        "repo": "zremap",
+        "type": "gitlab"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
  description = "NixOS configuration";

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

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

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

@@ -34,6 +34,11 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    goatcounter = {
+      url = "github:asmir-abdulahovic/goatcounter-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -51,6 +56,7 @@
  };

  outputs = inputs @ {
+    goatcounter,
    home-manager,
    nixpkgs,
    nix-xilinx,
@@ -83,7 +89,6 @@
            home-manager.useUserPackages = true;
            home-manager.users.akill = import ./home/home.nix;
            home-manager.extraSpecialArgs = {inherit inputs system;};
-            home-manager.backupFileExtension = "home_backup";
          }
          peerix.nixosModules.peerix
          {
@@ -160,6 +165,7 @@
          {nix.registry.nixpkgs.flake = nixpkgs;}
          ./magpie/configuration.nix
          ./magpie/hardware-configuration.nix
+          goatcounter.nixosModules.goatcounter
          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,10 +1,10 @@
 {
-  lib,
  pkgs,
+  config,
  ...
 }: let
  qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
-    firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
+    firejail -- ${pkgs.qutebrowser}/bin/qutebrowser "$@"
  '';
 in {
  imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
@@ -18,7 +18,6 @@ in {
    enable = true;
    defaultApplications = {
      "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";
@@ -30,12 +29,11 @@ in {
  fonts.fontconfig.enable = true;

  home.sessionVariables = rec {
-    BROWSER = lib.getExe qutebrowser_firejail;
+    BROWSER = "${qutebrowser_firejail}/bin/qutebrowser";
    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";
@@ -182,7 +180,6 @@ in {
      userName = "Asmir A";
      userEmail = "asmir.abdulahovic@gmail.com";
      extraConfig = {
-        init.defaultBranch = "master";
        pull = {rebase = true;};
        credential = {helper = "store";};
      };
@@ -223,8 +220,8 @@ in {
    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.grim}/bin/grim -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
+        ${pkgs.swaylock}/bin/swaylock -f -i "$TMP_FILE"
        ${pkgs.coreutils}/bin/rm "$TMP_FILE"
      '';
    in {
@@ -250,37 +247,6 @@ in {
        }
      ];
    };
-
-    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";
-            }
-          ];
-        }
-      ];
-    };
  };

  systemd.user = {
--- a/home/home_packages.nix
+++ b/home/home_packages.nix
@@ -1,21 +1,14 @@
 {
-  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/
+    ${pkgs.chromium}/bin/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} $@
+    ${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
  '';
  ssh_proxy = pkgs.writeShellScriptBin "ssh_proxy" ''
    if ${pkgs.coreutils}/bin/test $# -ne 1; then
@@ -23,7 +16,7 @@
      exit
    fi
    PROXY_PORT="1337"
-    ${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
+    ${pkgs.openssh}/bin/ssh -D "$PROXY_PORT" -q -N "$@"
  '';
  wrap_sh = let
    bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
@@ -54,16 +47,13 @@ in {
      cached-nix-shell
      caddy
      cargo
-      ungoogled-chromium
+      chromium
      cmake
      compsize
-      /*cura*/
+      cura
      deluge
-      dfu-util
      discord
      dmenu-wayland
-      drawio
-      dualsensectl
      ffmpeg-full
      firefox
      freecad
@@ -75,9 +65,7 @@ in {
      gnumake
      go
      grim
-      heimdall
      hyperfine
-      icestorm
      imagemagick
      imv
      inkscape
@@ -87,60 +75,44 @@ in {
      kodi-wayland
      krita
      libnotify
-      libreoffice-qt6-fresh
+      libreoffice
      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
-      paraview
      pass-wayland
      patchelf
      pavucontrol
-      pay-respects
      pirate-get
      poppler_utils
      powertop
      pulsemixer
-      pwvucontrol
      python3
      python3Packages.west
      remmina
      river
      rtorrent
-      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
@@ -149,20 +121,17 @@ in {
      wofi
      x2goclient
      yewtube
-      yosys
      yt-dlp
      zapzap
      zathura
-      /*zeal-qt6*/
+      zeal-qt6
      zig
    ]
    ++ [
      chromium_discord
-      chromium_stackfield
      chromium_teams
      ssh_proxy
      wrap_sh
-      qcad
    ]
    ++ [
      inputs.swaysw.packages.${system}.swaysw
--- a/home/i3.nix
+++ b/home/i3.nix
@@ -1,4 +1,5 @@
 {
+  config,
  lib,
  pkgs,
  ...
--- a/home/i3status-rust.nix
+++ b/home/i3status-rust.nix
@@ -18,15 +18,7 @@
        }
        {
          block = "disk_space";
-          path = "/nix";
-          info_type = "available";
-          interval = 20;
-          warning = 20.0;
-          alert = 10.0;
-        }
-        {
-          block = "disk_space";
-          path = "/home";
+          path = "/";
          info_type = "available";
          interval = 20;
          warning = 20.0;
@@ -42,11 +34,6 @@
          device = "enp5s0";
          interval = 2;
        }
-        {
-          block = "net";
-          device = "enp7s0f3u1u1";
-          interval = 2;
-        }
        {
          block = "net";
          device = "eno1";
--- a/home/sway.nix
+++ b/home/sway.nix
@@ -3,18 +3,17 @@
  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.cliphist}/bin/cliphist list | \
+    ${pkgs.wofi}/bin/wofi --dmenu --insensitive | \
+    ${pkgs.cliphist}/bin/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
+    GEOM="$(${pkgs.slurp}/bin/slurp -d)"
+    ${pkgs.grim}/bin/grim -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
  '';
  swaysw = inputs.swaysw.packages.${system}.swaysw;
  viber = pkgs.callPackage ../packages/viber/default.nix {};
@@ -23,7 +22,6 @@ in {
  wayland.windowManager.sway = {
    enable = true;
    extraSessionCommands = "";
-    extraConfigEarly = '''';

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

      keybindings = {
        "Alt+Shift+q" = "kill";
        "Alt+Shift+Return" = "exec ${term}";
-        "Alt+p" = "exec ${pkgs.bemenu}/bin/bemenu-run";
+        "Alt+p" = "exec ${pkgs.dmenu-wayland}/bin/dmenu-wl_run -fn \"mono 14\"";
        "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";

@@ -122,16 +120,13 @@ in {
        "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 ${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}";
+          exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3'';
+        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${pkgs.zapzap}/bin/zapzap";
        "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
        "Mod4+y" = ''
-          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";
+          exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer'';
      };
    };
  };
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -17,7 +17,6 @@
      cp = "cp -v";
      rm = "rm -v";
      ip = "ip --color=auto";
-      f = "''$(pay-respects zsh)";
    };

    history = {
@@ -38,6 +37,11 @@
        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 {
--- a/magpie/configuration.nix
+++ b/magpie/configuration.nix
@@ -3,6 +3,7 @@
  pkgs,
  lib,
  project-cloud,
+  goatcounter,
  nvim,
  system,
  ...
@@ -11,42 +12,23 @@

  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.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 = [
-    (builtins.readFile ../nixy/ssh_pubkey)
+    builtins.readFile ../nixy/ssh_pubkey
  ];

  environment.systemPackages = with pkgs; [
@@ -56,6 +38,7 @@
    fzf
    fzy
    git
+    goatcounter.packages.${system}.goatcounter
    nvim.packages.${system}.nvim
    htop-vim
    nvim
@@ -117,13 +100,18 @@

  services.goatcounter = {
    enable = true;
-    port = 8002;
-    proxy = true;
-    address = "127.0.0.1";
+    environmentFile = "/var/lib/goatcounter.env";
+    extraArgs = ["-listen='*:8002'" "-tls=proxy"];
+    database = {
+      backend = "sqlite";
+      name = "goatcounter";
+      user = "goatcounter";
+      automigrate = true;
+    };
  };

  services.nextcloud = {
-    enable = false;
+    enable = true;
    package = pkgs.nextcloud28;
    config.adminpassFile = config.sops.secrets."nextcloud_admin".path;
    configureRedis = true;
@@ -169,14 +157,12 @@
      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;
@@ -194,7 +180,7 @@
      forceSSL = true;
      enableACME = true;
      locations."/" = {
-        proxyPass = "http://unix:${toString config.services.gitea.settings.server.HTTP_ADDR}";
+        proxyPass = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
      };
    };

@@ -222,7 +208,6 @@
      DISABLE_SSH = true;
      HTTP_PORT = 3001;
      LANDING_PAGE = "explore";
-      PROTOCOL = "http+unix";
    };
    settings.mailer = {
      ENABLED = true;
@@ -245,13 +230,6 @@
      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;
@@ -280,12 +258,6 @@
    startAt = "daily";
  };

-  services.seafile = {
-    enable = false;
-    initialAdminPassword = "admin";
-    adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
-  };
-
  /*
  needed for sendmail mail functionality
  */
@@ -300,29 +272,40 @@
    defaults.email = "asmir.abdulahovic@gmail.com";
  };

-  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.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+
+  sops.secrets."miniflux_env" = {
+    sopsFile = ./secrets/miniflux.yaml;
+  };
+
+  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;
+  };
+
+  sops.secrets."wg_privkey" = {
+    sopsFile = ./secrets/wg_privkey.yaml;
+  };
+
+  sops.secrets."borgbase_enc_key" = {
+    sopsFile = ./secrets/borgbase_enc_key.yaml;
+  };
+
+  sops.secrets."borgbase_ssh_key" = {
+    sopsFile = ./secrets/borgbase_ssh_key.yaml;
  };

  networking.hostName = "magpie";
@@ -359,19 +342,12 @@
      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"];
-        }
      ];
    };
  };
--- a/magpie/secrets/3proxy.yaml
+++ b/magpie/secrets/3proxy.yaml
@@ -0,0 +1,21 @@
+string: ENC[AES256_GCM,data:9PAgqNliAEo5NIc8uFho1dYt/90X9Y6iOz2HP2aLzqA3ghvasi5l3n79wV0wxI+Vnw==,iv:Atkz33cnTLQ4RyT0nVt2/VhWgLiQE0acGbOJUbWZ2kM=,tag:IWLpVYeiYtzLK6h2K/MjLA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoVTAvOFAvbGdLUWxNcElp
+            NmY2MC9XUzBHWVdOek1oTkFSaWdENnhmZWgwCktock10L3YrL2JoTHVaOWhtWlhK
+            K2lMeUpqNFZTNnBOMmtJajdHWjRLT1UKLS0tIFd2OXBLRGQzVzF4TzhrOXFjWDVL
+            VzRqWXBYT0RHN1V3bnVMRHc2SXVUcDAKD8Et0nJv8mT1KoWQKcxfpv8s57zqIK0J
+            TCm3sby77wZ9i3BpO1Mg8S2GGwM0X+fZme8S5HVTzAgpzIyUbdcmww==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-17T18:25:56Z"
+    mac: ENC[AES256_GCM,data:ezv1W5jPjZxDt5gs+ljha/ywjSc1P00QtdEZBoWye6y61iOAMlF+VeWgI1yAIz9h2STdb2mqbFj1pmJcFujCYzxTY6Vx4j1GHpVv+Zczvnj1AnepDgLZn320FzwUmWscGcSL/Tn9+H/g0rH0BR2qv5GfRE9vmdXpXPsS6jZ+mcw=,iv:t4yaE56jPI4ozMpEChAT6y0zN9v1vlsR2J5VriFoV48=,tag:zs7vtq5J0EnwBgT9rjZIMA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
--- a/magpie/secrets/asmir_mail_pw_hash.yaml
+++ b/magpie/secrets/asmir_mail_pw_hash.yaml
@@ -8,20 +8,11 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            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==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKbTM0ZzVHZ1hlNzJ6d25a
+            eFpZMHdBZjBFSjU4L0dkK1Noby9HK29CMldNCkJWb2NmcC9jNVFBMWJOZjVBalRw
+            VVZsN3B1WGJseDFiRTA1R3cvU3c2NEEKLS0tIFI4WHFDRHBCN29IQ0tPVC9zbHZS
+            OFdsQUpvRzNKc2x1WW13b2d4R3lxdXMKJeMJ1IdxS+WUTzUlFdc4WfnUozWU4/80
+            9GBPz3VCppunrXrh1zFkfIL+Lz48HFyf7HNI4na6TkyqipR6wsW4gw==
            -----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
@@ -8,20 +8,11 @@ sops:
        - 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==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvbGhiTHNXczdHZGd6Mjg4
+            dGtVUmorcHVtaDJQRHRFSlVNZVA2ZUV6NVF3CllsNWRTT2YzS1ZnQ1dJTGRHbjJE
+            N3l5L00rK2RpT0VWenVVR2Nxald2cGsKLS0tIE9EZ0hXeWM0dEZuYW9lTDc4NS9Q
+            bFUzRjE3aVNLQ1RaRHk0RStrUkRaMncKxwHapHc7cMA2YB1uZyZ5vPxGwDc9+RBW
+            xj1FBWUVe0kaLibThqHWH7D9KuBComk/rkBPF3xk4As2M7O/UixTpg==
            -----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]
--- a/magpie/secrets/borgbase_ssh_key.yaml
+++ b/magpie/secrets/borgbase_ssh_key.yaml
@@ -8,20 +8,11 @@ sops:
        - 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==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5UHRuVS95ZFNTWU5LdS8z
+            UDVaTjZReWc4T2ZKaTVSdDExY2drSHFIcEM0CnkvZkhkSHVFVG1pVUJvUzRxMWYv
+            SE1sZEJBazRBcW53bzV4QXFiM0p5ZEkKLS0tIGNhaTB1NFBLd2NjTWs0V1BaVEE2
+            WDZadWdTMFIwei83clhkNVRLNUhVTk0KiJGENx2jXnStGslESR5aWp/LolbF2f0u
+            QDbs0yW+I4Tzw6Tg4FMS4rFzlmesFqoj+3JBgegb/dDRhIvuWrwCig==
            -----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]
--- a/magpie/secrets/gitea_db.yaml
+++ b/magpie/secrets/gitea_db.yaml
@@ -8,20 +8,11 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            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==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKZ3l1UTRDMFVlM01TR1dW
+            VzNnRXpuc0R0d3BpVzZveHRrdHRTTVRXNWpnCjVqNittd3BiZ0d3YXVQUXBpWExU
+            cGdkSmVtOHJBN3FEdDVCeTVjUllHc0EKLS0tIG5TQlpIQXhNNmJiR0Y3L1p3SVpG
+            ZnlvRDRUam5MaFdZcGgyZlJSZzMvVWcKxiwENpP7qlF0Uy7DJM0WwLFQ0h+ost5T
+            BCsZtGP61Z2WcQq0EWYLqJItR2Tk3AXox014CJAm+G/G8PMTAKv0xw==
            -----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,20 +8,11 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            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==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCT2VyNWxUeUZ5aDdHcXJR
+            WGJVOGgyeC83MEV4REpGZkRUcVJKZDBqYmtjCllQdFhyRWNiTURYQmpucndFWDlr
+            WUFybGtmckNBdXYzMVZxT3lQM1k3aTgKLS0tIEpNZjU1RkpSOVo3Y1ovR0lmbHJu
+            bENVWmpCcTVqMDh2Wjhob2I2VzRRblkKPGCV1gRyihDCStM4tmvp89d996v1UzdJ
+            /NyK49//+uJJqwCEWuvHWWCB+EbkkOE6gPPKXZyXZSTbb/TDDcVF/Q==
            -----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,20 +8,11 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            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==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpZ1d3aGhud0UyOVV6Vzcw
+            Q3Q2OVRQOEpXUk1TK2dOOEZtKzNlUkJGZHh3CmJwYnRpWFhJWHZXQ2I1TnhKWDRx
+            MGlrbXJoQTVPcUFBa0gvME95OVlxWkEKLS0tIHNZWWRwWUJPV3o3REpENzdMYkVk
+            Y1V5SXhCUllDWGhjK3JzWDRKQU9hMmMKuVmn6OAy2q/mpBKqUhl1qfpnPvFOd72c
+            /jMqnxClGSVXjJ5qdvcXCfLeYwT8vnhViNZmjE1ebRosE5YupvrjUg==
            -----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,20 +8,11 @@ sops:
        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            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==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrUnQ3SDAyRTUxUDF0dDhY
+            K3JmQWlYRVJtdEFac0J4U0RGKzZGNXJmUEg4CmtBSW9yNGZScXhKdnhZWkxIamFW
+            YXEzbGhwR2F3dDJGdzljZUZBeERhU1kKLS0tIGlXZUhsdnI4ell5R3ZZbjZ0NCtO
+            TUpkZmxBNzZ1UUY1dGRud2hycGUyZW8KFUGikaFQjFfmn068qex2tpGbRHIbmS3l
+            27lqo8+eRFnq0nw8H/1yRMi8IghR0+XK68T49hlt0VLS9LZJG1aPag==
            -----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
@@ -8,20 +8,11 @@ sops:
        - 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==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOZW1IOGNtVG1uNjlQTE5l
+            ZThlcHVTWVgwek8zQTQ0NEFoV0pNUTMrRUNzCjhGMFRPdDJ0Z0ZiUTRkRXZqOUtZ
+            RFNtYmNFbGdpWElET1VwckhRY2c3bzQKLS0tIDFKVDdKdWVPZFVjMmVGQVEyREZZ
+            VEpUK1d3cUJvd2Y5VHNVNlpKazIxZTAK6WKMvsf8CE3BJxHtyt0Gw4baQ/FQB0Q3
+            4ehZeDi7cYiH4EG5HmeIBVcgpv/i25GNLFDP3E3TdJJs62F5X08Qng==
            -----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]
--- a/mediabox/.sops.yaml
+++ b/mediabox/.sops.yaml
@@ -0,0 +1,8 @@
+keys:
+  - &mediabox      age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
+creation_rules:
+
+  - path_regex: secrets/[^/]+\.yaml$
+    key_groups:
+    - age:
+      - *mediabox
--- a/mediabox/configuration.nix
+++ b/mediabox/configuration.nix
@@ -26,35 +26,18 @@
    sopsFile = ./secrets/wg_privkey.yaml;
  };

-  sops.secrets."wg_preshared/mediabox" = {
-    sopsFile = ../common/secrets/wg_preshared.yaml;
-  };
-
  nix = {
    optimise.automatic = true;
    gc.automatic = true;
    gc.options = "--delete-older-than 7d";
-    package = pkgs.nixVersions.latest;
+    package = pkgs.nixUnstable;
    settings = {
      experimental-features = ["nix-command" "flakes"];
    };
  };

  boot = {
-    initrd = {
-      compressor = "zstd";
-      availableKernelModules = ["e1000e"];
-      network = {
-        enable = true;
-        udhcpc.enable = true;
-        ssh = {
-          enable = true;
-          hostKeys = [/etc/ssh_dummy_ed25519_key];
-          authorizedKeys = [(builtins.readFile ../nixy/ssh_pubkey)];
-        };
-      };
-    };
-
+    initrd.compressor = "zstd";
    kernelModules = ["acpi_call"];
    kernelPackages = pkgs.linuxPackages_latest;
    kernelParams = ["msr.allow_writes=on"];
@@ -113,11 +96,11 @@
    wireguard.interfaces = {
      wg0 = {
        ips = ["10.100.0.5/24"];
+        listenPort = 51820;
        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;
@@ -439,9 +422,6 @@
    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/secrets/peerix.yaml
+++ b/mediabox/secrets/peerix.yaml
@@ -6,23 +6,32 @@ sops:
    azure_kv: []
    hc_vault: []
    age:
-        - recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
+        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Zmc0c1AxMVEzdi94L0Nh
-            dHJFSHVSbG1vay9NUDBEVkM4ZWNoT3h4Q1c0CkhWdWVzTEJxZENZYXVFT2RhV3pT
-            aDZIUUdWVUVRUDc4ZEFDTkdnaDJxdVkKLS0tIDd6TE56REdjRVdtSXB1dkJrVVNj
-            dUxhRnB4dVFRam9xNlFiY2VOSXpNamcKNzRghHeyPtltKH4GkJQ0ef4apr5gziq9
-            dhXy6Qil48QJd4hnyr7GW1n7eRIq24OWO3WglLbVAUSQr/gzM2TWiA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwMkdLVEFQMVk1allhK2hL
+            NXFXc254SmhxK0lFWTd1SUorUGQ0VEJPcXo4ClNYSkhJbnVjUjdFOGtoWFV2VWZC
+            NmpaRDVhWnRQUmVDWS9WU2pTVlBEQ1EKLS0tIFAydU9aYXJnd1NnRzU2YXpXM1Vq
+            VWhhbkZTT1kwTEl5VEVWR1A2aW5OUDgKiYcj5Yo42RjQeo1UeUTBV8YBNYL8ccLW
+            bQ1655MU/q3LQh14lqwbsOfmGjPc9H0ECltm+V+kNPTRi76qFhcodg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMjVQZkVVQmZFbCt3Z2ZI
-            Q3NVZUJ0VkZjK0E5SFpqWE50c2dOeFNsUm1jCmdDZGxZYk13emhhanRzWjhvZFM1
-            UWNpNm5malkrU1Rkak9PNWk2bW5nRDQKLS0tIE9UdXg4L0hMRzJuUERIMytvc2pr
-            Y1BBZFJseUNIeTVtTjBGazk5WE1ZcUUKs9pEtDbCYRfSP0Rh9ENo9A6nUFkYHr4D
-            3DvOKSyLL33FBoEddDBd7Si1mpjY2bunueBAe+diDgOrol6tWIMoUw==
+            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==
            -----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
@@ -8,20 +8,11 @@ sops:
        - 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==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiazVUcmc0YmJzUE5GU2ZE
+            UVNSUkFJakhsRkZua1FvYUJiK2wzT0ZuNzBRClFJVzBHQk5ET1U1SkN1OGFOTVVM
+            a04rSHpHY3NXeUs0bGJYWW5vK1Q2d1kKLS0tIFBNYmJSTE41ZEhJZnVBQnVyR21P
+            RVhhTUUyL00xT0ZCZkhzMjE3VGM4MFUKR2t9irsBeSGBgTuhNeOVtQQ7QjfXTFMC
+            xlRF4YdjQUYhz2rLIgkVMCVCX1IvyUO/KmmTIr1pgtKkpUL9ZDkvlw==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-04-14T19:25:26Z"
    mac: ENC[AES256_GCM,data:vcyglyYG93K3KBISpIESGlNCs5ojWZAL0gyDUzBNCxG5H8RKEz1Y7yOtr5EXnnP66qcBHlKhb81Iyrc071pmJL9dIttiqmvjSWf0zZ9RuV0uYcO/42cqk3J4tBJ6iYCi64y58jifDObbRni6jiGVEGEkSk8cXFqR8UXoSTeXWtU=,iv:avpWr8SeHK1VHz9XhkO7Nd7VOfMP7JXcQaXJA8Xiuhs=,tag:ixJsw/snZEWXGhdPLU1cGg==,type:str]
--- a/nixy/configuration.nix
+++ b/nixy/configuration.nix
@@ -1,9 +1,9 @@
 {
  config,
-  nix-xilinx,
-  nvim,
  pkgs,
+  nix-xilinx,
  system,
+  nvim,
  zremap,
  ...
 }: {
@@ -11,54 +11,34 @@

  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;
-      };
+  sops.secrets."wg_privkey" = {
+    sopsFile = ./secrets/wg_privkey.yaml;
+  };

-      "wg_privkey" = {
-        sopsFile = ./secrets/wg_privkey.yaml;
-      };
+  sops.secrets."borgbase_enc_key" = {
+    sopsFile = ./secrets/borgbase_enc_key.yaml;
+    owner = config.users.users.akill.name;
+  };

-      "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;
-      };
-    };
+  sops.secrets."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.nixVersions.latest;
+    package = pkgs.nixUnstable;
    settings = {
      sandbox = true;
      experimental-features = ["nix-command" "flakes"];
@@ -68,8 +48,7 @@
  boot = {
    extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
    initrd.compressor = "zstd";
-    initrd.kernelModules = [];
-    initrd.systemd.enable = true;
+    initrd.kernelModules = ["amdgpu"];
    binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
    kernelPackages = pkgs.linuxPackages_latest;
    kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
@@ -84,7 +63,7 @@
      memtest86.enable = true;
    };
    readOnlyNixStore = true;
-    supportedFilesystems = ["f2fs" "xfs"];
+    supportedFilesystems = ["btrfs" "nfs"];
    tmp.useTmpfs = true;
  };

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

    hostName = "nixy";
@@ -145,30 +124,17 @@
    wireguard.interfaces = {
      wg0 = {
        ips = ["10.100.0.6/24"];
+        listenPort = 51820;
        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;
-          }
-        ];
-      };
    };
  };

@@ -177,11 +143,6 @@
  nixpkgs.config.allowUnfree = true;
  nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
  environment = {
-    etc = {
-      "firejail/qutebrowser.local".text = ''
-        whitelist ''${RUNUSER}/qutebrowser
-      '';
-    };
    extraInit = ''
      unset -v SSH_ASKPASS
    '';
@@ -192,20 +153,10 @@
  };

  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;
@@ -213,119 +164,19 @@
    sway.enable = true;
  };

-  documentation.dev.enable = true;
-
  # List services that you want to enable:
  systemd = {
    services = {
-      "zremap@" = {
-        enable = true;
-        restartIfChanged = true;
+      "zremap" = {
+        description = "Intercepts keyboard udev events";
+        wants = ["systemd-udevd.service"];
+        wantedBy = ["multi-user.target"];
        serviceConfig.Nice = -20;
-        unitConfig = {
-          Description = "zremap on %I";
-          ConditionPathExists = "%I";
-        };
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${zremap.defaultPackage.${system}}/bin/zremap %I";
-        };
-      };
-
-      "netns@" = {
-        description = "%I network namespace";
-        before = ["network.target"];
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${pkgs.iproute2}/bin/ip netns add %I";
-          ExecStop = "${pkgs.iproute2}/bin/ip netns del %I";
-        };
-      };
-
-      "wg_proton" = {
-        description = "wg network interface";
-        bindsTo = ["netns@wg.service"];
-        requires = ["network-online.target"];
-        wants = ["dnscrypt-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"
-          ];
-        };
+        script = ''
+          sleep 1
+          ${zremap.defaultPackage.${system}}/bin/zremap \
+          /dev/input/by-path/platform-i8042-serio-0-event-kbd
+        '';
      };
    };

@@ -337,13 +188,14 @@

  services = {
    acpid.enable = true;
+    btrfs.autoScrub.enable = true;
    dbus.enable = true;
-    dbus.implementation = "broker";
    fstrim.enable = true;
    fwupd.enable = true;
    ntp.enable = true;
    openssh.enable = true;
    printing.enable = true;
+    rpcbind.enable = true;

    pipewire = {
      enable = true;
@@ -352,26 +204,21 @@
      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 = false;
    };

    udev = {
-      packages = [pkgs.openhantek6022 pkgs.openocd];
+      packages = [pkgs.rtl-sdr pkgs.openhantek6022 pkgs.openocd];
      extraRules = ''
        #Xilinx FTDI
        ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
@@ -382,9 +229,6 @@

        #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"
      '';
    };

@@ -438,16 +282,13 @@
      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 = "public-resolvers.md";
+          cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
          minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
        };
      };
@@ -493,23 +334,6 @@
    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 = {
@@ -527,29 +351,27 @@
      dina-font
      fira-code
      fira-code-symbols
-      font-awesome_6
+      font-awesome
+      font-awesome_4
      inconsolata
      iosevka
      jetbrains-mono
      liberation_ttf
-      libertine
      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-color-emoji
+      noto-fonts-cjk
      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";
      };
@@ -561,6 +383,8 @@
    };
  };

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

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

  zramSwap = {
--- a/nixy/hardware-configuration.nix
+++ b/nixy/hardware-configuration.nix
@@ -1,44 +1,77 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  config,
+  lib,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];

-  boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
-  boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" "amd-gpu" ];
-  boot.extraModulePackages = [ ];
+  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 = [];

-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
-      fsType = "xfs";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
+    fsType = "btrfs";
+    options = ["subvol=root" "compress=lzo" "noatime"];
+  };

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

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

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

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

-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = true;
-  hardware.enableRedistributableFirmware = true;
+  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;
 }
--- a/nixy/secrets/borgbase_enc_key.yaml
+++ b/nixy/secrets/borgbase_enc_key.yaml
@@ -1,21 +1,30 @@
-borgbase_enc_key: ENC[AES256_GCM,data:AD+JghEOX25tBGYhoU1ge1fqrA+5AK8N4yg=,iv:u05GVeWbL3xdZQgGkXSPkxlATd2M9MX4uSZiLOHMMRE=,tag:pmTQIJWmz+ePmSNzO/EO4Q==,type:str]
+borgbase_enc_key: ENC[AES256_GCM,data:HBjoQkV3wDor8olcM4cejfi+1HDZWsjypL0=,iv:cgKsWfPY0+IvgobxVbz/IN4ujNLJzBZ0iGx7D4hj4YM=,tag:M2EC1eWtCYuTvgrauzJ7JQ==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
+        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrTTFkWkkxK3hsa3p4NnZY
+            MEUvZ1N3VUozZ1dtSmRldVR1YTFCdU1Nd2hjCndHenR1d2sxcjhVN2NVZlQ2R1Br
+            VmdhMWlSaStDSmpNSmVpMmd2dkpEZ1kKLS0tIFlDdEx5RWxjKytXWlFLeEVmNmtk
+            TVhYVkRuM1pIbXdiMEc5eW1EQi9nWHcKIDT3i5UWvL/2T8TvBNSITdl77BamTwNK
+            2OjhkvGtM+L7LSniO8OYm/i+CjsfiSmFScWbDr9JsjFPUpedt96mHg==
+            -----END AGE ENCRYPTED FILE-----
        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEaDhSZVVibVl1NU84NG9U
-            aEVQbThIcC9CajNHS25SVW1SMFFwMUsvMmxJCkpTVThpZ0JZdEpLTnJlQWFqM244
-            LzFaUFVvWWxIcU4wRlhXalF5TkNpVHMKLS0tIExXMUx5cDBBbDloQ0sxbEY0eGdj
-            bE5vNHVHekI2RzY5M3JNcTdCa3pNeUUK8C04wF1te6epA97sNrhoz0VUn+MC7SML
-            6N1CZK3MuRARBqcj4c/W1aXuTysvuV1o/Fl5xOk/gbumcfwnDYj28A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVNlBzMUJBTW5kMVU2R1Z1
+            VXBlRmxndHFEMTFRMXZRZnBpSzBOOVhzcmtRCkZCL20wend0cDFDNlNsemdwclRt
+            TUJTNjVrUVljS3VRandST3lqclM2MFkKLS0tIEc1ZCsyNFViQmhUZ0xOTVNza3B2
+            Y0ROa0Y4M2YzbjduYjJqRW9pUEVpMWMKMR4gJdaVW/ke7wV+9lq3vR/FzkY+Kgs/
+            qm0MwdSJSEcUnYUyyH6YL1yW/I/LqIuLLYozgD8DgNZFPMta38T9hA==
            -----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]
+    lastmodified: "2024-04-06T19:19:16Z"
+    mac: ENC[AES256_GCM,data:dAMQvSiNQASgtT807D1104P1/yYGazqEBKXJ/W69kLPh75sxIz8tFs6A6qzp3XW750OFHqwItaFZXBDXqAOt1/513bZAN8Nvy+NN9/mwbkHzsYY1ygpuq/YHjXAa0VSiWNigwrNLejMmk58k3TWukUYQ7QnR64ARXRSWFtJji1Y=,iv:111Wzv0qYS+EdRd+byNGJFumVyp/sIhlYGVkzOJZhjo=,tag:4xR8LZTRlfYQsbgYnm1t2g==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixy/secrets/borgbase_ssh_key.yaml
+++ b/nixy/secrets/borgbase_ssh_key.yaml
@@ -1,21 +1,30 @@
-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]
+borgbase_ssh_key: ENC[AES256_GCM,data:3DweTqDZP5TCmgq7aH3ZIgXFKEKdFmpntLhOSTinjkfmldx3vumWLpRu5r2FChOptfsA0iBj1S8semA0b4pdZthDKQwixsf9k0sg4YZOiPkSewwgyQqigoiO6mug2yHetZNYYVfxFaEGLLNqdLHqVEYa7UPtxH4XzFKARs0lv1dNGq6i8Vd4ZZWgd2zMohMlLQT8frR/CZPYk5SsRzbZ44AkyVlb80ktDn7SDs48H/aJvdlQ3VPkyPO/SIAaTm9BxzNPVApzksdsydvVUnUjlnugKtp9a4rwX0rFxvDORzNu/wPCX7OGaHJxwEczLlQmYckpxGh7Cpt1YqwobrSl8BU3vhywrYtOulBhdJuCnHZL+mQ2WpLspm5nuo6w3LmaEGe+/rMu6GxYFcLeSxSnON8kqNg0Nfe4jLokf15CADmXoMAgqd3Kax+s8xJQL/bgpHvY38qIoDJ1fS30jwCXImWRZzOozmgpFwP42fT/a5N4x/m7BvYFLzBRve3SLMRuQf3iWS44IKo0Zvm+2T22ECK72h4a2YpfcKQu,iv:WWUs/yHYbHVWwyXgmkBP1585N4AsthD4u6atug0L3nM=,tag:x+unGowhm8IbpEg3scQ5CA==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
+        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6ZmMwY0JVdjlmYkJNbjF0
+            ZmM3MXNzakI0cDlmZk5KYmd0K2N3SXJMTlhZCjNQSURBN1JuMk40NXlsVG5aZzRq
+            NnprYm9jTVZwWGdSOElEM1JGVFRyRDAKLS0tIEEybnpQci9YL3F3NTRod1VQWmVG
+            MkMvSC8rcDZkaUFJU2E2dGRHUE0wVHMK5KypL9Yx/fpwRMc4gKVXLLXOyHpdqS+S
+            OWywZxSRd7dRG7If3ZDRCtvZ34XGKwOrAHoZrCc4lAa4drXmBrP3Iw==
+            -----END AGE ENCRYPTED FILE-----
        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5b2YzSDdaU3R5TUdqS3Nv
-            eUYraFBiZlZ1TXBqYzlWNUNYOFlyMzJvWEE4ClJ6R25CRXRUZ2FDTFY2ZmJIRkRX
-            WVJCSy83N2JUNzRuT3VuSUF1OTV2TUkKLS0tIEZ5cVg1V2o0MkdmWEx1emJVdjZ0
-            RkZFL2tRNW9RdnAwalE2ZzVQcnljRFUKRyN8ahv9ZI63m8ycl74GZ59lyAXUsKmi
-            tfPqQvL1oTtJr3hzwy2bkctXQLYjGvsMyZt2tiWpy5vLc1MrxlqVDQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrYk5EVHU5emVVVEc0elhZ
+            M1ZOYTNPU1B3OUFJc3N3b1hEUlFIYjlOUkVJCjhka01LSW1lMENLanplcUxPZHhM
+            WDU1ZDB4enloUDlMNHo1dDU2SFA5ZUEKLS0tIGFJU2k1WHcyT3NTeFZkRi9pUHNy
+            Tm5UbTY5U0xmMUUweHZNWHlOMU1maTAK6NEU4Bl7uY8NcgrzJtIRjtusoggreIHc
+            +xDRaROFCzpWkwNh1m5olPSP1C/fdUbKaGJ35if+Pj5Rt8GwaUdcRg==
            -----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]
+    lastmodified: "2024-04-06T19:18:12Z"
+    mac: ENC[AES256_GCM,data:0B25mCDuyw7Ts98GZZ1+MukEwE3Ud8ytyC0VNJ5FuHG78h1uIEuWLBhw8YoYDsaMegiQBalJwK8oCGKnEI0uVHmoaktrGQoqsxAwMfC2vr/PhckJGx/5uILDrIW+/wCJz18evGB7/yGk6Sgvtk0oGqZDKXbNgUXvUQKByxZ+Id0=,iv:0eFOkVPnDohf79yMGepLmwHusV7T13mUbyXGapq4eYc=,tag:6PDerYjQOf9bss+tdvQDlA==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixy/secrets/peerix.yaml
+++ b/nixy/secrets/peerix.yaml
@@ -1,22 +1,31 @@
 peerix:
-    private: ENC[AES256_GCM,data:Oi8H5nqJ0Bf45wQepCjdZNHBOv4AlPxNN7L5Th3gcRQlW1FS77nusIWGSUvlmL2a5LTN0FV36o2GFPrrhiwmvnkQwuSZKc9VeDTf7SX0RRL1NLmRR/zy4WsRNJFxlqtjahieqg==,iv:6hJwqcdPayZaYZhJ0OfYLAtmeVndLEfeYZjUq5/3qJE=,tag:MiAfg8aZAHNYbB0JwcdStg==,type:str]
+    private: ENC[AES256_GCM,data:767u5KKjk2lMr70vtBvX06t8n/1r5xpCrRNKc9QvypJmbPS+vS8vij8JYJZDKKFBh5xUazSLQC1ga2mpb+hEO2rgD0Aa70p22wwfOP+qCJQNYwlEf0MLWhlblTCE9Cr/eQSX7g==,iv:tPEB4NWbLMvzrUIvosj9PfinMhdWNBu5btjElvbDzxg=,tag:wzxaBzW0R6HKCyP5zlMPRw==,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+IFgyNTUxOSBSMEIyck1xbVJ4Zm56Z3dM
-            OGsxa1p0TGIvRE5DYXZzTDM3YUZFVTAxbUUwCllPd0FOUlRiZW5wT2QvLzZXYjRr
-            S1A5WjZxLzNYQ1ZWVFFQTzRwMFQweFEKLS0tIHNoZUpHS2dDNmFKc3ZVNFZuUFU4
-            L0M0MitMeDg1ZWYxcDNCQlVGUjRKeFkKvD2SKnuh517o2knPr2SOWq3kubMyI7UV
-            j6HgXVbHUDjmKl2dY+YVTnmxrK54E+Q6iiu7mQnvLdzxYBK/EiNt9w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdU9WSjZkWUd6NXFpdXNp
+            R2huUXZQOGZzb0Z0ekN2WkdRdEFJYk54RmhnCmo0ampNK01VR3lQM0RGYWlNQ3cx
+            Rk1BK1lIUHJPZ2R5YVd6RTlYbXJDVWcKLS0tIGV0Yy8ySnFMQ25PQUNBL3dPdmc3
+            WjhldWNVL0h6T1lUSEdXeHFQemRBVEEKJzh1HExRoy/iyTtBNaVdNgolWyFHaaLV
+            VTDZYEHq+eEIrVAG5xefG/nPpj2K6FRItA6+4PcKtyARG+gKYwp2tw==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-21T08:17:51Z"
-    mac: ENC[AES256_GCM,data:v4KQq3Y5ZxsyMxR+FS1BZkH/bPTIIHfQu800U44odaNycIbWnuwCnLWGyJK6Por76bWALycGppDbHPKKW/N1I1XLy/EAXo02+nhHNvKVi2cXSXciuEPc/Cl+6TbP39lx4+EOM8CZoNZ8HAiS3QPy2bwZdMjEw/OHl8TqlN07q9s=,iv:PIcv/b6t+54/yCTZj+12Yep15ors/wXNUnaXjLjpVbM=,tag:JxO5M3OYaWzqgf4gUhCzzg==,type:str]
+    lastmodified: "2023-07-28T11:55:00Z"
+    mac: ENC[AES256_GCM,data:ieNyjQlo1tQ8qxFMyIN5XGgUiclYIfJe6WUyWiR3qJKKOTnx5MBWNUuHfUMkpm2ToNpaxiDUih2Hhqv5S0Bq1zoExMLjqE36GgaOivha6DeoQn5+WH8bMdMAoc1PlCQkj6Fxw2sdZlrIKcswADk4MfDzdaY/vKoQ5AtK5Bdkgok=,iv:JaOfWEwbLhOTquQVIG6Ll38jkGOCzbtD8h5c7SOAzik=,tag:m4Fmor24Q9GDoe7nu2VnEA==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.7.3
--- a/nixy/secrets/wg_preshared.yaml
+++ b/nixy/secrets/wg_preshared.yaml
@@ -1,21 +0,0 @@
-wg_preshared: ENC[AES256_GCM,data:k+aFYDNMojf5kktn6KJ4F5mH5oGdqxdF0MO88NcYpai9USnH394XRL9ASvs=,iv:L5LIXbADhrivKjK/V0E5QpRT7BDsktwIuKHgY+2qr84=,tag:pCW1naU/ygxAIDYWV2hHPQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZSHZvYy9TTmVEb2ZSTncy
-            ckJ1bXZGWVdJSkVHMGx2Vk5ZNlZ3Q2wzVFQ0Cmg1M3hKNFhnZk5nTE54RTdyR0Vs
-            NVRiTEltSnkxdmhhdGlycHNPWjFLbncKLS0tIE02NVJRZTd0VmowT1c4cjhKNlZk
-            Q01BQWNSVWtIMnFXRWpxR3JDMU8zYTAKIbfpM8uUb09cUlA8YWtgEOL5zvWf5omv
-            baZINiAu0/f1avYmW6Qb+aLa2ALrSZaotj46Uwd9Lb5mtjJ/8v9IOg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-20T18:12:20Z"
-    mac: ENC[AES256_GCM,data:4PWjwxOO0UuNsevCbzCLaiW7C+So4mEGivd9GzyLKx2JlkNFVB8wqPrY1Rl1ANMrT+7LKc8tVOA4zbweNc9idFG4y5DcvnDSieqKu9v1MeEMHqNpz5TTLbCP81g7qegjI/WKul2kaWIdPaioI/f5x2E6rEYnzFv+Di2mc3W+Qcc=,iv:iE9sali0O3sQIhOw30RGR/4ZQsAPcSxq1qxosfasojU=,tag:+9AOwph5A4oDXsK6Z3YeZA==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/nixy/secrets/wg_privkey.yaml
+++ b/nixy/secrets/wg_privkey.yaml
@@ -1,21 +1,30 @@
-wg_privkey: ENC[AES256_GCM,data:XL9FU1kZXvBJfwyt3HpQe8k8zg9HT6Xm0BdjNMduSu9uAgcHbglpLc/qTB0=,iv:QgX1VsmLUsDozFXmzDVPukjPNTa4Lnh806AQ4qdgpa8=,tag:RNVlDbtx8vAAbG0rinLVOw==,type:str]
+wg_privkey: ENC[AES256_GCM,data:HcOkr+leeB6QmEx77KHWgFlp2m2qr4TvakoHyy0SaPpML2o/51IDYjcu2H4=,iv:8nHJIqz3+LmL4rM7idXbvbQKdhkDqmoY/TAvAf/Zfvw=,tag:VSHRKjVgottVC0uPsC0JgA==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
+        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzaTRxUDZJREhyYjQraUsw
+            T1p2UlpkSjBnbjZTWUJDM2lHUVN5Z1ZQQWdvCnFmV1RRazBpTHhrTHpQelpjcnlq
+            NnJ0dUNwZTB0V0hOdTJJamY3azBUbXcKLS0tIGpZUG5KUFhPbW1LWWQ1RUd2OFVq
+            WlBMd0tGcnBHSFk4SHhkVkZPZXJPY28Keh/k5yQ/iJgy9S9rf2DhCr3M2ozgMBRp
+            NJrCKJuiDugeK8q29x6a+4pyg2zSwlA6Q2lxGDca3m3TX45QImLt3g==
+            -----END AGE ENCRYPTED FILE-----
        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBSnkyM1ZrcnEvM3VHL0Nk
-            THhUUDdGU2s5UFgrVGZ3WXhkYTRIVTlaeGs4CjR4eVpmRy9qUkZSWkpFZDZHRDZI
-            ZWRXSmMzL2RWZkVrSlFPcC9ueGpDVFkKLS0tIDZWbENyS2hrSCtlNlBHaE56QTha
-            eFJmWXk1SVJEbDJOc1Q1VFlzVS8yODgKFXRAtR+67x0dkQTqZPtMT0Hd+aW+5K17
-            S/lhuHRhITt3woQnecVPMYklgJJlsyQ6blKhJw8dvhbVWWThZ853rQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEelBJaCtJVnVZcHQ4V1Nz
+            ZDV4T21VZGNjanpRbERxOWx1RXNZZ2hwTFdrCmg4MHdWTnVTd0hiL2F2VXRxUk5P
+            eHRrRTduZjZ6T3dCcW0yMENKMHg5TVkKLS0tIDVSMFJqQU1uTEpzTElIN3RZNi95
+            S2Y2dFROYkJCOTVlS00rZWZDeWlGV2sKWKV7lMoLQbDBTql5+xWW+uOKxS6FG7jT
+            BtAMbL2YfTCEcV7nimzco649UUtoY9oOk2635uoToIxBI1mr9UVlNw==
            -----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]
+    lastmodified: "2024-04-04T19:26:58Z"
+    mac: ENC[AES256_GCM,data:ZA1Rc1sMvIwEQBZ6d+u4RZ00KzLxjMW/Tzr3ZlHMduuJmvDXjPjobpALwbJoEraa3yBwwJyf0b0Grwhlz1kvoWYjos3rTk8noy4UiEjav5Dxf8aZP5j6YL5HSzHgwWvRkzYvIAaaVGVpUM7Wl2llDSCeQluIw0R3kUXEiRW10RU=,iv:/fq3S0kmo9IZNvnP2o4kT2beaRgEMtJIMlQNCqSotd0=,tag:eMOrWijXQsc8agWGJmyLjw==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixy/secrets/wg_privkey_proton.yaml
+++ b/nixy/secrets/wg_privkey_proton.yaml
@@ -1,22 +0,0 @@
-wg_privkey_proton: ENC[AES256_GCM,data:qVVd+1s2T3sKDi03V+eMvgqW8LAVl/yEKwtG2EMn8NhBCN7RvlttC5SeIDM=,iv:/QcrtmMjCzZRulumIz5u9oxyaRt+HUq96ZiP8ecpvAo=,tag:1DCaJqVGfg3sfvKTQnmzZA==,type:str]
-wg_endpoint_proton: ENC[AES256_GCM,data:ggoWnB6nGjGc/kSOaCo=,iv:1r5J6SO5JYH7+bMhE2lGwfFETVFeS61eCXtej0Pl07M=,tag:p+0hhQ/vqZzZML24YReA0g==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdXZpL1lrOEYyYVdFTzNJ
-            SHhXRVc5Y0o4ZzN2THRjM215UWczVjZOTXg4CjBJZ2VxN0t0ZFgzTmJMeXo5SWZk
-            UjRlNmdRTVVPbHVEeXM3TWhoS0pSUTQKLS0tIEtkTURBc1A3d2lTalhmeEoxUkZj
-            K3BHZnUzN3ZrL1dFQk8rWFpZR05pbFUKObrnIpY3NR1o3/lKhTfVpQU+eQRTi7wF
-            SAjGZ5BRdCi5x1VWRxiT1Fvjqkm7kBEQFvdSvbqW2UK6lVHtWgt2Vg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-12T13:30:18Z"
-    mac: ENC[AES256_GCM,data:3UqJGcNGPZDlLA3a0uNHUI0ykDC0ByxAR2ZsrsbWQMv3BS6zyBuc+zpTHQZoIPGsAMUetuB3OuA0IQNll3abg6u2AadEQBUf1PYMWlo58txLYlAs/q0g+575F+LhDSgmDMKOFXz4HqbFP0RYTHkPnmjWPMWWY3G9o6B3Iaw5+Kc=,iv:massJRpGcH4pDZxJrpQYy80XVViyw+qFsZ8Sk9Xze08=,tag:eDvuNadKGKBS/3jauvnuFQ==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/nixy/wg_pubkey_nx
+++ b/nixy/wg_pubkey_nx
@@ -1 +0,0 @@
-eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=
--- a/packages/viber/default.nix
+++ b/packages/viber/default.nix
@@ -44,12 +44,12 @@
 }:
 stdenv.mkDerivation {
  pname = "viber";
-  version = "23.2.0.3";
+  version = "21.8.0.11";

  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";
-    hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM=";
+    hash = "sha256-RrObmN21QOm5nk0R2avgCH0ulrfiUIo2PnyYWvQaGVw=";
  };

  nativeBuildInputs = [makeWrapper];
Author	SHA1	Message	Date
Asmir A	66701189d5	flake: update nvim	2024-04-17 22:28:58 +02:00
Asmir A	3fadc9d785	magpie/nfs: disable nfs	2024-04-17 22:28:19 +02:00
Asmir A	c06e05a7de	magpie/ssh: change auth pubkey	2024-04-17 22:27:10 +02:00
				`@@ -1 +0,0 @@`
				`g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=`
				`@@ -1 +0,0 @@`
				`kbmzzQc3bBpkjE7K/ohycZtx+ml+dzVYOQ2xM0/bzzQ=`
				`@@ -1 +0,0 @@`
				`eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=`