magpie: add goatcounter

.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

blue/configuration.nix

@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: {
   imports = [
@@ -13,7 +14,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"];
   };
 

blue/hardware-configuration.nix

@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {

common/packages.nix

@@ -1,46 +1,36 @@
 {
+  config,
   pkgs,
   nix-xilinx,
-  system,
   ...
 }: {
   environment.systemPackages = with pkgs;
     [
       acpi
       binutils
-      binwalk
       bluez
       bluez-tools
       btop
-      busybox
       curlHTTP3
       dfu-util
       dhcpcd
       direnv
       dmidecode
       dnsmasq
-      dnsutils
       dtach
-      f2fs-tools
       fd
       file
-      fio
       fzf
       fzy
       git
-      adwaita-icon-theme
-      gnomeExtensions.appindicator
       gnupg
       gptfdisk
       hcxdumptool
       hdparm
       htop-vim
       interception-tools
-      iw
       jq
       lm_sensors
-      man-pages
-      man-pages-posix
       meson
       mosh
       msmtp
@@ -52,13 +42,10 @@
       nmap
       ntfs3g
       ntfsprogs
-      nvim
-      nvme-cli
       openhantek6022
       optipng
       pax-utils
       pciutils
-      proxychains-ng
       pstree
       psutils
       qemu_kvm
@@ -66,7 +53,6 @@
       rsync
       silver-searcher
       socat
-      sops
       sshfs
       strace
       swaylock
@@ -84,12 +70,9 @@
       vulkan-tools-lunarg
       vulkan-validation-layers
       wget
-      wirelesstools
-      wol
       xdg-utils
-      xfsprogs
       zip
       z-lua
     ]
-    ++ (with nix-xilinx.packages.${system}; [vivado vitis vitis_hls model_composer xilinx-shell]);
+    ++ (with nix-xilinx.packages.x86_64-linux; [vivado vitis vitis_hls model_composer xilinx-shell]);
 }

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

common/wg_pubkey_proton

@@ -1 +0,0 @@
-g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=

common/wg_pubkey_workstation

@@ -1 +0,0 @@
-kbmzzQc3bBpkjE7K/ohycZtx+ml+dzVYOQ2xM0/bzzQ=

flake.lock

@@ -19,11 +19,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1732722421,
+        "lastModified": 1696426674,
-        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     "flake-compat_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1668681692,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730016908,
+        "lastModified": 1705823474,
-        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
+        "narHash": "sha256-2C4uRe9/U3QwSPC4dYKM1/njgCQk0Mltezy4VcjAqa4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e83414058edd339148dc142a8437edb9450574c8",
+        "rev": "928f2528f9ee952ba0a47bbb1ece8d93ed66e784",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732892167,
+        "lastModified": 1699035130,
-        "narHash": "sha256-AZ0rgM9xj+Bf2C8RfGMUvuVdcqkvQU5/Wm8u6A5xYJg=",
+        "narHash": "sha256-emK4aJCC2gW94b2P3N2LjkQ6PEMLUcDduVWwYQ7aq+o=",
         "owner": "asmir.abdulahovic",
         "repo": "nix-xilinx",
-        "rev": "3071f40914fe2db3837a40a72a97af6f0a442f16",
+        "rev": "0323990db46c32e361e4fd70600d859eb90862af",
         "type": "gitlab"
       },
       "original": {
@@ -125,47 +125,62 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732981179,
+        "lastModified": 1705677747,
-        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
+        "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
+        "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-24_05": {
+    "nixpkgs-22_11": {
       "locked": {
-        "lastModified": 1717144377,
+        "lastModified": 1669558522,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-22.11",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-23_05": {
+      "locked": {
+        "lastModified": 1684782344,
+        "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.05",
         "type": "indirect"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1729973466,
+        "lastModified": 1705033721,
-        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+        "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
+        "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-24.05",
+        "ref": "release-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -177,11 +192,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733261583,
+        "lastModified": 1703195136,
-        "narHash": "sha256-HOVUtrhtJ16umPuEODuVE9fx+JmDCRp7wIxnEART0Eg=",
+        "narHash": "sha256-43mqeJz4zT6rc8zOsY+ycyyKR9P+itTGx5+QinNm1aM=",
         "ref": "refs/heads/master",
-        "rev": "a09a34997ce692c7a2e8e434b44433156a73088c",
+        "rev": "dce3a89665746f3c16a484ccf156fb7b2eac6b3b",
-        "revCount": 38,
+        "revCount": 21,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/nvim_flake"
       },
@@ -221,11 +236,11 @@
         "theme_deepthought": "theme_deepthought"
       },
       "locked": {
-        "lastModified": 1729077289,
+        "lastModified": 1700248599,
-        "narHash": "sha256-z5LEPxOJq2LjhPhY4QE1IOt0lBD39cipR6Lw8vRTNlI=",
+        "narHash": "sha256-oYY+LGxSiuRRxNOkjWWWDyKSxDGV3cvk+leN2K1nml0=",
         "ref": "refs/heads/master",
-        "rev": "eab712e42139d33911ba767c2ff1bfbdf05c254d",
+        "rev": "88ce25f6b4b1817741e9a7c15716da50b6c67c0a",
-        "revCount": 27,
+        "revCount": 25,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/project-cloud"
       },
@@ -255,14 +270,16 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-24_05": "nixpkgs-24_05"
+        "nixpkgs-22_11": "nixpkgs-22_11",
+        "nixpkgs-23_05": "nixpkgs-23_05",
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1722877200,
+        "lastModified": 1703666786,
-        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
+        "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
+        "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4",
         "type": "gitlab"
       },
       "original": {
@@ -279,11 +296,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1729999681,
+        "lastModified": 1705805983,
-        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
+        "narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
+        "rev": "ae171b54e76ced88d506245249609f8c87305752",
         "type": "github"
       },
       "original": {
@@ -299,11 +316,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711800706,
+        "lastModified": 1698401726,
-        "narHash": "sha256-VuClUfWEmuv6Ysf6g42rfIm4cRZ/DWYZJxlNd9f1IL4=",
+        "narHash": "sha256-kGMqxaNaNSbKJS/55KqqMvLj1xOBc8zCizs6I3xiCo0=",
         "ref": "refs/heads/master",
-        "rev": "7422c005ffdd282c389d21c5f8a4ea835bc1a0f0",
+        "rev": "1e49032fbfec10b51c9f627aab286290ac15977c",
-        "revCount": 4,
+        "revCount": 3,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/swaysw"
       },
@@ -359,6 +376,21 @@
         "type": "github"
       }
     },
+    "utils": {
+      "locked": {
+        "lastModified": 1605370193,
+        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "zremap": {
       "inputs": {
         "nixpkgs": [
@@ -366,17 +398,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1721120316,
+        "lastModified": 1696448728,
-        "narHash": "sha256-CaAMnU6LKqJrsZmR9k0/2brpULnAekpgG5S0BjtFhaQ=",
+        "narHash": "sha256-kUc6983IX9n0eQxTFZRK7LYCLHoxoGZ5rOV7nu8hGRI=",
-        "ref": "refs/heads/master",
+        "owner": "asmir.abdulahovic",
-        "rev": "8a7923bd4e5d36b186408d5432568a91ac67b695",
+        "repo": "zremap",
-        "revCount": 21,
+        "rev": "9043844893cfc333ed04d04c1d3b67d9904c0afc",
-        "type": "git",
+        "type": "gitlab"
-        "url": "https://git.project-cloud.net/asmir/zremap"
       },
       "original": {
-        "type": "git",
+        "owner": "asmir.abdulahovic",
-        "url": "https://git.project-cloud.net/asmir/zremap"
+        "repo": "zremap",
+        "type": "gitlab"
       }
     }
   },

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:connorfeeley/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,
@@ -66,11 +72,10 @@
     pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
   in {
     nixosConfigurations = rec {
-      nixy = nixpkgs.lib.nixosSystem rec {
+      nixy = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
-          {_module.args.system = system;}
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./common/packages.nix
           ./common/suspend.nix
@@ -82,8 +87,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs system;};
+            home-manager.extraSpecialArgs = {inherit inputs;};
-            home-manager.backupFileExtension = "home_backup";
           }
           peerix.nixosModules.peerix
           {
@@ -100,11 +104,10 @@
         ];
       };
 
-      mediabox = nixpkgs.lib.nixosSystem rec {
+      mediabox = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
-          {_module.args.system = system;}
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./common/packages.nix
           ./common/suspend.nix
@@ -117,7 +120,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs system;};
+            home-manager.extraSpecialArgs = {inherit inputs;};
           }
           peerix.nixosModules.peerix
           {
@@ -134,11 +137,10 @@
         ];
       };
 
-      blue = nixpkgs.lib.nixosSystem rec {
+      blue = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
-          {_module.args.system = system;}
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./blue/configuration.nix
           ./blue/hardware-configuration.nix
@@ -148,20 +150,18 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs system;};
           }
         ];
       };
-      magpie = nixpkgs.lib.nixosSystem rec {
+      magpie = nixpkgs.lib.nixosSystem {
-        system = "aarch64-linux";
+        system = "arm64-linux";
         modules = [
           {_module.args = inputs;}
-          {_module.args.system = system;}
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./magpie/configuration.nix
           ./magpie/hardware-configuration.nix
-          simple-nixos-mailserver.nixosModule
           sops-nix.nixosModules.sops
+          simple-nixos-mailserver.nixosModule
           (builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")
         ];
       };

home/home.nix

@@ -1,12 +1,11 @@
 {
-  lib,
   pkgs,
+  config,
+  lib,
+  inputs,
   ...
-}: let
+}:
-  qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
+with lib; {
-    firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
-  '';
-in {
   imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
 
   home.stateVersion = "22.11";
@@ -18,7 +17,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,15 +28,14 @@ in {
   fonts.fontconfig.enable = true;
 
   home.sessionVariables = rec {
-    BROWSER = lib.getExe qutebrowser_firejail;
+    BROWSER = "${pkgs.qutebrowser}/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";
+    #WLR_RENDERER = "vulkan";
   };
 
   wayland.windowManager.sway = {enable = true;};
@@ -143,7 +140,7 @@ in {
 
     qutebrowser = {
       enable = true;
-      package = qutebrowser_firejail;
+      package = pkgs.qutebrowser.override {enableVulkan = false;};
       keyBindings = {
         normal = {
           "j" = "scroll-px 0 25";
@@ -182,7 +179,6 @@ in {
       userName = "Asmir A";
       userEmail = "asmir.abdulahovic@gmail.com";
       extraConfig = {
-        init.defaultBranch = "master";
         pull = {rebase = true;};
         credential = {helper = "store";};
       };
@@ -203,7 +199,6 @@ in {
   services = {
     lorri.enable = false;
     mako.enable = true;
-    cliphist.enable = true;
     gammastep = {
       enable = true;
       latitude = "44.53";
@@ -218,13 +213,14 @@ in {
       enable = true;
       defaultCacheTtl = 1800;
       enableSshSupport = true;
+      pinentryFlavor = "curses";
     };
 
     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"
+        ${pkgs.grim}/bin/grim -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
-        ${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
+        ${pkgs.swaylock}/bin/swaylock -f -i "$TMP_FILE"
         ${pkgs.coreutils}/bin/rm "$TMP_FILE"
       '';
     in {
@@ -250,37 +246,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 = {

home/home_packages.nix

@@ -1,50 +1,12 @@
 {
-  lib,
+  config,
   pkgs,
   inputs,
-  system,
   ...
-}: let
+}: {
-  chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
-    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
-  '';
-  chromium_discord = pkgs.writeShellScriptBin "chromium_discord" ''
-    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
-  '';
-  chromium_stackfield = pkgs.writeShellScriptBin "chromium_stackfield" ''
-    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
-  '';
-  qcad = pkgs.writeShellScriptBin "qcad" ''
-    QT_QPA_PLATFORM=xcb ${lib.getExe pkgs.qcad} $@
-  '';
-  ssh_proxy = pkgs.writeShellScriptBin "ssh_proxy" ''
-    if ${pkgs.coreutils}/bin/test $# -ne 1; then
-      echo "Usage: $0 <user>@<ssh_host>"
-      exit
-    fi
-    PROXY_PORT="1337"
-    ${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
-  '';
-  wrap_sh = let
-    bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
-  in
-    pkgs.writeShellScriptBin "wrap.sh" ''
-      if ${pkgs.coreutils-full}/bin/test $# -ne 1; then
-        echo "Usage: $0 <directory>"
-        exit
-      fi
-      FULL_PATH=$(${pkgs.coreutils-full}/bin/realpath "$1")
-      BUBBLEWRAP_DIR="$1" ${bubblewrap}/bin/bwrap \
-        --bind / / \
-        --dev /dev \
-        --overlay-src "$FULL_PATH" \
-        --tmp-overlay "$FULL_PATH" \
-        "$SHELL"
-    '';
-in {
   home.packages = with pkgs;
     [
-      anydesk
+      alejandra
       appimage-run
       arp-scan
       birdtray
@@ -54,16 +16,12 @@ in {
       cached-nix-shell
       caddy
       cargo
-      ungoogled-chromium
+      ccls
+      cemu
       cmake
       compsize
-      /*cura*/
+      cura
       deluge
-      dfu-util
-      discord
-      dmenu-wayland
-      drawio
-      dualsensectl
       ffmpeg-full
       firefox
       freecad
@@ -75,9 +33,7 @@ in {
       gnumake
       go
       grim
-      heimdall
       hyperfine
-      icestorm
       imagemagick
       imv
       inkscape
@@ -87,85 +43,77 @@ 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
-      pass-wayland
       patchelf
       pavucontrol
-      pay-respects
       pirate-get
       poppler_utils
       powertop
       pulsemixer
-      pwvucontrol
       python3
       python3Packages.west
       remmina
       river
       rtorrent
-      sbcl
+      rustc
       screen
       seer
       sioyek
       skypeforlinux
       slurp
-      steam-run
       stm32cubemx
-      swayimg
       tea
-      teams-for-linux
-      tectonic
-      tessen
       texlive.combined.scheme-full
       thunderbird
-      typst
       upx
       waybar
       wdisplays
-      weechat
       whatsapp-for-linux
-      wine
       wireshark
       wl-clipboard
       wlr-randr
       wofi
       x2goclient
       yewtube
-      yosys
       yt-dlp
-      zapzap
       zathura
-      /*zeal-qt6*/
+      zeal-qt6
       zig
+      zls
+
+      /*
+      install here until nvim flake is fixed
+      */
+      alejandra
+      ccls
+      gopls
+      luaformatter
+      nixd
+      pyright
+      rust-analyzer
+      sumneko-lua-language-server
+      svls
+      texlab
+      tree-sitter
+      verible
+      zls
     ]
     ++ [
-      chromium_discord
+      inputs.swaysw.packages.x86_64-linux.swaysw
-      chromium_stackfield
+      inputs.nvim.packages.x86_64-linux.nvim
-      chromium_teams
+      (pkgs.callPackage ../packages/zapzap/default.nix {})
-      ssh_proxy
-      wrap_sh
-      qcad
-    ]
-    ++ [
-      inputs.swaysw.packages.${system}.swaysw
       (pkgs.callPackage ../packages/viber/default.nix {})
       (pkgs.callPackage ../packages/bubblewrap/default.nix {})
     ];

home/i3.nix

@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   pkgs,
   ...

home/i3status-rust.nix

@@ -1,4 +1,9 @@
-{...}: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   programs.i3status-rust = {
     bars.top = {
       icons = "awesome5";
@@ -18,15 +23,7 @@
         }
         {
           block = "disk_space";
-          path = "/nix";
+          path = "/";
-          info_type = "available";
-          interval = 20;
-          warning = 20.0;
-          alert = 10.0;
-        }
-        {
-          block = "disk_space";
-          path = "/home";
           info_type = "available";
           interval = 20;
           warning = 20.0;
@@ -42,11 +39,6 @@
           device = "enp5s0";
           interval = 2;
         }
-        {
-          block = "net";
-          device = "enp7s0f3u1u1";
-          interval = 2;
-        }
         {
           block = "net";
           device = "eno1";

home/sway.nix

@@ -1,29 +1,12 @@
 {
   config,
-  pkgs,
-  inputs,
-  system,
   lib,
+  pkgs,
   ...
-}: let
+}: {
-  cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
-    ${lib.getExe pkgs.cliphist} list | \
-    ${lib.getExe pkgs.wofi} --dmenu --insensitive | \
-    ${lib.getExe pkgs.cliphist} decode | \
-    ${pkgs.wl-clipboard}/bin/wl-copy
-  '';
-  screenshot_clip = pkgs.writeShellScriptBin "screenshot_clip" ''
-    GEOM="$(${lib.getExe pkgs.slurp} -d)"
-    ${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
-  '';
-  swaysw = inputs.swaysw.packages.${system}.swaysw;
-  viber = pkgs.callPackage ../packages/viber/default.nix {};
-  term = "${pkgs.foot}/bin/footclient";
-in {
   wayland.windowManager.sway = {
     enable = true;
     extraSessionCommands = "";
-    extraConfigEarly = '''';
 
     config = {
       fonts = {
@@ -50,8 +33,8 @@ in {
       modifier = "Mod4";
       output = {
         eDP-1 = {
-          /*
           bg = "~/pic/wallpaper stretch";
+          /*
           scale = "1.4";
           */
         };
@@ -75,16 +58,14 @@ in {
             style = "Bold Semi-Condensed";
             size = 12.0;
           };
-          statusCommand = "${lib.getExe pkgs.i3status-rust} ~/.config/i3status-rust/config-top.toml";
+          statusCommand = "i3status-rs ~/.config/i3status-rust/config-top.toml";
         }
       ];
 
       keybindings = {
         "Alt+Shift+q" = "kill";
-        "Alt+Shift+Return" = "exec ${term}";
+        "Alt+Shift+Return" = "exec ${pkgs.foot}/bin/footclient";
-        "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";
 
         "Alt+Shift+space" = "floating toggle";
         "Alt+space" = "focus mode_toggle";
@@ -119,19 +100,21 @@ in {
         "Alt+j" = "focus down";
         "Alt+k" = "focus up";
         "Alt+l" = "focus right";
-        "Alt+slash" = "exec ${pkgs.moreutils}/bin/lckdo swaysw ${swaysw}/bin/swaysw";
+        "Alt+slash" = "exec 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}'';
+          exec swaymsg [app_id="python3"] scratchpad show || exec foot -a python3 python3'';
-        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
+        "Mod4+h" = "exec swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec zapzap";
-        "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
+        "Mod4+j" = "exec swaymsg [app_id=com.viber] scratchpad show || exec viber";
         "Mod4+y" = ''
-          exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}'';
+          exec swaymsg [app_id="pulsemixer"] scratchpad show || exec foot -a pulsemixer pulsemixer'';
-        "Mod4+p" = "exec ${lib.getExe pkgs.tessen} -a copy";
+
+        "XF86AudioRaiseVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') +5%";
+        "XF86AudioLowerVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') -5%";
+        "XF86AudioMute" = "exec pactl set-sink-mute $(pacmd list-sinks |awk '/* index:/{print $3}') toggle";
+        "XF86AudioMicMute" = "exec pactl set-source-mute $(pacmd list-sources |awk '/* index:/{print $3}') toggle";
       };
     };
   };

home/whatsapp-for-linux.nix

@@ -1,4 +1,9 @@
-{lib, ...}:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib; {
   xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" (
     generators.toINI {} {

home/zsh.nix

@@ -1,4 +1,9 @@
-{pkgs, ...}: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   programs.z-lua = {
     enableAliases = true;
     enableZshIntegration = true;
@@ -17,7 +22,6 @@
       cp = "cp -v";
       rm = "rm -v";
       ip = "ip --color=auto";
-      f = "''$(pay-respects zsh)";
     };
 
     history = {
@@ -38,13 +42,18 @@
         src = pkgs.nix-zsh-completions;
         file = "share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh";
       }
+      {
+        name = "fast_syntax_highlight";
+        src = pkgs.zsh-fast-syntax-highlighting;
+        file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
+      }
       {
         name = "pure_prompt";
         src = pkgs.fetchFromGitHub {
           owner = "sindresorhus";
           repo = "pure";
-          rev = "a02209d36c8509c0e62f44324127632999c9c0cf";
+          rev = "87e6f5dd4c793f6d980532205aaefe196780606f";
-          hash = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
+          hash = "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w=";
         };
         file = "pure.plugin.zsh";
       }
@@ -94,10 +103,6 @@
 	TMUX_EXE="${pkgs.tmux}/bin/tmux"
         systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER
       fi
-
-           if [[ -n "$BUBBLEWRAP_DIR" ]]; then
-      RPS1="{{$BUBBLEWRAP_DIR}}"
-           fi
     '';
   };
 }

magpie/configuration.nix

@@ -3,62 +3,41 @@
   pkgs,
   lib,
   project-cloud,
-  nvim,
+  goatcounter,
-  system,
   ...
 }: {
   imports = [];
 
   nix.optimise.automatic = true;
   nix.settings.experimental-features = ["nix-command" "flakes"];
-  system.switch = {
-    enable = false;
-    enableNg = true;
-  };
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.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)
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC0gyN7DzF7+sinneq7++fT93dNWe9ttKnLZJEb0LVs7UxPtz/ovlxnktAgEtSh7NUUGKPILGG6+YG/Jz3pb4cLuQHtavIQ2mIzIbiNl+c80gLNPulfOrC3KyCacYnlcEpoV+4yvMPLDf+5ySilYoF30CSIo8B7B4PSwO3/I20oXXY0zeVmYKs65BY8OrR8PDdtPpuqGcTdPpVSrooZQoykriFeejBb0Jn7qWO7vmsTyUZZIP4nKKUyqE6iFZ2zv+J3mYfuoglQKO1+kqcCYCef0sheLZGD4/QIIL8HJ9yNWb6OQhu7MEv1NowuHkviImwVO3actZ1/x4lrWt4mY+bGglVwA90u1KZUQ10qKQ2xCG2ZHE9DSxWxpI/Yq2P4pLA/XSkYFPpzmoD9c6cpv0WLAvmQrEVkqK0xXo+KszUlyGy5sVJl7/h1fZ8YhWsWUnU1XJFmKLaomUZflL3h7X6xJNVPzZmso8l1INdCvIBDu+G84kAp1/aFalSJMyjTgvCc1hxhAVYhmrc3msGH0Jk8CcPBwYa0BH4EryacdupOS/c5VxAbdyuizEgitP1ylRmydVVDEItPNXFvpWdyEehf/VmsUXqL48mBzfvi6feD5AzKjPaQNaATpxLs9Sl9CMxSy27ahHwEK6dek1wm7nkoSIDSRWfGhYKr3lUg0emAYQ=="
   ];
 
   environment.systemPackages = with pkgs; [
+    alejandra
     curl
     fd
     file
     fzf
     fzy
     git
-    nvim.packages.${system}.nvim
     htop-vim
-    nvim
     pciutils
     tig
     tmux
@@ -69,6 +48,11 @@
   ];
 
   programs.mosh.enable = true;
+  programs.neovim = {
+    enable = true;
+    vimAlias = true;
+    viAlias = true;
+  };
 
   mailserver = {
     enable = true;
@@ -98,12 +82,6 @@
   services.logind.extraConfig = ''KillUserProcesses=yes '';
   services.openssh.settings.PermitRootLogin = "prohibit-password";
   services.openssh.enable = true;
-  services.openssh.listenAddresses = [
-    {
-      addr = "10.100.0.1"; # wireguard
-      port = 22;
-    }
-  ];
   services.opendkim.enable = true;
 
   services.miniflux = {
@@ -115,21 +93,34 @@
     };
   };
 
+  services.restya-board = {
+    enable = true;
+    virtualHost.serverName = "board.project-cloud.net";
+    virtualHost.listenHost = "localhost";
+    virtualHost.listenPort = 4001;
+  };
+
   services.goatcounter = {
     enable = true;
-    port = 8002;
+    environmentFile = "/var/lib/goatcounter.env";
-    proxy = true;
+    extraArgs = ["-listen='*:8002'" "-tls=none" "-debug=all"];
-    address = "127.0.0.1";
+    database = {
+      automigrate = true;
+      backend = "postgresql";
+      name = "goatcounter";
+      user = "goatcounter";
+      passwordFile = "/var/lib/goatcounter.passwd";
+    };
   };
 
   services.nextcloud = {
-    enable = false;
+    enable = true;
-    package = pkgs.nextcloud28;
+    package = pkgs.nextcloud27;
     config.adminpassFile = config.sops.secrets."nextcloud_admin".path;
     configureRedis = true;
     hostName = "cloud.project-cloud.net";
     https = true;
-    settings = {
+    extraOptions = {
       mail_smtpmode = "sendmail";
       mail_sendmailmode = "pipe";
       enabledPreviewProviders = [
@@ -163,24 +154,19 @@
 
     virtualHosts."project-cloud.net" = {
       quic = true;
-      http3 = true;
       forceSSL = true;
       enableACME = true;
-      root = "${project-cloud.packages.${system}.default}/public";
+      root = "${project-cloud.packages.aarch64-linux.default}/public";
     };
 
-    /*
     virtualHosts.${config.services.nextcloud.hostName} = {
       quic = true;
-      http3 = true;
       forceSSL = true;
       enableACME = true;
     };
-    */
 
     virtualHosts."miniflux.project-cloud.net" = {
       quic = true;
-      http3 = true;
       forceSSL = true;
       enableACME = true;
       locations."/" = {
@@ -190,17 +176,24 @@
 
     virtualHosts.${config.services.gitea.settings.server.DOMAIN} = {
       quic = true;
-      http3 = true;
       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}";
+      };
+    };
+
+    virtualHosts."board.project-cloud.net" = {
+      quic = true;
+      forceSSL = true;
+      enableACME = true;
+      locations."/" = {
+        proxyPass = "http://localhost:${toString config.services.restya-board.virtualHost.listenPort}";
       };
     };
 
     virtualHosts."stats.project-cloud.net" = {
       quic = true;
-      http3 = true;
       forceSSL = true;
       enableACME = true;
       locations."/" = {
@@ -222,7 +215,6 @@
       DISABLE_SSH = true;
       HTTP_PORT = 3001;
       LANDING_PAGE = "explore";
-      PROTOCOL = "http+unix";
     };
     settings.mailer = {
       ENABLED = true;
@@ -245,45 +237,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;
-  services.nfs.server.extraNfsdConfig = ''
-    rdma = true
-    vers3 = false
-    vers4.0 = false
-    vers4.1 = false
-  '';
-  services.nfs.server.exports = ''
-    /export/nixy    10.100.0.1/24(rw,nohide,insecure,no_subtree_check,all_squash,anonuid=1000,anongid=100)
-  '';
-
-  services.borgbackup.jobs."borgbase" = {
-    paths = [
-      "/var/lib/gitea"
-    ];
-    exclude = [];
-    repo = "ssh://na9fqv67@na9fqv67.repo.borgbase.com/./repo";
-    encryption = {
-      mode = "repokey-blake2";
-      passCommand = "${pkgs.coreutils-full}/bin/cat ${config.sops.secrets."borgbase_enc_key".path}";
-    };
-    environment.BORG_RSH = "${pkgs.openssh}/bin/ssh -i ${config.sops.secrets."borgbase_ssh_key".path}";
-    compression = "auto,zstd";
-    startAt = "daily";
-  };
-
-  services.seafile = {
-    enable = false;
-    initialAdminPassword = "admin";
-    adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
   };
 
   /*
@@ -300,82 +253,39 @@
     defaults.email = "asmir.abdulahovic@gmail.com";
   };
 
-  sops = {
+  sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
-    age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+
-    secrets = {
+  sops.secrets."miniflux_env" = {
-      "asmir_mail_pw_hash".sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
+    sopsFile = ./secrets/miniflux.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;
+  sops.secrets."gitea_mail_pw_hash" = {
-      "miniflux_env".sopsFile = ./secrets/miniflux.yaml;
+    sopsFile = ./secrets/gitea_mail_pw_hash.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;
+  sops.secrets."asmir_mail_pw_hash" = {
-      "wg_privkey".sopsFile = ./secrets/wg_privkey.yaml;
+    sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
-      "gitea_db" = {
+  };
+
+  sops.secrets."gitea_db" = {
     sopsFile = ./secrets/gitea_db.yaml;
     owner = config.users.users.gitea.name;
   };
-      /*
+
-      "nextcloud_admin" = {
+  sops.secrets."nextcloud_admin" = {
     sopsFile = ./secrets/nextcloud_admin.yaml;
     owner = config.users.users.nextcloud.name;
   };
-      */
-    };
-  };
-
-  networking.hostName = "magpie";
 
   networking.firewall.enable = true;
-  networking.firewall.allowedTCPPorts = [80 443 587 2049]; # http, mail, mail, nfs
+  networking.firewall.allowedTCPPorts = [80 443 587];
-  networking.firewall.allowedUDPPorts = [443 51820]; #mail, wireguard
+  networking.firewall.allowedUDPPorts = [];
   networking.firewall.allowPing = true;
   networking.firewall.logRefusedConnections = lib.mkDefault false;
-
+  networking.hostName = "magpie";
-  networking.nat.enable = true;
-  networking.nat.externalInterface = "enp1s0";
-  networking.nat.internalInterfaces = ["wg0"];
-
   networking.networkmanager.enable = true;
   networking.wireless.enable = false;
 
-  networking.wireguard.interfaces = {
-    wg0 = {
-      ips = ["10.100.0.1/24"];
-      listenPort = 51820;
-
-      # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
-      # For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients
-      postSetup = ''
-        ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE
-      '';
-      # This undoes the above command
-      postShutdown = ''
-        ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE
-      '';
-      privateKeyFile = config.sops.secrets."wg_privkey".path;
-
-      peers = [
-        {
-          publicKey = builtins.readFile ../nixy/wg_pubkey;
-          presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path;
-          allowedIPs = ["10.100.0.6/32"];
-        }
-        {
-          publicKey = builtins.readFile ../mediabox/wg_pubkey;
-          presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path;
-          allowedIPs = ["10.100.0.5/32"];
-        }
-        {
-          publicKey = builtins.readFile ../common/wg_pubkey_workstation;
-          presharedKeyFile = config.sops.secrets."wg_preshared/workstation".path;
-          allowedIPs = ["10.100.0.4/32"];
-        }
-      ];
-    };
-  };
-
   systemd = {
     enableEmergencyMode = false;
 

magpie/hardware-configuration.nix

@@ -2,7 +2,9 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
+  config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {

magpie/secrets/asmir_mail_pw_hash.yaml

@@ -8,20 +8,11 @@ sops:
         - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOS3RoalBRQTB5Mkp4THpa
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKbTM0ZzVHZ1hlNzJ6d25a
-            aG9jS0UraEJlWHlVRFBWNWNJNGVOd0hxdUZBCm10OWwramN3UGdLUFpwbkduaU16
+            eFpZMHdBZjBFSjU4L0dkK1Noby9HK29CMldNCkJWb2NmcC9jNVFBMWJOZjVBalRw
-            S1FWcHIrK0dKRTAvSlN4SlI3eHJJL3cKLS0tIFljS3oxWXZyRlFEVUdUYXRsc2x4
+            VVZsN3B1WGJseDFiRTA1R3cvU3c2NEEKLS0tIFI4WHFDRHBCN29IQ0tPVC9zbHZS
-            N1h6SFYrcTZQK1JSRWZsV2MvTGFwb0kKxRohlU6vR3CR2SGqDT9P8AxQXMSbpQuO
+            OFdsQUpvRzNKc2x1WW13b2d4R3lxdXMKJeMJ1IdxS+WUTzUlFdc4WfnUozWU4/80
-            g1t6gj3c+YBugUsCMuNpYEE+8OvfSQmsZV0VHojS8dMHSD9x75237w==
+            9GBPz3VCppunrXrh1zFkfIL+Lz48HFyf7HNI4na6TkyqipR6wsW4gw==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2bnFpZzB2b21YVEZtenBj
-            TlkxdVlSWmM3dDNnQmxqQm5FWlQ0ZHhySGg0Cll1andBcE0yZ04zaFZlajBDSDUx
-            VHRWbFVOeE1CZmlveTB0UEpjZUpzMEEKLS0tIE5tcVFuaWt6K2RKR3FodGYra25n
-            bHNWWmh1dFdJVGtETWYvZDY1TGpvUVkKu4sO+/OXdV4xsLmOMlbV5nIidX+iREgF
-            q0IavI9nzOZ0tkWSV/9mFua8Mp1vPW8wCBOqnW3nhPvYDoTbGQEovQ==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-10-20T19:31:29Z"
     mac: ENC[AES256_GCM,data:xXiCems/1em6JdK3V5GcD811yc8t6iHHFmz0OOrWM3muR807Ux80TrD3uoMN8GxIMyr0AloH41k8+vxaSlMmHsGGl6o1P13aR03E+A9ZLp1W2Nb3nCy5rH4pF8WSeNMxZ1SoT2iEAtTsh29xusocQTMUvr7Ou8TDLyVvrKhBPZw=,iv:SSPpVTbVQTvhPg1qm9akrg2ji1fRcukkwX5P2FzWMb4=,tag:a6GiGWfwnKLtteVoi9DJtQ==,type:str]

magpie/secrets/borgbase_enc_key.yaml

@@ -1,30 +0,0 @@
-borgbase_enc_key: ENC[AES256_GCM,data:bnSjKRY6HlmOyhjyuJLH8Xqzzpm7NgZI5g==,iv:RYlg83PqV2DIQHa5FoD6ls/utVjuSwmrv56N6Lrtn8s=,tag:hC6e9d5/EH9V7kG23XblEQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCdm1lejdSTm1PN1dsWHNJ
-            Nzc5aERNUlk5U0VoNWRzcVlMSXpqSEFmYkVNCkhqeHZrMng4WjEzcnBxdmtVUWlz
-            NXhiNFB6Ukc2eGRiNW96YVloQyt0ZW8KLS0tIFhjUVlITVVTcktCTzEzdUJzTmsy
-            UVhGc2VKeFJmS3RUY2YrR2FVVlVOcDAKsl+Fo16/3PpQ35aF4EBq5kjpyNxnZfip
-            1sfq1ppUfg6QRRICWtxUyXLS898BVusW8cMft6k9JbgZfQnc9YUSBg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhMTZhdm1mVXhWdlNJVytR
-            Z3ROLzNnZHUvMXRUcCtPeFFBRWJxY3lyRWljCkErdXAxc3ZETFMxd3ZCRHJPY2JU
-            N1YxL0VJZ1M0eUdEblhrTDd2VWNNRVUKLS0tIFRBTGNKUDUxaDdGK2x4aWIxMm9i
-            Zit1QTdRTjVNdjhFYklEUVlsQjZCM2cKtutM+au5vNF0x9ZP9Cg4pMUGsScIMRFU
-            KYrBHGW+VfEDpr534X8FXe1Uox70U+HPoT/mEm4RF575ssbTSoW0Hg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-05T19:01:07Z"
-    mac: ENC[AES256_GCM,data:Fz1ZwYR7cg+bcgNe/JZ2oEqhYihQWnCoy3J76VIPb089PNCXXp0xJ/eYjOoKlGK42z1wEO8hJ8FoaLvzuqhO0aatKpHDx0bBos8YqZYuGAuW115AdK5m6ecby7yi5lBIBpXOv1sU8uOtdBR32UPFAQ9oQf0KleWju47phF43v9o=,iv:Lbu5eLKfEnrehSY1+r0z75pZnNDNEVSmrEaJRDpDTU4=,tag:TLdtQTNbo0dxlpV9ZPm+uQ==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

magpie/secrets/borgbase_ssh_key.yaml

@@ -1,30 +0,0 @@
-borgbase_ssh_key: ENC[AES256_GCM,data:W/aAQPSaPxGPeY50arJr50OWZjN+RJt9Y4MlpPNtw3KT2y+fUuMpNAjMuGd+3mzA2bs9YpE2WlgJ7KO5XPH7M36tSI+K2pcnjX1NMl8giJ952iCsqW4siij64JguK/gUi3GAe3LXHTjr3VgubSdqVd25k0bys+GiMfsHXXGD6tinKmEheis6XgfcChrvyYgQ4DKPW4HOHC4/V6roXaK+GTe+qY0BdzM27cDHc3a85cuHAAeDnYdNfdRAItI3KmDCx8edeBwt4vonR/v9AaDRH2PjZWq583Rlqoa8TQvQi0+yWf6O6MikHQlP1GoYCe5iI+rOF6KTseDjS2aoLZ+mXNxVmmOVdZrq1vx0UpsbJWRZE+1UluQwdrEm1mLMrI4Z2wFNfzjg9rOiJ36AL1YdcXtI0RHLYp8r92Qt3IFVwcC1NT/AWJkFOGr5z0PX0w+mi4J+f1wDvVguXp2KaguB2XAJbnpgQQ2ZqYv0gTkBLZ/RAOyQgaMaESCfJBWXE3DESMOspj4AYUsjQiaxmF13,iv:ph++5hCX3DzqwCoObz73/Xn0qy/+Za5+DI/EVsc67yY=,tag:0VkALd0j3D6yA7jCE7vogg==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAydXE0RXhGU0tsbnRTU0pw
-            THZBNngvUEwwMGVTQ3dscCtKMnVCb1pSSzN3CkVzNS9UY3dqYWRDOENTaFhadFcz
-            MGlibCt5Q3ppelVQU1AyM0wvTm1zMXMKLS0tIHNGM291dE5lb2pwTDFWbWtiUFNp
-            Y1ZoSG43TFd0WktKY3lUM3Y0RHJHZVkK0/sD5M54XiQzkSMlDHPkSVMypoxdhU/f
-            0nUWA20s6IU63Oqn0j7rGwV6S5j+fZCBzF4kSi8JLJb0619G2++M5g==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiem5ZRE1oRU1hWENzc2sv
-            dkg4czhVeVNJQllnWG9vYnptL1FhZy9zc0hBClhLRzQxNlhQUEVUcnZDYlZqTWYx
-            eDQzV2ozbkd6ZWVZNWkxOXhBV0JNR00KLS0tIFQ4d29OQzhoWTl0Z3BrOURTSktU
-            SHZNdFhmS3ZQMnhzMDJWMTl4cXNudFEKhgbRW+6xqGhkTtr4h4JzPxZnGKqr4jcX
-            BABLTgzqvM+JvBzmUcYjuagVcLpWsQcNWBaYFBJBMhP8oOgF2dVBcQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-05T20:03:21Z"
-    mac: ENC[AES256_GCM,data:YpXUK6UNKpdudVZ+YManWreHufFzw9XbF1cBYutdAaTdqhlzPErpuOmEKLuMA7nr7SQkLK4pu1Eg0P5CA3QXsh0VUHMTiFWxNz7KZeoYAkacK9WzutEldsMG4iVlKmGHhQApSNW4kfPBKs1TgYyZdndBHEdILcoLDxke8kfkoVU=,iv:rpNeNTfXoMpScSfyrY7uK9ZkKasJGVAhgiMoe0XyJFo=,tag:Rl4Ya+iq0BvMSM/J0wySnQ==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

magpie/secrets/gitea_db.yaml

@@ -8,20 +8,11 @@ sops:
         - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUUXAraFhvN0NLeHhKWGJt
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKZ3l1UTRDMFVlM01TR1dW
-            c2ttRGljUzZiN2ZJeWpTdVRzNCtzL0pqdHhnCmJvek9YNkF4UTd1ZEFSaDBJR1Jz
+            VzNnRXpuc0R0d3BpVzZveHRrdHRTTVRXNWpnCjVqNittd3BiZ0d3YXVQUXBpWExU
-            ZkUwTFNEYkhmbS9DVUJ0cTNrTVR5TlkKLS0tIFdscFJCaTJjYXFPcVZXUXBPS2ph
+            cGdkSmVtOHJBN3FEdDVCeTVjUllHc0EKLS0tIG5TQlpIQXhNNmJiR0Y3L1p3SVpG
-            bERTT1dsaStRQnRvb1VnV2lTdGNQd0UK3dXTtGkfxq7oLzDrxFomE0oAjgZo+7H7
+            ZnlvRDRUam5MaFdZcGgyZlJSZzMvVWcKxiwENpP7qlF0Uy7DJM0WwLFQ0h+ost5T
-            SVVxKy/caewOXbI3R/CHxuaYb0fDDlyIX/zqxqkSaXUIh4rsIT46xw==
+            BCsZtGP61Z2WcQq0EWYLqJItR2Tk3AXox014CJAm+G/G8PMTAKv0xw==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCOFFtQUptR2xIcW5FS3JR
-            aUdLbGRJeU4rbFFVcU9HVVdYL293WXY0L3hvCmpPN1BnRDlZNDhOT25zVFRjaGE1
-            TThWQUVDOG5YOGtlRmU1T1pZZ1dxTHcKLS0tIHZSUTBDbFN5eXZPMHZvZ2UwMFJu
-            cjhmWGJIUEhZQjNXN3J6ZTk1aE1jZHMKjiwLd6gHiLJx63AIzM17C3RaEBbCFIyI
-            ppLWEw8cm53hvjCuxsY8jJ/5kHD+25Pw2NMAD5PKt8SjrJzrJcOtMA==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-10-17T21:16:10Z"
     mac: ENC[AES256_GCM,data:EPiLv8IzVXqRan9UlBuA3TmxtB3f4Qj4owed+1Pat9Tih1yOe4Z9RT28JIYJQ70R/IK+Yi0NQem9Ec6HU+8kaxLE3fff/4PM+B9QQbB6fjgLFod/nFk+OuWgR7FTcJ2j16OnlxE5ikCP+qdfvAM0eEv+BoDrWv98gSyCXtMCe48=,iv:th0E7zioz7gtgMlns8kvnf5hmlRH0KX65wPxBi3YP6Y=,tag:JhoGvF8LJmrAQpUOEopohA==,type:str]

magpie/secrets/gitea_mail_pw_hash.yaml

@@ -8,20 +8,11 @@ sops:
         - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrL2YxU2VhNTArQ0QwYzlU
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCT2VyNWxUeUZ5aDdHcXJR
-            Z0NSRm5KRU8xRmZCT1E1N09KY2Vob0lsQ2k0CktqTlZnaUVNaEhpT3BkOGNmN2cv
+            WGJVOGgyeC83MEV4REpGZkRUcVJKZDBqYmtjCllQdFhyRWNiTURYQmpucndFWDlr
-            Z0JoaFFTTzBwNzVmcHNOeXdwVzdQOTQKLS0tIDluazF6RXA0MVYvY2dRRGkxMGRk
+            WUFybGtmckNBdXYzMVZxT3lQM1k3aTgKLS0tIEpNZjU1RkpSOVo3Y1ovR0lmbHJu
-            UEltOVNQdElpRGJVVlpoTVV2bU5rSncKoSGq75dVH7j/hSnqdjgWJyDgg0doEr6K
+            bENVWmpCcTVqMDh2Wjhob2I2VzRRblkKPGCV1gRyihDCStM4tmvp89d996v1UzdJ
-            anD9sghKSX0afZmVJFOCXZ+lRYi7kmRbqFNBkkuuFndERtbN/5foXw==
+            /NyK49//+uJJqwCEWuvHWWCB+EbkkOE6gPPKXZyXZSTbb/TDDcVF/Q==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByNW9UcERVditoUE1DVUsw
-            WmxtbVNHeVpQS0g2WENJWTVJeHNUMU4yZEVNCnNrSnFnU2hUckxlYjJMYk5CTW9j
-            eU9mU1F4WlY1NWdLU0VxaDVtZWduaXcKLS0tIExtRHJkbFBKTWRjSGZOWGc1U0FF
-            ZjJkY0FpQnhCazVVVG1DOUZsQ2lXYzgK3UWDBu/Aq7n6CQiRF4NOQdSD4nfU2Gm2
-            Tlzyou5rj/rSAv5J7ENsDAzKtK6e5+Xe7acUDY+4Rye82vDxyoblaQ==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-10-14T21:21:12Z"
     mac: ENC[AES256_GCM,data:NE9btXZKE3KJmxtWc0Ytb0atfBJKRs5T+Xk9RDFX6veSGBoB+M2+YMCONQdr8T2w6lLJqlrMBHqlfuvD3YnDj041xZmfSsi9NACliWj6GWVWcFWWc6W9OVH8/5CfwjYBdgTJ2o7wdnF9fYHvwMRcaHThDmoUkaExVtVsyu912og=,iv:kyekfEq32GSKVNKy8MJYfT5ZMKNSRQUk1viB2W6k29U=,tag:7ie/2P/F3bPQXpkWGKqTfA==,type:str]

magpie/secrets/miniflux.yaml

@@ -8,20 +8,11 @@ sops:
         - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0K0ZNSWEweUNTbm5KZE5y
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpZ1d3aGhud0UyOVV6Vzcw
-            M3ZlbTdBc1RheHFNbGpxZllRdi9tMXVJaEFJCmdQdWh6cks5L3JFclJYWmlkYmVv
+            Q3Q2OVRQOEpXUk1TK2dOOEZtKzNlUkJGZHh3CmJwYnRpWFhJWHZXQ2I1TnhKWDRx
-            WDA2YXhiN3ovL1V0ZlJjbmluSm5tbGMKLS0tIG1QRnoxMHBQeGtLekRSRVVMNWdP
+            MGlrbXJoQTVPcUFBa0gvME95OVlxWkEKLS0tIHNZWWRwWUJPV3o3REpENzdMYkVk
-            R1BuNDZVNzNaTmVvZm9EMy9ld0V4U1UKFjPcFiuhjwCChJKGQbIPFsHwl9oE7S+g
+            Y1V5SXhCUllDWGhjK3JzWDRKQU9hMmMKuVmn6OAy2q/mpBKqUhl1qfpnPvFOd72c
-            Utne4LrODAa3wj8TX3vgfRTBrljJmt+OwQJxRfTtq2ocyzR9rNUI+w==
+            /jMqnxClGSVXjJ5qdvcXCfLeYwT8vnhViNZmjE1ebRosE5YupvrjUg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVNFAvaUlyeHA3Mnluam1G
-            dmtIWHU2R2pRV2E3NTVKV1NOTHRSYjVhQVRVCnR4OENHZGYzVE9UdlJBTjdxblIz
-            Q0MxN3gyeTJhNTdORFk0SDdycVFrWjAKLS0tIEc5c0RMNjdLSTNKWExsVmlQUGx5
-            RFp0dWJXOVVvSGlhZ1pPbGRBWmt2S0UKTwkFwYaTr5jNuQTlqR/1ud8ITKGIbNiM
-            myAf39EHCP6cQQ0fjtx2ihy56m9xoK35Aj7h3w0fadONWtCNnhuH2A==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-10-13T11:17:33Z"
     mac: ENC[AES256_GCM,data:CpzC0H2Rfvl7F9tXCJ0WwkhE4Ba7eOIl1QMh1DHP8YQ9rChzAE8S5SXXuJA0jcmVY6NPfZ7zl8VEBepE+LHCq2UdSkAefawLeM6HwNfedP8N+zheqlyCZ8Os48628aHYN0PVI+/dMvpWWcfl+CFaH1mm4c+KYedCIsS9ZEYi9N8=,iv:EbF58pxbtHxPTAgs4dbZ31qyRT3QJ1kQoUShbLE11FY=,tag:FNF/OzS2SL3FweFw0RcRLQ==,type:str]

magpie/secrets/nextcloud_admin.yaml

@@ -8,20 +8,11 @@ sops:
         - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHYVVnM0xOVzJ5OFZsYlZL
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrUnQ3SDAyRTUxUDF0dDhY
-            SThvVkNBdzJoVkZ3ZFBMYVlTNjQwNUxuaVFjCjBhUFRSaGZ6TEh4ellSdS9Uc3FP
+            K3JmQWlYRVJtdEFac0J4U0RGKzZGNXJmUEg4CmtBSW9yNGZScXhKdnhZWkxIamFW
-            cGJaanNUci9JMDZISXljM1lSREZaZGcKLS0tIFhJOGVIM3Bub3J0WWVMNDlqY3da
+            YXEzbGhwR2F3dDJGdzljZUZBeERhU1kKLS0tIGlXZUhsdnI4ell5R3ZZbjZ0NCtO
-            RmVCdEpoUjJGTDYzczNnOWRRTTE3WmcKnRV787F3yBJgSDEhHW1+sAFcyvH+OMQf
+            TUpkZmxBNzZ1UUY1dGRud2hycGUyZW8KFUGikaFQjFfmn068qex2tpGbRHIbmS3l
-            N7er4Wd9Tqi3IJ/lR2Z7Gwn1Dfm5kMHk+hxzPlmdpaGr42ZJNPmNVw==
+            27lqo8+eRFnq0nw8H/1yRMi8IghR0+XK68T49hlt0VLS9LZJG1aPag==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCZmFFRXU5NnlGRit6K1ov
-            TmR0K05uY2hva3liaDdGNmhST3dWTGdZb1EwCkpsQ3o1ZWloaUdFR3NpbS9uKzE5
-            S0ZRRmkxbkJnMFN6SzhzUFo1M3NnTnMKLS0tIE84aFdJS3E4eWw3SG1JeXJwRWd2
-            RWp5ZUtUNzJ4OWswWmhXWjRkZkpzWEUKj23XymHvh+nh3HiPD+erv2GZNNpUZKp6
-            s0KJSkGuIuILf3kfgp23jXNSFLMEtWwlSh5EP02g2EIHzUg2kLKNpQ==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-10-17T23:08:24Z"
     mac: ENC[AES256_GCM,data:fb9cOL4Q+q5uarmXtXNlpRmWgv/Ao1MqwwH2V2CQxEiP8zFyFBZs2435vdcLzrQrnBXz0JLVu4g10SH2T4dpYFP42teIkrgmneecjjcM+UOsBsGsrxlpHMha1t/ERRhBA7uJze5/kwHqry6eruWehRTu65QF1qBTql3m6ipjCeY=,iv:a7aFuTCcRCIDERlrj/9dFCF7VgCDDakfPteQimHV3lc=,tag:4mwrDHaQWA4EU0AgtgZaMg==,type:str]

magpie/secrets/wg_privkey.yaml

@@ -1,30 +0,0 @@
-wg_privkey: ENC[AES256_GCM,data:TnUTZheznQqnyK59qdLmAcuVr9JICWlNVtPF1qRMDPbBblD0ALn10qbEC7M=,iv:83fum5iYUrw08XJ0s7RE+/WDGeVjVswPlptzQjWOjeQ=,tag:YhQlmilbnrpRxcUb6rzfHg==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJUFplcGZMWGhrS2NsRUZF
-            WnltcCsvS0VaV29RbTdDK1UveDJwdlBXbTBJCkVaekVUWFVSVkZ5UjUwaWMxU3h0
-            eEtOQUR2VkF6RUtLYVBNalJPV3YzWWsKLS0tIDNGek4veStoa011VUV2Z3ZSUVpq
-            ZWlYQ2x6a3ROdlYzc3E1WjRhN3F1QUUKwaJruHMCoWtgvep0fI00helDZh8WVrsh
-            MV5IaEH5xapid5HHw9bLkjeeVKcT1fo7LCovouv+G5NTjvVzsMyLhw==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlRWdQeWxUUlJaRndzcVln
-            ck5USkpzdDJpSWJTNDZJWVBMQnl0QnVvTDF3Clg2SEY3eDdqS0Y5ei8vUlk0dTli
-            bTYycFYyMjcxdmtpc1IybXBxN2RORm8KLS0tIHlHaEJLMnRTQ20yN2RrRnNqMzk0
-            ZVlSb1FHVVJhb0IyaHJiQlpHRjNyMDAKNQ8VzdC3s43YcZk6UQjyA1GX69x/znhE
-            ZaFkMfNX6CgxfjKRW2rhXrJi+txdhmQ0CfpfWDr3zp3XVuMq942M1Q==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-04T19:04:00Z"
-    mac: ENC[AES256_GCM,data:qYNlokRd1lQnOwNNVbV4PwdYeybIRNrxDKX4RPfHJxvQGHBmISzd52JCnCe7zJ14FP/bSNhQqfuxyjdxid/DVPUvkHP+HlaKUR0SLv6c91ORDoaMRC93hrPXypRGplFSbSjnd3dME43ll3oH8fLe4lP9z9KhGS2lRMdduptfWvg=,iv:/j6OOT1dK94vrPOk1Lbcca8KeWvoD+ZaHoH6nMMo0y8=,tag:syHuBVkhOCJ8JCONKkqFkg==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

magpie/wg_pubkey

@@ -1 +0,0 @@
-xhjJdIXtTBNhtSoehsi6p+znIgOfMRetl5/wtnMxJGk=

mediabox/configuration.nix

@@ -4,9 +4,9 @@
 {
   config,
   pkgs,
+  lib,
+  sops-nix,
   zremap,
-  system,
-  nvim,
   ...
 }: {
   imports = [];
@@ -22,39 +22,18 @@
     group = config.users.users.nobody.group;
   };
 
-  sops.secrets."wg_privkey" = {
-    sopsFile = ./secrets/wg_privkey.yaml;
-  };
-
-  sops.secrets."wg_preshared/mediabox" = {
-    sopsFile = ../common/secrets/wg_preshared.yaml;
-  };
-
   nix = {
     optimise.automatic = true;
     gc.automatic = true;
     gc.options = "--delete-older-than 7d";
-    package = pkgs.nixVersions.latest;
+    package = pkgs.nixUnstable;
     settings = {
       experimental-features = ["nix-command" "flakes"];
     };
   };
 
   boot = {
-    initrd = {
+    initrd.compressor = "zstd";
-      compressor = "zstd";
-      availableKernelModules = ["e1000e"];
-      network = {
-        enable = true;
-        udhcpc.enable = true;
-        ssh = {
-          enable = true;
-          hostKeys = [/etc/ssh_dummy_ed25519_key];
-          authorizedKeys = [(builtins.readFile ../nixy/ssh_pubkey)];
-        };
-      };
-    };
-
     kernelModules = ["acpi_call"];
     kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = ["msr.allow_writes=on"];
@@ -70,7 +49,6 @@
     readOnlyNixStore = true;
     supportedFilesystems = ["btrfs"];
     tmp.useTmpfs = true;
-    tmp.tmpfsSize = "80%";
   };
 
   security = {
@@ -89,7 +67,7 @@
   networking = {
     firewall = {
       enable = true;
-      allowedTCPPorts = [80 443 51820];
+      allowedTCPPorts = [80 443];
     };
 
     hostName = "mediabox";
@@ -109,28 +87,11 @@
       192.168.88.1   router.lan
       192.168.88.231 workstation.lan
     '';
-
-    wireguard.interfaces = {
-      wg0 = {
-        ips = ["10.100.0.5/24"];
-        privateKeyFile = config.sops.secrets."wg_privkey".path;
-        peers = [
-          {
-            publicKey = builtins.readFile ../magpie/wg_pubkey;
-            presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path;
-            allowedIPs = ["10.100.0.0/24"];
-            endpoint = "5.75.229.224:51820";
-            persistentKeepalive = 25;
-          }
-        ];
-      };
-    };
   };
 
   time.timeZone = "Europe/Sarajevo";
 
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [nvim.overlays.${system}.overlay];
   environment = {
     homeBinInPath = true;
     variables = {
@@ -173,7 +134,7 @@
         serviceConfig.Nice = -20;
         script = ''
           sleep 1
-          ${zremap.defaultPackage.${system}}/bin/zremap \
+          ${zremap.defaultPackage.x86_64-linux}/bin/zremap \
           /dev/input/by-path/platform-i8042-serio-0-event-kbd
         '';
       };
@@ -212,6 +173,7 @@
     fwupd.enable = true;
     ntp.enable = true;
     openssh.enable = true;
+    restya-board.enable = false;
     thinkfan.enable = false;
 
     xrdp = {
@@ -439,9 +401,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 = {

mediabox/hardware-configuration.nix

@@ -2,7 +2,9 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
+  config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {

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
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwMkdLVEFQMVk1allhK2hL
-            dHJFSHVSbG1vay9NUDBEVkM4ZWNoT3h4Q1c0CkhWdWVzTEJxZENZYXVFT2RhV3pT
+            NXFXc254SmhxK0lFWTd1SUorUGQ0VEJPcXo4ClNYSkhJbnVjUjdFOGtoWFV2VWZC
-            aDZIUUdWVUVRUDc4ZEFDTkdnaDJxdVkKLS0tIDd6TE56REdjRVdtSXB1dkJrVVNj
+            NmpaRDVhWnRQUmVDWS9WU2pTVlBEQ1EKLS0tIFAydU9aYXJnd1NnRzU2YXpXM1Vq
-            dUxhRnB4dVFRam9xNlFiY2VOSXpNamcKNzRghHeyPtltKH4GkJQ0ef4apr5gziq9
+            VWhhbkZTT1kwTEl5VEVWR1A2aW5OUDgKiYcj5Yo42RjQeo1UeUTBV8YBNYL8ccLW
-            dhXy6Qil48QJd4hnyr7GW1n7eRIq24OWO3WglLbVAUSQr/gzM2TWiA==
+            bQ1655MU/q3LQh14lqwbsOfmGjPc9H0ECltm+V+kNPTRi76qFhcodg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMjVQZkVVQmZFbCt3Z2ZI
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1eGJCRlhHbk1JQWl2RllZ
-            Q3NVZUJ0VkZjK0E5SFpqWE50c2dOeFNsUm1jCmdDZGxZYk13emhhanRzWjhvZFM1
+            R3hkVGtIamJzZlVLazUrVEJnNmU3Z0tLMG5RClp2Z01Fc1p5QzFhUWNzU2NpU0Zo
-            UWNpNm5malkrU1Rkak9PNWk2bW5nRDQKLS0tIE9UdXg4L0hMRzJuUERIMytvc2pr
+            aTRPMFhPYlA4VmZNUWFsWHZRMUxyaTQKLS0tIG51TW9JRW12RzVmdWpZY3FaVnBR
-            Y1BBZFJseUNIeTVtTjBGazk5WE1ZcUUKs9pEtDbCYRfSP0Rh9ENo9A6nUFkYHr4D
+            UTZ2YWdQVjRTTUxPUWVwbHI4aklITmMKZQnfJs01D4FX+MF6oU0FmWYQ4reB/X/k
-            3DvOKSyLL33FBoEddDBd7Si1mpjY2bunueBAe+diDgOrol6tWIMoUw==
+            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]

mediabox/secrets/wg_privkey.yaml

@@ -1,30 +0,0 @@
-wg_privkey: ENC[AES256_GCM,data:ovAxwZEcmRzt/zb42ortPwPyREC16E5YNfDBguZK7uByR4BgJi8kNeoG+GY=,iv:Cv50+JB5S+44U3L9od4zwrEKHi/LM38LnA94DkvCer4=,tag:ehKQrqWwA6daxc2yASDWNQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKSGxudng1enhDa281S0pm
-            Q0kwQmc1T2hUK0dHd3B4cUh3RzZPZ1dGaXo4CkdPMzNnQWMyYjJiUWk4WEYyODFp
-            b2FTbnZwMHh6SHhIcjVNbnBKSVk3TWMKLS0tIFBZOW56K2Y5Q3I4dmh5dXBieEF2
-            SWQwcmkzQU5aeEliS29QN3Y0V04zNU0KF0WmF8BDvZ2DyJFztKJv8YmDuqVsAoO4
-            QEVLwrJDurRxcNIVGLs5W+60Osa5XMpNc74e23rU7mucB5wPA/84dg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWMUtUYyswV3czWDdXWG1x
-            cnh5QTZpdlBZYlZ2b2oweXJ5SkZSQldhQmpZCmFrQVlyYnNqZ01kVTVNQTlBRFNR
-            WDlITEJOUFZGa0U2NG8xMGpkSnNOQTAKLS0tIDNlK0dxWnB3a3dkTnRmTm5oTlFD
-            eGV1VE1tL1c0a3hUdXM2bExmV1l3RnMK8aOugY3XHTCfeBDJVOyGljuuu6hQGJ7W
-            ZGoxOz+hhYIHj/04J9DIIOUyt81m8LNCbxcacFKyW7Sqosfj+7N7Gg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-14T19:25:26Z"
-    mac: ENC[AES256_GCM,data:vcyglyYG93K3KBISpIESGlNCs5ojWZAL0gyDUzBNCxG5H8RKEz1Y7yOtr5EXnnP66qcBHlKhb81Iyrc071pmJL9dIttiqmvjSWf0zZ9RuV0uYcO/42cqk3J4tBJ6iYCi64y58jifDObbRni6jiGVEGEkSk8cXFqR8UXoSTeXWtU=,iv:avpWr8SeHK1VHz9XhkO7Nd7VOfMP7JXcQaXJA8Xiuhs=,tag:ixJsw/snZEWXGhdPLU1cGg==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

mediabox/wg_pubkey

@@ -1 +0,0 @@
-S+tL/pTm4D7bsWj/dhpPXHYxcye/DuNMguLD5l1ACEU=

nixy/configuration.nix

@@ -1,9 +1,9 @@
 {
   config,
-  nix-xilinx,
-  nvim,
   pkgs,
-  system,
+  lib,
+  nix-xilinx,
+  sops-nix,
   zremap,
   ...
 }: {
@@ -11,54 +11,20 @@
 
   system.stateVersion = "23.05";
   system.autoUpgrade.enable = false;
-  system.switch = {
-    enable = false;
-    enableNg = true;
-  };
 
-  sops = {
+  sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
-    age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+  sops.secrets."peerix/private" = {
-    secrets = {
-      "peerix/private" = {
     sopsFile = ./secrets/peerix.yaml;
     mode = "0400";
     owner = config.users.users.nobody.name;
     group = config.users.users.nobody.group;
   };
 
-      "wg_privkey" = {
-        sopsFile = ./secrets/wg_privkey.yaml;
-      };
-
-      "wg_preshared/nixy" = {
-        sopsFile = ../common/secrets/wg_preshared.yaml;
-      };
-
-      "wg_privkey_proton" = {
-        sopsFile = ./secrets/wg_privkey_proton.yaml;
-      };
-
-      "wg_endpoint_proton" = {
-        sopsFile = ./secrets/wg_privkey_proton.yaml;
-      };
-
-      "borgbase_enc_key" = {
-        sopsFile = ./secrets/borgbase_enc_key.yaml;
-        owner = config.users.users.akill.name;
-      };
-
-      "borgbase_ssh_key" = {
-        sopsFile = ./secrets/borgbase_ssh_key.yaml;
-        owner = config.users.users.akill.name;
-      };
-    };
-  };
-
   nix = {
     optimise.automatic = true;
     gc.automatic = true;
     gc.options = "--delete-older-than 7d";
-    package = pkgs.nixVersions.latest;
+    package = pkgs.nixUnstable;
     settings = {
       sandbox = true;
       experimental-features = ["nix-command" "flakes"];
@@ -66,10 +32,9 @@
   };
 
   boot = {
-    extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
+    extraModulePackages = with config.boot.kernelPackages; [usbip];
     initrd.compressor = "zstd";
-    initrd.kernelModules = [];
+    initrd.kernelModules = ["amdgpu"];
-    initrd.systemd.enable = true;
     binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
     kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
@@ -84,7 +49,7 @@
       memtest86.enable = true;
     };
     readOnlyNixStore = true;
-    supportedFilesystems = ["f2fs" "xfs"];
+    supportedFilesystems = ["btrfs"];
     tmp.useTmpfs = true;
   };
 
@@ -109,7 +74,7 @@
   networking = {
     firewall = {
       enable = true;
-      allowedTCPPorts = [80 443 51820 8020];
+      allowedTCPPorts = [80 443];
     };
 
     hostName = "nixy";
@@ -141,47 +106,13 @@
         };
       };
     };
-
-    wireguard.interfaces = {
-      wg0 = {
-        ips = ["10.100.0.6/24"];
-        privateKeyFile = config.sops.secrets."wg_privkey".path;
-        peers = [
-          {
-            publicKey = builtins.readFile ../magpie/wg_pubkey;
-            presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path;
-            allowedIPs = ["10.100.0.0/24"];
-            endpoint = "5.75.229.224:51820";
-            persistentKeepalive = 25;
-          }
-        ];
-      };
-
-      neox_wg = {
-        ips = ["192.168.51.2/32"];
-        privateKeyFile = config.sops.secrets."wg_privkey".path;
-        peers = [
-          {
-            publicKey = builtins.readFile ../nixy/wg_pubkey_nx;
-            allowedIPs = ["192.168.2.0/24"];
-            endpoint = "185.194.64.26:51820";
-            persistentKeepalive = 25;
-          }
-        ];
-      };
-    };
   };
 
   time.timeZone = "Europe/Sarajevo";
 
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
+  nixpkgs.overlays = [nix-xilinx.overlay];
   environment = {
-    etc = {
-      "firejail/qutebrowser.local".text = ''
-        whitelist ''${RUNUSER}/qutebrowser
-      '';
-    };
     extraInit = ''
       unset -v SSH_ASKPASS
     '';
@@ -192,20 +123,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 +134,19 @@
     sway.enable = true;
   };
 
-  documentation.dev.enable = true;
-
   # List services that you want to enable:
   systemd = {
     services = {
-      "zremap@" = {
+      "zremap" = {
-        enable = true;
+        description = "Intercepts keyboard udev events";
-        restartIfChanged = true;
+        wants = ["systemd-udevd.service"];
+        wantedBy = ["multi-user.target"];
         serviceConfig.Nice = -20;
-        unitConfig = {
+        script = ''
-          Description = "zremap on %I";
+          sleep 1
-          ConditionPathExists = "%I";
+          ${zremap.defaultPackage.x86_64-linux}/bin/zremap \
-        };
+          /dev/input/by-path/platform-i8042-serio-0-event-kbd
-        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"
-          ];
-        };
       };
     };
 
@@ -337,8 +158,8 @@
 
   services = {
     acpid.enable = true;
+    btrfs.autoScrub.enable = true;
     dbus.enable = true;
-    dbus.implementation = "broker";
     fstrim.enable = true;
     fwupd.enable = true;
     ntp.enable = true;
@@ -352,26 +173,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"
@@ -383,8 +199,8 @@
 	#Arduino UNO r4
 	SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", MODE:="0666"
 
-        #zremap on new keyboard
+	#ST-Link
-        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,49 +254,18 @@
       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";
         };
       };
     };
 
-    borgbackup.jobs."borgbase" = let
-      user = config.users.users.akill;
-      home = user.home;
-    in {
-      user = user.name;
-      paths = [
-        (home + "/pic/priv")
-        (home + "/pproj")
-        (home + "/videos/priv")
-      ];
-      exclude = [
-        "**/.ccls_cache"
-        "**/*.d"
-        "**/*.map"
-        "**/*.o"
-        "**/zig-cache"
-        "**/zig-out"
-      ];
-      repo = "ssh://oda929rv@oda929rv.repo.borgbase.com/./repo";
-      encryption = {
-        mode = "repokey-blake2";
-        passCommand = "${pkgs.coreutils-full}/bin/cat ${config.sops.secrets."borgbase_enc_key".path}";
-      };
-      environment.BORG_RSH = "${pkgs.openssh}/bin/ssh -i ${config.sops.secrets."borgbase_ssh_key".path}";
-      compression = "auto,zstd";
-      startAt = "daily";
-    };
-
     nix-serve = {
       enable = false;
       secretKeyFile = "/var/cache-priv-key.pem";
@@ -493,23 +278,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 +295,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-cjk
-      noto-fonts-color-emoji
       noto-fonts-emoji
       proggyfonts
       siji
       terminus_font
       terminus_font_ttf
       ubuntu_font_family
-      vistafonts
     ];
   };
 
   virtualisation = {
-  spiceUSBRedirection.enable = true;
     containers.storage.settings = {
       storage = {
+        driver = "btrfs";
         graphroot = "/var/lib/containers/storage";
         runroot = "/run/containers/storage";
       };
@@ -561,6 +327,8 @@
     };
   };
 
+  sound.enable = true;
+
   hardware = {
     bluetooth = {
       enable = true;
@@ -571,11 +339,12 @@
       };
     };
 
-    graphics = {
+    opengl = {
       enable = true;
-      extraPackages = [];
+      driSupport = true;
+      driSupport32Bit = true;
+      extraPackages = with pkgs; [];
     };
-    rtl-sdr.enable = true;
   };
 
   zramSwap = {

nixy/hardware-configuration.nix

@@ -1,44 +1,78 @@
 # 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 =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
+  boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-  boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
+  boot.initrd.kernelModules = [];
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.kernelModules = ["kvm-amd" "amdgpu"];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" "amd-gpu" ];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-      fsType = "xfs";
+    fsType = "btrfs";
+    options = ["subvol=root" "compress=lzo" "noatime"];
   };
 
-  fileSystems."/nix" =
+  boot.initrd.luks.devices."sys_enc".device = "/dev/disk/by-uuid/682d030d-189e-4b47-a60a-62cf1f3729d3";
-    { device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
+
-      fsType = "xfs";
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
+    fsType = "btrfs";
+    options = ["subvol=home" "compress=lzo" "noatime"];
   };
 
-  fileSystems."/home" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
-      fsType = "xfs";
+    fsType = "btrfs";
+    options = ["subvol=nix" "compress=lzo" "noatime"];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/persist" = {
-    { device = "/dev/disk/by-uuid/828E-F3C3";
+    device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
+    fsType = "btrfs";
+    options = ["subvol=persist" "compress=lzo" "noatime"];
+  };
+
+  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";
-      options = [ "fmask=0022" "dmask=0022" ];
   };
 
-  swapDevices = [ ];
+  fileSystems."/opt/xilinx" = {
+    device = "/dev/disk/by-uuid/f5c27ef2-8053-4d96-9f8f-c6a50d6193b9";
+    fsType = "erofs";
+  };
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  swapDevices = [
-  hardware.cpu.amd.updateMicrocode = true;
+    /*
-  hardware.enableRedistributableFirmware = true;
+    {
+       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;
 }

nixy/secrets/borgbase_enc_key.yaml

@@ -1,21 +0,0 @@
-borgbase_enc_key: ENC[AES256_GCM,data:AD+JghEOX25tBGYhoU1ge1fqrA+5AK8N4yg=,iv:u05GVeWbL3xdZQgGkXSPkxlATd2M9MX4uSZiLOHMMRE=,tag:pmTQIJWmz+ePmSNzO/EO4Q==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEaDhSZVVibVl1NU84NG9U
-            aEVQbThIcC9CajNHS25SVW1SMFFwMUsvMmxJCkpTVThpZ0JZdEpLTnJlQWFqM244
-            LzFaUFVvWWxIcU4wRlhXalF5TkNpVHMKLS0tIExXMUx5cDBBbDloQ0sxbEY0eGdj
-            bE5vNHVHekI2RzY5M3JNcTdCa3pNeUUK8C04wF1te6epA97sNrhoz0VUn+MC7SML
-            6N1CZK3MuRARBqcj4c/W1aXuTysvuV1o/Fl5xOk/gbumcfwnDYj28A==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-21T08:14:25Z"
-    mac: ENC[AES256_GCM,data:7M+akGH09E2JYyKLmwpjx0VCEBmXqO6bNHFNRCO+9LdSIqsEw8MD4WGO0zwHOD9ls7+1OPFeoU+MVbtfMhmvN4g6rg+tFkXbxPSXCPkTA4tL90ZLXoBIpUBxKKhFMxtdOnjXxES3rTzjXGAvxocFOiNv/7pKbzeqMJUnH9FgAcM=,iv:h0+OpLmutMyPN3YFhyuHFgWSqxVK5WmBAE0k5ezEo9A=,tag:UKOXnTOjWaLDEOYk5YK4Aw==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

nixy/secrets/borgbase_ssh_key.yaml

@@ -1,21 +0,0 @@
-borgbase_ssh_key: ENC[AES256_GCM,data:lLHIBmw/03An3SRJUjYS2pn0g7XEW0kTXtSObhIGwjBwlRypU7uQDz4JseOA2GbSm+GqsGK8U3Ifgirb7t8AsGy6DPxO+2sm+ByJ1S46G6cwkO2GateJw4Zg0mmhUBBuB/eXQMLuBLKZM2WGta5+6O0SWxDtsrTsBhlo5qbwwYILu0gg2zsBWFSn1OBGgvjYYRTd7N85WX8+S7oNYVAL2HjCmhHHtYrLnua4ajBY9dQEzrKdZaQW4v39HV9MyoilEz17fFLU8S2KbJ1iw8HgoAc9W81hpQNNd8fWKY+e0iWxD9X5H7UTs8YP/bsKeWyG4OAwr99zIZ1Lqzi0EuZI+PYkIz4Q4WBmv1wD6Py274iug3kr1OqvaIOmIT/9j2C3mOZTqxuFaF5T4NMkcIeViCBmRwUMTl/8a36X+n/MYxRoznHCQmg8zKubDuykVJfBmFwxbUc9tx8PeodnWeiASOV7FvBie47yq+NyBGItJXAK14SxLE9T2sxRchJWcrQBcekZdZ5Mej20lfUlcAGkwfUc0e54xsv1K3oY,iv:5157BQmbfuF5EYbDHCy/TmnTYErIwmgXO8RaX6f18xs=,tag:T2eZN46Qd6RgLWk4kbYgPQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5b2YzSDdaU3R5TUdqS3Nv
-            eUYraFBiZlZ1TXBqYzlWNUNYOFlyMzJvWEE4ClJ6R25CRXRUZ2FDTFY2ZmJIRkRX
-            WVJCSy83N2JUNzRuT3VuSUF1OTV2TUkKLS0tIEZ5cVg1V2o0MkdmWEx1emJVdjZ0
-            RkZFL2tRNW9RdnAwalE2ZzVQcnljRFUKRyN8ahv9ZI63m8ycl74GZ59lyAXUsKmi
-            tfPqQvL1oTtJr3hzwy2bkctXQLYjGvsMyZt2tiWpy5vLc1MrxlqVDQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-21T08:16:40Z"
-    mac: ENC[AES256_GCM,data:VkXpCPQB4RypDrK31pYWXeOcl8ulis6fMF1q/SLCg2wXnL0jFrmAFp78C+ers9xFhbnUnMbVc/ZJIVKfa0g94WV3jJbn4+HB0GPWQCz7LwhmG5XEY5O5sFLuDCcHb/epZvDbCsEQeiq+TGDHp6TtdL8qDF+hE2k8qfsy570wocU=,iv:HQleJtHWQ5uk4+Witn2aaqh0SvXqomfiSO/ExgPzVag=,tag:hlBmboddR8GDAmBpETi0Ow==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

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
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdU9WSjZkWUd6NXFpdXNp
-            OGsxa1p0TGIvRE5DYXZzTDM3YUZFVTAxbUUwCllPd0FOUlRiZW5wT2QvLzZXYjRr
+            R2huUXZQOGZzb0Z0ekN2WkdRdEFJYk54RmhnCmo0ampNK01VR3lQM0RGYWlNQ3cx
-            S1A5WjZxLzNYQ1ZWVFFQTzRwMFQweFEKLS0tIHNoZUpHS2dDNmFKc3ZVNFZuUFU4
+            Rk1BK1lIUHJPZ2R5YVd6RTlYbXJDVWcKLS0tIGV0Yy8ySnFMQ25PQUNBL3dPdmc3
-            L0M0MitMeDg1ZWYxcDNCQlVGUjRKeFkKvD2SKnuh517o2knPr2SOWq3kubMyI7UV
+            WjhldWNVL0h6T1lUSEdXeHFQemRBVEEKJzh1HExRoy/iyTtBNaVdNgolWyFHaaLV
-            j6HgXVbHUDjmKl2dY+YVTnmxrK54E+Q6iiu7mQnvLdzxYBK/EiNt9w==
+            VTDZYEHq+eEIrVAG5xefG/nPpj2K6FRItA6+4PcKtyARG+gKYwp2tw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-21T08:17:51Z"
+    lastmodified: "2023-07-28T11:55:00Z"
-    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]
+    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

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

nixy/secrets/wg_privkey.yaml

@@ -1,21 +0,0 @@
-wg_privkey: ENC[AES256_GCM,data:XL9FU1kZXvBJfwyt3HpQe8k8zg9HT6Xm0BdjNMduSu9uAgcHbglpLc/qTB0=,iv:QgX1VsmLUsDozFXmzDVPukjPNTa4Lnh806AQ4qdgpa8=,tag:RNVlDbtx8vAAbG0rinLVOw==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBSnkyM1ZrcnEvM3VHL0Nk
-            THhUUDdGU2s5UFgrVGZ3WXhkYTRIVTlaeGs4CjR4eVpmRy9qUkZSWkpFZDZHRDZI
-            ZWRXSmMzL2RWZkVrSlFPcC9ueGpDVFkKLS0tIDZWbENyS2hrSCtlNlBHaE56QTha
-            eFJmWXk1SVJEbDJOc1Q1VFlzVS8yODgKFXRAtR+67x0dkQTqZPtMT0Hd+aW+5K17
-            S/lhuHRhITt3woQnecVPMYklgJJlsyQ6blKhJw8dvhbVWWThZ853rQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-21T08:18:59Z"
-    mac: ENC[AES256_GCM,data:xPKsGZD5RKT/WMRupe4YTgoiUQRFq77KQyGaazeY1GEPI117gWxRHEpiyCLnfhZWcaekPWoXosm32wRLwDAXM/Femk567i5uKKG2wAqApWbc+FXTQ71w/CFr9uEWFApBjpEHpuBBaFV23qJfylsqeMp9r52d9Sp5eDQC4RJead0=,iv:oiNoZ/bqQUe+luqeuldw1M0KB2d4C5T7kXy+mLFZNZQ=,tag:5pK22TYGwbBNyWlfd/Ufxw==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

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

nixy/ssh_pubkey

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMPNCxE/8z02lVOC1unJbPMH+Ma+KRJfmz33oUfz3hKc root@nixy

nixy/wg_pubkey

@@ -1 +0,0 @@
-oHVmhw80daHjDjo7nwt/Y9eKBaH5FoTiVeukwDObijM=

nixy/wg_pubkey_nx

@@ -1 +0,0 @@
-eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=

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];

packages/zapzap/.nixd.json

@@ -0,0 +1 @@
+../../.nixd.json

packages/zapzap/default.nix

@@ -0,0 +1,27 @@
+{ fetchurl
+, makeWrapper
+, python3Packages
+, qt6
+}:
+
+python3Packages.buildPythonPackage rec {
+  name = "zapzap";
+  version = "5.1-2";
+  src = fetchurl {
+    url = "https://github.com/zapzap-linux/zapzap/archive/refs/tags/${version}.tar.gz";
+    hash = "sha256-r5NhdXQ4Tl/wFrD1+sxFS10Z3lAcHcax5bi43Qa3ZI0=";
+  };
+  dontWrapQtApps = true;
+  propagatedBuildInputs = with python3Packages; [ pyqt6-webengine qt6.qtwayland qt6.qtsvg ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook makeWrapper ];
+  env = {
+    HOME = "/tmp";
+  };
+  preFixup = ''
+    makeWrapperArgs+=(
+      # Force the app to use QT_PLUGIN_PATH values from wrapper
+      --unset QT_PLUGIN_PATH
+      "''${qtWrapperArgs[@]}"
+    )
+  '';
+}