Compare commits

...

2 Commits

Author SHA1 Message Date
245beea2bd Merge configs 2024-06-06 19:33:33 -05:00
09099bf87c Fix laptop config 2024-06-06 19:25:55 -05:00
4 changed files with 25 additions and 20 deletions

4
flake.lock generated
View File

@@ -2,8 +2,8 @@
"nodes": {
"currentSystem": {
"locked": {
"lastModified": 1717562249,
"narHash": "sha256-WdcVxEl64ZRLVUmnn9ZVXBId0eGkzxwZSVDxZDy0mgU=",
"lastModified": 1717720072,
"narHash": "sha256-JAMWMGlJFDt+7bbpWIDoRzvL0/A7YY6Wg6xENX9ohUY=",
"path": "/etc/nixos/hostname",
"type": "path"
},

View File

@@ -93,11 +93,17 @@
};
gui = {
enable = true;
protonmail = true;
matrix = true;
sway = {
enable = true;
desktop = false;
};
monitors = utils.mkMonitor {
monitor = "eDP-1";
resolution = "1920x1200";

View File

@@ -14,7 +14,6 @@
homeDirectory = "/home/eesim";
};
home.file.".config/sway/config".source = ./dotfiles/sway/config;
home.file.".config/nvim".source = ./dotfiles/nvim;
home.file.".config/waybar".source = ./dotfiles/waybar;
home.file.".config/fish/config.fish".source = ./dotfiles/fish/config.fish;

View File

@@ -36,24 +36,24 @@
"/nix".options = [ "compress=zstd" "noatime" ];
};
networking.wg-quick.interfaces = {
wg0 = {
address = [ "10.6.0.5" ];
listenPort = 51820;
privateKeyFile = "/root/wireguard-keys/wg0/private";
dns = [ "10.2.0.100" ];
# networking.wg-quick.interfaces = {
# wg0 = {
# address = [ "10.6.0.5" ];
# listenPort = 51820;
# privateKeyFile = "/root/wireguard-keys/wg0/private";
# dns = [ "10.2.0.100" ];
peers = [
{
publicKey = "pEWHugUnnhWXkJzCIhXryRRZMoCAuvAITDeP4ItenQk=";
presharedKeyFile = "/root/wireguard-keys/wg0/preshared";
allowedIPs = [ "10.2.0.0/24" "192.168.0.0/24" ];
endpoint = "simmer505.com:51820";
persistentKeepalive = 25;
}
];
};
};
# peers = [
# {
# publicKey = "pEWHugUnnhWXkJzCIhXryRRZMoCAuvAITDeP4ItenQk=";
# presharedKeyFile = "/root/wireguard-keys/wg0/preshared";
# allowedIPs = [ "10.2.0.0/24" "192.168.0.0/24" ];
# endpoint = "simmer505.com:51820";
# persistentKeepalive = 25;
# }
# ];
# };
# };
# Set your time zone.
time.timeZone = "America/Chicago";