forked from pub-solar/os
Compare commits
No commits in common. "c463a19e695171621c7050494045301e05d7b396" and "5c7d766db49e6234caadf9e9f85f51af3f07027b" have entirely different histories.
c463a19e69
...
5c7d766db4
|
@ -7,14 +7,16 @@
|
||||||
# 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-3
|
set $displayport DP-1
|
||||||
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 position 0 1440
|
output $main_screen pos 0 0
|
||||||
output $displayport position 0 0 resolution 2560x1440@60Hz
|
output $displayport pos 0 -1080
|
||||||
|
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
|
||||||
|
|
|
@ -1,13 +1,8 @@
|
||||||
{
|
{
|
||||||
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";
|
||||||
|
|
||||||
|
@ -64,7 +59,6 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
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";
|
||||||
|
|
||||||
|
@ -140,8 +134,7 @@
|
||||||
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 = "svxqr7qjmk9beu7t.myfritz.net:59538";
|
endpoint = "ktjh20jr89gkcqwr.myfritz.net:59538";
|
||||||
#endpoint = "84.44.134.172:59538";
|
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
@ -8,6 +8,7 @@ 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"];
|
||||||
|
|
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,7 @@ in {
|
||||||
gpu-switch
|
gpu-switch
|
||||||
ifmetric
|
ifmetric
|
||||||
ipmitool
|
ipmitool
|
||||||
thunderbird-128
|
thunderbird
|
||||||
veracrypt
|
veracrypt
|
||||||
age-plugin-yubikey
|
age-plugin-yubikey
|
||||||
#cockroach-bin
|
#cockroach-bin
|
||||||
|
|
Loading…
Reference in a new issue