summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/marvin.nix1
-rw-r--r--user/settings/development/vlang.nix10
-rw-r--r--user/settings/development/web.nix1
-rw-r--r--user/settings/emacs.nix7
4 files changed, 11 insertions, 8 deletions
diff --git a/user/marvin.nix b/user/marvin.nix
index f6a745c6..098b5f61 100644
--- a/user/marvin.nix
+++ b/user/marvin.nix
@@ -4,6 +4,7 @@
     ./settings/development/base.nix
     ./settings/development/javascript.nix
     ./settings/development/golang.nix
+    ./settings/development/vlang.nix
     ./settings/development/web.nix
     ./settings/darwin.nix
     ./settings/emacs.nix
diff --git a/user/settings/development/vlang.nix b/user/settings/development/vlang.nix
new file mode 100644
index 00000000..6d31634d
--- /dev/null
+++ b/user/settings/development/vlang.nix
@@ -0,0 +1,10 @@
+{ pkgs
+, ...
+}: {
+  home.packages = with pkgs; [
+    vlang
+  ];
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    v-mode
+  ]);
+}
diff --git a/user/settings/development/web.nix b/user/settings/development/web.nix
index 24da1604..13b0ea5c 100644
--- a/user/settings/development/web.nix
+++ b/user/settings/development/web.nix
@@ -9,7 +9,6 @@
     stylelint
   ] ++ (with pkgs; [
     flyctl
-    prettierd
     personal.htmlformat
   ]);
   home.shellAliases = {
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index cf519354..72c2ee52 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -188,13 +188,6 @@ in
           license = pkgs.lib.licenses.gpl3;
         };
       };
-      apheleia = self.melpaPackages.apheleia.overrideAttrs
-        (old: {
-          patchPhase = ''
-            substituteInPlace apheleia-formatters.el \
-              --replace-fail '"prettier"' '"prettierd"'
-          '';
-        });
       treemacs-nerd-icons = self.melpaPackages.treemacs-nerd-icons.overrideAttrs (old: {
         src = pkgs.fetchFromGitHub {
           owner = "aaronmiller";