diff --git a/home/home.nix b/home/home.nix index db0eb0e..c50f5f8 100644 --- a/home/home.nix +++ b/home/home.nix @@ -105,7 +105,7 @@ in { programs.starship = { enable = true; settings = { - format = "$directory$os$all"; + # format = "$directory$os$all"; directory = { truncate_to_repo = false; }; diff --git a/system/configuration.nix b/system/configuration.nix index 48e630e..a6f8712 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -125,7 +125,7 @@ ''] (builtins.readFile ../home/dots/xonshrc); }; - users.defaultUserShell = pkgs.xonsh; + users.defaultUserShell = pkgs.zsh; services.tailscale.enable = true; @@ -156,21 +156,21 @@ # services.mullvad-vpn.enable = true; - # networking.wg-quick.interfaces = { - # mullvad = { - # address = ["10.67.227.64/32"]; - # dns = ["10.64.0.1"]; - # privateKey = "OOPAlePjy7x2DVpg6d7BoBqpST3lDJSYght185tSUl8="; - # peers = [ - # { - # publicKey = "LXuRwa9JRTt2/UtldklKGlj/IVLORITqgET4II4DRkU="; - # allowedIPs = ["0.0.0.0/0"]; - # endpoint = "146.70.200.194:51820"; - # persistentKeepalive = 25; - # } - # ]; - # }; - # }; + networking.wg-quick.interfaces = { + mullvad = { + address = ["10.67.227.64/32"]; + dns = ["10.64.0.1"]; + privateKey = "OOPAlePjy7x2DVpg6d7BoBqpST3lDJSYght185tSUl8="; + peers = [ + { + publicKey = "LXuRwa9JRTt2/UtldklKGlj/IVLORITqgET4II4DRkU="; + allowedIPs = ["0.0.0.0/0"]; + endpoint = "146.70.200.194:51820"; + persistentKeepalive = 25; + } + ]; + }; + }; networking.firewall.enable = true; networking.firewall = {