summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradikro <adikro@disroot.org>2026-03-20 14:42:59 +0100
committeradikro <adikro@disroot.org>2026-03-20 14:42:59 +0100
commit43c36f0db8d30e6a06c34c43a25621a13c555f66 (patch)
tree2ca6df7c6ce094177e54ee1be462cf41b0ec5e85
parent622fd3f8413e6c0938f8f08a3be84fe5d4ca9e87 (diff)
updates
-rw-r--r--flake.lock42
-rw-r--r--flake.nix5
-rw-r--r--hosts/desktop/configuration.nix5
-rw-r--r--os/core/audio.nix1
-rw-r--r--os/core/networking.nix8
-rw-r--r--os/srv/bluetooth.nix9
-rw-r--r--os/srv/omnisearch.nix17
-rw-r--r--os/srv/sops.nix5
-rw-r--r--os/srv/srv.nix1
-rw-r--r--os/srv/yggdrasil.nix31
-rw-r--r--secrets.yaml5
11 files changed, 102 insertions, 27 deletions
diff --git a/flake.lock b/flake.lock
index b3a81f6..d9d3656 100644
--- a/flake.lock
+++ b/flake.lock
@@ -255,11 +255,11 @@
]
},
"locked": {
- "lastModified": 1773782512,
- "narHash": "sha256-c+gLUUw6GSA9OHyXGaaueWJoapoaQfeNT1mhoV5JKZg=",
+ "lastModified": 1773964968,
+ "narHash": "sha256-/vojK9noVTM+aWl+gX/vFjREtYcp0TGflBmQ1B4oIIk=",
"owner": "Mjoyufull",
"repo": "fsel",
- "rev": "d68140eb7f7be59e18ad9ecc6dea3358112b3446",
+ "rev": "c8f9b8080b2ea87d2c0fa6ea4d2bd6b96c154f38",
"type": "github"
},
"original": {
@@ -275,11 +275,11 @@
]
},
"locked": {
- "lastModified": 1773898372,
- "narHash": "sha256-PqeDgmyI/Df3/Mv0B81FP/ZC4KuO88YRQF5ZfeFyA4k=",
+ "lastModified": 1774007980,
+ "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "ecf019baf47df009937b5f8c4604cee10f410a76",
+ "rev": "9670de2921812bc4e0452f6e3efd8c859696c183",
"type": "github"
},
"original": {
@@ -375,11 +375,11 @@
]
},
"locked": {
- "lastModified": 1773878753,
- "narHash": "sha256-yfJ3Vj0kqvJ+F5E1QtGfYgCFDncEe2vmYcDK+ofUrmQ=",
+ "lastModified": 1773965157,
+ "narHash": "sha256-u6Ceko/AQ30asd/P68Y7gD0x3LtsjiPwC31TlwVnsac=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "14408dc1b61b6112a79d4b2e5e10e658e18bd554",
+ "rev": "7e711c5abd3b0ca9c0038606edeee6bcf09b055c",
"type": "github"
},
"original": {
@@ -391,11 +391,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1773878059,
- "narHash": "sha256-2AygdMsagzsmMZfmayQ8Zr8M/Ac8lGiCm+eXL2/+TKw=",
+ "lastModified": 1773942472,
+ "narHash": "sha256-VRtGTA4WWgrVrjZg+XrnRgMcbAa0EkYkWV5Wcn76/0g=",
"owner": "neovim",
"repo": "neovim",
- "rev": "19715e6e8a7145c8d4da39c9ebc2b09da5be74e7",
+ "rev": "06befe1e348bf540bb04a8c0cafe116616e71715",
"type": "github"
},
"original": {
@@ -472,11 +472,11 @@
"nixpkgs-nixcord": "nixpkgs-nixcord"
},
"locked": {
- "lastModified": 1773908601,
- "narHash": "sha256-pQH/gHrWGWryi7U2zGfmfQM0sj3td55P+6xha6WNzKw=",
+ "lastModified": 1773994878,
+ "narHash": "sha256-vA7ZUmJ2CvW0utYZaJoAPrUbK4JzykBXu1lcBNc67AQ=",
"owner": "KaylorBen",
"repo": "nixcord",
- "rev": "a0510db678515727f3e10b3dfcce7709f483aa9c",
+ "rev": "148c632f3ba29e32695225631a1e7d255136f749",
"type": "github"
},
"original": {
@@ -655,11 +655,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1773927424,
- "narHash": "sha256-D0oPwdA2FyBHEoyNRjTErPb3TPXacbAuTU9gzsQ62ws=",
+ "lastModified": 1774012500,
+ "narHash": "sha256-/ew0Oey3Bb9Qp8Xl4ND3xZFpa4ud/aRdV9i5TaQjI6Q=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "8e3883d8f542cb2fec946c9a7c0d4b53494e54fa",
+ "rev": "79310255aa4116a2e7097cc9fde070c215950a88",
"type": "github"
},
"original": {
@@ -680,11 +680,11 @@
"systems": "systems_3"
},
"locked": {
- "lastModified": 1773927734,
- "narHash": "sha256-hjf4JtCVGXO3/1SznMKKC+qFsIxQcVhZvPpoNuBYdFY=",
+ "lastModified": 1773970322,
+ "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=",
"owner": "NotAShelf",
"repo": "nvf",
- "rev": "618cbe6aac5e72f1f9dc0d0dde145ee2d452df71",
+ "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 8a6d8e5..9c4e243 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,11 @@
nur.url = "github:nix-community/NUR";
+ # omnisearch = {
+ # url = "git+https://git.bwaaa.monster/omnisearch";
+ # inputs.nixpkgs.follows = "nixpkgs";
+ # };
+
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index ae4d569..a96973d 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -79,6 +79,7 @@
monero.enable = true;
sops.enable = true;
syncthing.enable = true;
+ # omnisearch.enable = true;
vpn.enable = true;
};
wm = {
@@ -92,6 +93,10 @@
package = pkgs.openrgb-with-all-plugins;
};
+ environment.systemPackages = with pkgs; [
+ wl-kbptr
+ ];
+
boot = {
kernelModules = [
"nct6687"
diff --git a/os/core/audio.nix b/os/core/audio.nix
index 7527501..1e8985a 100644
--- a/os/core/audio.nix
+++ b/os/core/audio.nix
@@ -41,6 +41,7 @@ in
security.rtkit.enable = true;
environment.systemPackages = with pkgs; [
toggleMuteNotify
+ pulsemixer
crosspipe
alsa-utils
];
diff --git a/os/core/networking.nix b/os/core/networking.nix
index bbfda8c..0a93cb9 100644
--- a/os/core/networking.nix
+++ b/os/core/networking.nix
@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
cfg = config.os.core.network;
in
@@ -21,6 +26,7 @@ in
allowedUDPPorts = [ ];
};
};
+ environment.systemPackages = [ pkgs.impala ];
services.resolved.enable = true;
systemd.services."NetworkManager-wait-online".enable = false;
};
diff --git a/os/srv/bluetooth.nix b/os/srv/bluetooth.nix
index a803c55..1705db6 100644
--- a/os/srv/bluetooth.nix
+++ b/os/srv/bluetooth.nix
@@ -1,14 +1,19 @@
-{ config, lib, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
cfg = config.os.srv.bluetooth;
in
{
options.os.srv.bluetooth.enable = lib.mkEnableOption "enables bluetooth support";
config = lib.mkIf cfg.enable {
- services.blueman.enable = true;
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
};
+ environment.systemPackages = [ pkgs.bluetui ];
};
}
diff --git a/os/srv/omnisearch.nix b/os/srv/omnisearch.nix
new file mode 100644
index 0000000..e3b05a0
--- /dev/null
+++ b/os/srv/omnisearch.nix
@@ -0,0 +1,17 @@
+{
+ config,
+ lib,
+ inputs,
+ ...
+}:
+let
+ cfg = config.os.srv.omnisearch;
+in
+{
+ options.os.srv.omnisearch.enable = lib.mkEnableOption "enables omnisearch";
+ # imports = [ inputs.omnisearch.nixosModules.default ];
+
+ config = lib.mkIf cfg.enable {
+ # services.omnisearch.enable = true;
+ };
+}
diff --git a/os/srv/sops.nix b/os/srv/sops.nix
index 6fac789..250b1c7 100644
--- a/os/srv/sops.nix
+++ b/os/srv/sops.nix
@@ -28,6 +28,11 @@ in
"syncthing/encryption/keepass".owner = username;
"vpn/warp_private_key".owner = "root";
"obs/websocket_password".owner = username;
+ "yggdrasil-private-key" = {
+ owner = "root";
+ group = "wheel";
+ mode = "0440";
+ };
root_password.neededForUsers = true;
user_password.neededForUsers = true;
};
diff --git a/os/srv/srv.nix b/os/srv/srv.nix
index a496a33..cfd4cfb 100644
--- a/os/srv/srv.nix
+++ b/os/srv/srv.nix
@@ -15,5 +15,6 @@
./vpn.nix
./i2p.nix
./yggdrasil.nix
+ ./omnisearch.nix
];
}
diff --git a/os/srv/yggdrasil.nix b/os/srv/yggdrasil.nix
index 91bf6f0..7f95c00 100644
--- a/os/srv/yggdrasil.nix
+++ b/os/srv/yggdrasil.nix
@@ -7,8 +7,37 @@ let
cfg = config.os.srv.yggdrasil;
in
{
- options.os.srv.yggdrasil.enable = lib.mkEnableOption "enables yggdrasild";
+ options.os.srv.yggdrasil.enable = lib.mkEnableOption "enables yggdrasil";
config = lib.mkIf cfg.enable {
+ services = {
+ yggdrasil = {
+ enable = true;
+ openMulticastPort = true;
+
+ settings = {
+ PrivateKeyPath = config.sops.secrets."yggdrasil-private-key".path;
+ IfName = "ygg0";
+ NodeInfoPrivacy = true;
+ Peers = [
+ "tcp://ip6.fvm.mywire.org:8080?key=000000000143db657d1d6f80b5066dd109a4cb31f7dc6cb5d56050fffb014217"
+ "tcp://ygg1.mk16.de:1337?key=0000000087ee9949eeab56bd430ee8f324cad55abf3993ed9b9be63ce693e18a"
+ "tcp://62.210.85.80:39565"
+
+ "tls://ygg1.mk16.de:1338?key=0000000087ee9949eeab56bd430ee8f324cad55abf3993ed9b9be63ce693e18a"
+ "tls://103.109.234.106:443?key=000000035621c71b5610434589df051aed2688510f904ae79860668dc0fbf182"
+ "tls://s2.i2pd.xyz:39575"
+
+ "quic://ygg1.mk16.de:1339?key=0000000087ee9949eeab56bd430ee8f324cad55abf3993ed9b9be63ce693e18a"
+ "quic://ygg6.mk16.de:1339?key=0000005e5ced06fd4d465bc651c5deb6d70cbe82d36efb68c0450268eaaa5384"
+ "quic://[2a0b:4142:e9e::2]:65535"
+ ];
+ Listen = [
+ "tls://0.0.0.0:0"
+ ];
+ };
+ };
+ yggdrasil-jumper.enable = true;
+ };
};
}
diff --git a/secrets.yaml b/secrets.yaml
index 8573a7b..a934f23 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -9,6 +9,7 @@ syncthing:
encryption:
game-saves: ENC[AES256_GCM,data:67kubvePq/KYxJKJkNR8gBEf3VGczFkJE469XSYvBg/a4HfAAmdJuL2kfv62zEXVVb5BXx7NK1Xr5s+81AEaZw==,iv:1ERuh9X8IX/+XM22rreNUzt+i4CcJhVhS+IM210Z6dU=,tag:iSkTHHUF/WosX94JqJAjiQ==,type:str]
keepass: ENC[AES256_GCM,data:OLU0tYB9TTKZ5V1Mzj5FDE9YdCpj0ajJaoxzqd7HtTmaBqETjs7CjYriq7kCOgSEVBtwzek/NA1vetwuMQhI8Q==,iv:P9aBZCIbj23aOvuMBtAjAZ2L+0lUT5Xjk7XRikbc9u0=,tag:xnWUxctkKVTUOV0AtpnTug==,type:str]
+yggdrasil-private-key: ENC[AES256_GCM,data:lyyOlWDvYa33Koc8DmhcRwgMI8KOsqmD9oc1gORb/RZiAXiKsmlXRFuiu3ba8CA1uAahJpK897ambZiFVi8qlgMrK7irfmqVyoF3r9luQJGyjrp9dvypSkRuQKLnp2Aj3FoIyXBM+mFwZpbAyGxTCTvylXhoqZo=,iv:2b4OwPNQt1WeF36oolSDIFwu3ux+f39/9+7brfgxqbg=,tag:rH8A5TYv+aG2sDKjJkZokw==,type:str]
sops:
age:
- recipient: age1g9xlgzxxvgfgq6a05jxy2e7zf8t4qgw6wjpjmvyhvzlnu8fmye6s8qx702
@@ -56,7 +57,7 @@ sops:
YlM4bDBaVGFWVlFVS2t2aGpqS2lLQ1kKGEAW2a7IQaQwxr3AyArhYPNU23skM94s
2fIPMKVgfYEA7lf2ViJ7kfbPxGSGrhOFcyc5U6lgB/hFa1HuGXSCow==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2026-03-06T22:04:13Z"
- mac: ENC[AES256_GCM,data:LuJ93avw8+YwfEMo4jYaWuPR+FJHkJIuBNfXLm39aO/7z5YHzZt7Dg4V08IM1zhVdSBtIl/cw4PYBnp8/rKMpdx5XsmOGJ2l8i1JrQk1XckouQIWXodG4SoLBHxoCQ0vlnythlVptBlNK9yCDqynQs6xtZwO1nmOFSGPagsCDcw=,iv:V9RYOAVqgXA1zHTInFQKwixW0sO0CEGUo63SlCyoxeE=,tag:4BC8hAyVVKkSwpWdtfqJ0A==,type:str]
+ lastmodified: "2026-03-19T21:33:05Z"
+ mac: ENC[AES256_GCM,data:pHgvw9hhX84Gz6Id0G9oyp0dRMHfUjDGO0SjxJDoyP5N5ZyQSpnkwzaIvwhvTT+jIhJlkrzbJc3Ebq0Y0pRFf94L+dBdtnibk0c6I/zJhZZLF3qSbsI892Erk19bbbzldewd7YO130gBQxhP0DWdSIJAWBJ8UEUxyQE+KH47Kzg=,iv:wVCCYDIz5Nczhbz7Mnp9tuobdCL284j8sv+3q7HnIjc=,tag:FrhUf4kCK6CrmvvNhNVuSw==,type:str]
unencrypted_suffix: _unencrypted
version: 3.12.1