up

modules/darwin/homebrew.nix

@@ -2,10 +2,9 @@
   homebrew = {
     enable = true;
     casks = [
+      "hey-desktop"
       "zen"
+      "pareto-security"
     ];
-    masApps = {
-      "wipr2" = 1662217862;
-    };
   };
 }

modules/darwin/packages.nix

@@ -4,7 +4,7 @@ with pkgs; [
   dockutil
   mas
   raycast
-  tailscale
+  # tailscale
+  whatsapp-for-mac
   xcodes
-  # whatsapp-for-mac
 ]

modules/home/default.nix

@@ -6,13 +6,14 @@
   imports = [
     ./atuin.nix
     ./bash.nix
-    ./jujutsu.nix
     ./bat.nix
     ./direnv.nix
     ./eza.nix
     ./fish.nix
     ./fzf.nix
     ./git.nix
+    ./jjui.nix
+    ./jujutsu.nix
     ./mise.nix
     ./neovim
     ./opencode.nix

modules/home/jjui.nix

@@ -0,0 +1,5 @@
+{
+  programs.jjui = {
+    enable = true;
+  };
+}

modules/home/neovim/plugins/lsp.nix

@@ -9,6 +9,10 @@
       inlayHints = true;
       servers = {
         nil_ls.enable = true;
+        cssls.enable = true;
+        dockerls.enable = true;
+        elixirls.enable = true;
+        yamlls.enable = true;
         vtsls = {
           enable = true;
           package = pkgs.vtsls;
@@ -19,7 +23,6 @@
                 globalPlugins = [
                   {
                     name = "@vue/typescript-plugin";
-                    # Keep your working path to the language server package
                     location = "${pkgs.vue-language-server}/lib/language-tools/packages/language-server";
                     languages = ["vue"];
                     configNamespace = "typescript";
@@ -30,10 +33,6 @@
             };
           };
         };
-        cssls.enable = true;
-        dockerls.enable = true;
-        elixirls.enable = false;
-        yamlls.enable = true;
       };
     };
   };

modules/home/neovim/plugins/toggleterm.nix

@@ -17,4 +17,4 @@
       shell = "fish";
     };
   };
-}
+}

modules/nixos/default.nix

@@ -8,12 +8,12 @@
 }: {
   imports = [
     ../core.nix
-    ./firewall.nix
-    ./ssh.nix
+    ../syncthing.nix
+    ../tailscale.nix
     ./adguard.nix
     ./docker.nix
-    ../tailscale.nix
-    ../syncthing.nix
+    ./firewall.nix
+    ./ssh.nix
     sops-nix.nixosModules.sops
   ];
 

modules/packages.nix

@@ -19,7 +19,6 @@ with pkgs; [
   gnupg
   htop
   hyperfine
-  jjui
   jq
   killall
   lsof

modules/tailscale.nix

@@ -1,14 +1,8 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  services.tailscale =
-    {
-      enable = true;
-    }
-    // lib.optionalAttrs pkgs.stdenv.isLinux {
-      openFirewall = true;
-      useRoutingFeatures = "server";
-    };
+{lib, pkgs, ...}: {
+  services.tailscale = {
+    enable = true;
+  } // lib.optionalAttrs pkgs.stdenv.isLinux {
+    openFirewall = true;
+    useRoutingFeatures = "server";
+  };
 }