base/fish: Removing outdated paths, aliases and fixing `debug` alias

3 files changed, 34 insertions, 13 deletions

diff --git a/modules/base/fish/alias.fish b/modules/base/fish/alias.fish
index f309b1764ae..078b21dca8c 100644
--- a/modules/base/fish/alias.fish
+++ b/modules/base/fish/alias.fish
@@ -1,19 +1,10 @@
 # Useful
 alias todo="void /home/.local/todo.db"
-alias debug="env RUST_BACKTRACE=1"
+alias debug="env RUST_BACKTRACE=1 fish -c"
 alias stalk="watch -n 0.1"
 alias hib="systemctl hibernate"
 
-# alias nxs="nix run -f '<nixpkgs>'"
-alias hm="home-manager -f $HOME/sys/nixcfg/home.nix"
-
 alias c="cargo"
-alias g="git"
 alias e="emacs"
 alias em="emacs (fzf --height=15 --reverse)"
 alias skcd="cd (sk ~)"
-
-# Jokes
-alias nb="man"
-alias woman="man"
-alias acetrace="ranger"
diff --git a/modules/base/fish/config.fish b/modules/base/fish/config.fish
index dbfed5b661d..9bc6c53c583 100644
--- a/modules/base/fish/config.fish
+++ b/modules/base/fish/config.fish
@@ -1,7 +1,5 @@
 # source $HOME/.cargo/env
-set -gx PATH $HOME/.cargo/bin $PATH
-set -gx PATH $HOME/.local/bin $PATH
-set -gx PATH /usr/sbin $PATH
+# set -gx PATH $HOME/.cargo/bin $PATH
 
 # The o bit is a bit of a hack
 # umask u=rw,g=rw,o-rwx
diff --git a/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix b/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix
new file mode 100644
index 00000000000..661c3b5085e
--- /dev/null
+++ b/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.mullvad-vpn;
+  dir = "/var/lib/mullvad-vpn";
+in
+{
+  options.services.mullvad-vpn = {
+    enable = mkEnableOption "the Mullvad VPN daemon";
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services."mullvad-vpn" = {
+      enable = true;
+      wantedBy = [ "multi-user.target" ];
+      environment = 
+        {
+          MULLVAD_SETTINGS_DIR = "${dir}";
+          # MULLVAD_RPC_SOCKET_PATH = "${dir}";
+        };
+      serviceConfig = {
+        DynamicUser = true;
+        RuntimeDirectory = "${dir}";
+        ExecStart = ''
+          ${pkgs.mullvad-vpn}/bin/mullvad-daemon --disable-log-to-file
+        '';
+      };
+    };
+  };
+}