Compare commits
10 Commits
876a90a0a1
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
545e277ed5
|
|||
|
3822f417ff
|
|||
|
5466d27b98
|
|||
|
255145c656
|
|||
|
5789e57378
|
|||
|
aa3b2d6eae
|
|||
|
73e7430c30
|
|||
|
951ac9bd59
|
|||
|
aa22a83853
|
|||
|
7dba899219
|
Generated
+42
-41
@@ -25,11 +25,11 @@
|
||||
},
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1780099841,
|
||||
"narHash": "sha256-EVZd2RsbpreRUDSi9rBwPY+ZxoyMaiEBbZxxhljbaS4=",
|
||||
"lastModified": 1780532242,
|
||||
"narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "0532eb17955225173906d671fb36306bdeb1e2dc",
|
||||
"rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -126,11 +126,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780099287,
|
||||
"narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=",
|
||||
"lastModified": 1781365335,
|
||||
"narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d",
|
||||
"rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -146,11 +146,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779726825,
|
||||
"narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=",
|
||||
"lastModified": 1781319724,
|
||||
"narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b179bde238977f7d4454fc770b1a727eaf55111c",
|
||||
"rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -208,11 +208,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780129573,
|
||||
"narHash": "sha256-6/S2FvBz+dxEgPfRU7dK+ycLYzRU7L8aN+GjDRyVs/E=",
|
||||
"lastModified": 1781344759,
|
||||
"narHash": "sha256-S6UBeQM7NLaQX6RZYS65fMypWfRQL/F4iRu0y8sTLPc=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "8f97d1dee8c0971b01cd6b17ccf913e8bb70f5d5",
|
||||
"rev": "ffac737e4117f7e9f070d38078801a5433f19d5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -231,11 +231,11 @@
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780308674,
|
||||
"narHash": "sha256-68H7z1MLdPCtWE4qetwTiMdtztZ7AwEKM9yS9Q+wZa8=",
|
||||
"lastModified": 1781181476,
|
||||
"narHash": "sha256-4JLkQvN7/f77TyxXXtoEuUfovMqMLOgWpBaLMNX1dns=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lanzaboote",
|
||||
"rev": "11918137828af784150f7a2da52cf50abf34f501",
|
||||
"rev": "0403b4b7e8b2612657f0053a4c315e6c43eee9e6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -253,11 +253,11 @@
|
||||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779970379,
|
||||
"narHash": "sha256-ZHsxoYXXnfJtMVh1/yY+1Eh9hHcPBhE28Qvinauh+BQ=",
|
||||
"lastModified": 1781389237,
|
||||
"narHash": "sha256-Ne1/E5XNUq0gleaQz0vW5R4xf/0h/uEZ+bOW1aNjeQk=",
|
||||
"owner": "microvm-nix",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "0d49083ba2d7419b22908ac392777c16df9a032e",
|
||||
"rev": "6ad601df0a07d9855c5e8f9b81135ecaf7c287eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -293,11 +293,11 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780310866,
|
||||
"narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
|
||||
"lastModified": 1781168557,
|
||||
"narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "4ed851c979641e28597a05086332d75cdc9e395f",
|
||||
"rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -325,11 +325,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1779560665,
|
||||
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
||||
"lastModified": 1781074563,
|
||||
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
||||
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -354,11 +354,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1780203844,
|
||||
"narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
|
||||
"lastModified": 1781216227,
|
||||
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
|
||||
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -376,16 +376,17 @@
|
||||
"noctalia-qs": "noctalia-qs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780322768,
|
||||
"narHash": "sha256-WnjyKaA+kywlyaPZs3dxD+XWVCMixsfDht8Sn7fshgs=",
|
||||
"lastModified": 1780949817,
|
||||
"narHash": "sha256-2oJuPyt+4dd+ZzO7TFqpmkSAAYpRg9SF4eV8kJGl6Tk=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "fe6fa125f5ee7881c4ee0cf9c0a4329a8238d3c2",
|
||||
"repo": "noctalia",
|
||||
"rev": "f816591afc2f2f606d1f0cf70b51e95c04a7a8aa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"ref": "legacy-v4",
|
||||
"repo": "noctalia",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@@ -399,11 +400,11 @@
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780194487,
|
||||
"narHash": "sha256-M+YtjKCTkHrkplNaKVyaxfa8hAWjRF6wFOUBAZvxQ4U=",
|
||||
"lastModified": 1780799499,
|
||||
"narHash": "sha256-YloRtLqJabzYUWvdLyh67zH4DZrR3kQj+dlQJwLPmPM=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-qs",
|
||||
"rev": "07398e12b54f194e3a2d47c87e3fd10b8eeaa27d",
|
||||
"rev": "f308426239665e3bc3d624014e9295b2ae2f58ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -458,11 +459,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780284119,
|
||||
"narHash": "sha256-y2wR4Mk6D/N1ID4FZa2oUMStCUxyIoRzmgOOpLzoWmo=",
|
||||
"lastModified": 1780802404,
|
||||
"narHash": "sha256-bGtIUeLb0yChX4h6hB40OOCwcYhcpQZHXSDvZGdWgeM=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "51390d0bfca0a68a8c337d215a4bbeddc2ca616e",
|
||||
"rev": "8e596a8430f2ce54d55c742198187d6945a5501e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -526,11 +527,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775636079,
|
||||
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
|
||||
"lastModified": 1780220602,
|
||||
"narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
|
||||
"rev": "db947814a175b7ca6ded66e21383d938df01c227",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
};
|
||||
|
||||
noctalia = {
|
||||
url = "github:noctalia-dev/noctalia-shell";
|
||||
url = "github:noctalia-dev/noctalia/legacy-v4";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -211,41 +211,52 @@
|
||||
};
|
||||
|
||||
fileSystems."/export/Pluto" = {
|
||||
fsType = "auto";
|
||||
device = "/mnt/Pluto";
|
||||
options = ["bind"];
|
||||
};
|
||||
|
||||
fileSystems."/export/Mars" = {
|
||||
fsType = "auto";
|
||||
device = "/mnt/Mars";
|
||||
options = ["bind"];
|
||||
};
|
||||
|
||||
swapDevices = [{device = "/swap/swapfile";}];
|
||||
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
networks = {
|
||||
"10-lan" = {
|
||||
matchConfig.Name = "ens18";
|
||||
ntp = ["192.168.2.1"];
|
||||
domains = ["home.opel-online.de"];
|
||||
networkConfig = {
|
||||
DHCP = "yes";
|
||||
IPv6AcceptRA = true;
|
||||
IPv6PrivacyExtensions = false;
|
||||
};
|
||||
ipv6AcceptRAConfig = {
|
||||
DHCPv6Client = "always";
|
||||
UseDNS = true;
|
||||
};
|
||||
dhcpV4Config = {
|
||||
UseDNS = true;
|
||||
};
|
||||
dhcpV6Config = {
|
||||
UseDNS = true;
|
||||
systemd = {
|
||||
network = {
|
||||
enable = true;
|
||||
networks = {
|
||||
"10-lan" = {
|
||||
matchConfig.Name = "ens18";
|
||||
ntp = ["192.168.2.1"];
|
||||
domains = ["home.opel-online.de"];
|
||||
networkConfig = {
|
||||
DHCP = "yes";
|
||||
IPv6AcceptRA = true;
|
||||
IPv6PrivacyExtensions = false;
|
||||
};
|
||||
ipv6AcceptRAConfig = {
|
||||
DHCPv6Client = "always";
|
||||
UseDNS = true;
|
||||
};
|
||||
dhcpV4Config = {
|
||||
UseDNS = true;
|
||||
};
|
||||
dhcpV6Config = {
|
||||
UseDNS = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
#services.setspindown = {
|
||||
# serviceConfig.Type = "oneshot";
|
||||
# description = "Sets the spind down time for HDD to 12min+30sec";
|
||||
# enable = true;
|
||||
# wantedBy = [ "multi-user.target" ];
|
||||
# script = "${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088";
|
||||
#};
|
||||
};
|
||||
networking = {
|
||||
hostName = "jupiter";
|
||||
@@ -262,9 +273,6 @@
|
||||
powerManagement = {
|
||||
cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
powertop.enable = true;
|
||||
#scsiLinkPolicy = "med_power_with_dipm";
|
||||
powerUpCommands = ''
|
||||
${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088
|
||||
'';
|
||||
#'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -112,9 +112,6 @@
|
||||
powerManagement = {
|
||||
cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
powertop.enable = true;
|
||||
powerUpCommands = ''
|
||||
${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/e036f437-bc91-4398-b182-7cf5724e23a2
|
||||
'';
|
||||
};
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
||||
|
||||
@@ -198,19 +198,28 @@
|
||||
|
||||
swapDevices = [{device = "/swap/swapfile";}];
|
||||
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
networks = {
|
||||
"10-lan" = {
|
||||
matchConfig.Name = "ens18";
|
||||
ntp = ["192.168.2.1"];
|
||||
domains = ["home.opel-online.de"];
|
||||
networkConfig = {
|
||||
DHCP = "yes";
|
||||
IPv6AcceptRA = true;
|
||||
systemd = {
|
||||
network = {
|
||||
enable = true;
|
||||
networks = {
|
||||
"10-lan" = {
|
||||
matchConfig.Name = "ens18";
|
||||
ntp = ["192.168.2.1"];
|
||||
domains = ["home.opel-online.de"];
|
||||
networkConfig = {
|
||||
DHCP = "yes";
|
||||
IPv6AcceptRA = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
# services.setspindown = {
|
||||
# serviceConfig.Type = "oneshot";
|
||||
# description = "Sets the spind down time for HDD to 30min";
|
||||
# enable = true;
|
||||
# wantedBy = [ "multi-user.target" ];
|
||||
# script = "${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2";
|
||||
# };
|
||||
};
|
||||
networking = {
|
||||
hostName = "nasbak";
|
||||
@@ -227,9 +236,5 @@
|
||||
powerManagement = {
|
||||
cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
powertop.enable = true;
|
||||
# powerUpCommands = ''
|
||||
# ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088
|
||||
# ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2
|
||||
# '';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -541,9 +541,12 @@ in {
|
||||
|
||||
# ── Laptop ─────────────────────────────────────────────────────────────
|
||||
(lib.mkIf cfg.laptop.enable {
|
||||
systemd.sleep.extraConfig = "HibernateDelaySec=${cfg.laptop.hibernateDelaySec}";
|
||||
services.logind.settings.Login.HandleLidSwitch =
|
||||
cfg.laptop.lidSwitch;
|
||||
systemd.sleep.settings.Sleep = {
|
||||
HibernateDelaySec = cfg.laptop.hibernateDelaySec;
|
||||
};
|
||||
services.logind.settings.Login = {
|
||||
HandleLidSwitch = cfg.laptop.lidSwitch;
|
||||
};
|
||||
})
|
||||
|
||||
# ── Nitrokey ───────────────────────────────────────────────────────────
|
||||
|
||||
@@ -12,6 +12,6 @@
|
||||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
zmkBATx
|
||||
zmkbatx
|
||||
];
|
||||
}
|
||||
|
||||
@@ -9,11 +9,13 @@
|
||||
extra-trusted-public-keys = [
|
||||
"hades-builder:AFdPgi6Qq/yKqc2V2imgzMikEkVEFCrDaHyAmOJ3MII="
|
||||
"steamdeck.cachix.org-1:BVoP4TEu3ECgotaO+3J3r9SSn62GkUDBwizOFU/q4Bc="
|
||||
"noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="
|
||||
];
|
||||
extra-substituters = [
|
||||
"https://cache.home.opel-online.de"
|
||||
"https://steamdeck.cachix.org"
|
||||
"https://cache.ci.kabtop.de"
|
||||
"https://noctalia.cachix.org"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -43,21 +43,9 @@ in {
|
||||
return 404;
|
||||
'';
|
||||
};
|
||||
# "element.${config.networking.domain}" = {
|
||||
# enableACME = true;
|
||||
# forceSSL = true;
|
||||
#
|
||||
# root = pkgs.element-web.override {
|
||||
# conf = {
|
||||
# default_server_config = clientConfig;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
};
|
||||
|
||||
imports = [../../kabbone/mautrix-whatsapp.nix];
|
||||
|
||||
services.matrix-synapse = {
|
||||
enable = true;
|
||||
settings = {
|
||||
@@ -200,7 +188,7 @@ in {
|
||||
};
|
||||
};
|
||||
};
|
||||
kabbone_mautrix-whatsapp = {
|
||||
mautrix-whatsapp = {
|
||||
enable = true;
|
||||
registerToSynapse = true;
|
||||
environmentFile = config.age.secrets."services/matrix/mautrix-whatsapp.env".path;
|
||||
|
||||
Reference in New Issue
Block a user