Compare commits

...

5 commits

5 changed files with 13 additions and 9 deletions

View file

@ -7,16 +7,14 @@
# You can get the names of your outputs by running: swaymsg -t get_outputs # You can get the names of your outputs by running: swaymsg -t get_outputs
set $main_screen eDP-1 set $main_screen eDP-1
set $displayport DP-1 set $displayport DP-3
set $hmdi HDMI-A-1 set $hmdi HDMI-A-1
output $main_screen scale 1.7 output $main_screen scale 1.7
output $displayport scale 1 output $displayport scale 1
output $hdmi scale 1
output $main_screen pos 0 0 output $main_screen position 0 1440
output $displayport pos 0 -1080 output $displayport position 0 0 resolution 2560x1440@60Hz
output $hdmi pos 1440 0
#bindswitch lid:on output $main_screen disable #bindswitch lid:on output $main_screen disable
#bindswitch lid:off output $main_screen enable #bindswitch lid:off output $main_screen enable

View file

@ -1,8 +1,13 @@
{ {
pkgs, pkgs,
lib,
... ...
}: }:
{ {
systemd.services.wg-quick-wg5.serviceConfig.Type = lib.mkForce "simple";
systemd.services.wg-quick-wg5.serviceConfig.Restart = "on-failure";
systemd.services.wg-quick-wg5.serviceConfig.RestartSec = "5s";
networking = { networking = {
networkmanager.dns = "systemd-resolved"; networkmanager.dns = "systemd-resolved";
@ -59,6 +64,7 @@
]; ];
}; };
wg1 = { wg1 = {
autostart = false;
address = ["192.168.188.203/24"]; address = ["192.168.188.203/24"];
privateKeyFile = "/etc/wireguard/wg1.privatekey"; privateKeyFile = "/etc/wireguard/wg1.privatekey";
@ -134,7 +140,8 @@
publicKey = "UhPW8jebAPaMYqjJfSFO9QAMhk0E+dq4i6lB4Wjg91Q="; publicKey = "UhPW8jebAPaMYqjJfSFO9QAMhk0E+dq4i6lB4Wjg91Q=";
presharedKeyFile = "/etc/wireguard/wg5.presharedkey"; presharedKeyFile = "/etc/wireguard/wg5.presharedkey";
allowedIPs = [ "192.168.13.0/24" ]; allowedIPs = [ "192.168.13.0/24" ];
endpoint = "ktjh20jr89gkcqwr.myfritz.net:59538"; endpoint = "svxqr7qjmk9beu7t.myfritz.net:59538";
#endpoint = "84.44.134.172:59538";
persistentKeepalive = 25; persistentKeepalive = 25;
} }
]; ];

View file

@ -8,7 +8,6 @@ let
psCfg = config.pub-solar; psCfg = config.pub-solar;
in { in {
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
virtualisation.docker.package = pkgs.docker_26;
users.users."${psCfg.user.name}" = { users.users."${psCfg.user.name}" = {
extraGroups = ["docker"]; extraGroups = ["docker"];

View file

@ -37,7 +37,7 @@
registry = { registry = {
nixpkgs.flake = flake.inputs.nixpkgs; nixpkgs.flake = flake.inputs.nixpkgs;
#unstable.flake = flake.inputs.unstable; unstable.flake = flake.inputs.unstable;
system.flake = flake.self; system.flake = flake.self;
}; };

View file

@ -70,7 +70,7 @@ in {
gpu-switch gpu-switch
ifmetric ifmetric
ipmitool ipmitool
thunderbird thunderbird-128
veracrypt veracrypt
age-plugin-yubikey age-plugin-yubikey
#cockroach-bin #cockroach-bin